ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it build with older Qt versions

Browse Source
This commit is contained in:
Michael Zanetti 2019-01-03 01:44:17 +01:00
parent eba98b077a
commit 364f7e5499
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
anel/devicepluginanel.cpp
View File

@ -43,7 +43,6 @@
#include "plugininfo.h" #include "plugininfo.h"
#include "plugintimer.h" #include "plugintimer.h"
#include <QNetworkDatagram>
#include <network/networkaccessmanager.h> #include <network/networkaccessmanager.h>
#include <QNetworkReply> #include <QNetworkReply>
#include <QAuthenticator> #include <QAuthenticator>
@ -83,21 +82,24 @@ DeviceManager::DeviceError DevicePluginAnel::discoverDevices(const DeviceClassId
QTimer::singleShot(2000, this, [this, searchSocket](){ QTimer::singleShot(2000, this, [this, searchSocket](){
QList<DeviceDescriptor> descriptorList; QList<DeviceDescriptor> descriptorList;
while(searchSocket->hasPendingDatagrams()) { while(searchSocket->hasPendingDatagrams()) {
QNetworkDatagram datagram = searchSocket->receiveDatagram(); char buffer[1024];
qCDebug(dcAnelElektronik()) << "Have datagram:" << datagram.data(); QHostAddress senderAddress;
if (!datagram.data().startsWith("NET-CONTROL")) { int len = searchSocket->readDatagram(buffer, 1024, &senderAddress);
qCDebug(dcAnelElektronik()) << "Failed to parse discovery datagram from" << datagram.senderAddress() << datagram.data(); QByteArray data = QByteArray::fromRawData(buffer, len);
qCDebug(dcAnelElektronik()) << "Have datagram:" << data;
if (!data.startsWith("NET-CONTROL")) {
qCDebug(dcAnelElektronik()) << "Failed to parse discovery datagram from" << senderAddress << data;
continue; continue;
} }
QStringList parts = QString(datagram.data()).split("\r\n"); QStringList parts = QString(data).split("\r\n");
if (parts.count() != 4) { if (parts.count() != 4) {
qCDebug(dcAnelElektronik()) << "Failed to parse discovery datagram from" << datagram.senderAddress() << datagram.data(); qCDebug(dcAnelElektronik()) << "Failed to parse discovery datagram from" << senderAddress << data;
continue; continue;
} }
qCDebug(dcAnelElektronik()) << "Found NET-CONTROL:" << datagram.senderAddress() << parts.at(2) << parts.at(3) << datagram.senderAddress().protocol(); qCDebug(dcAnelElektronik()) << "Found NET-CONTROL:" << senderAddress << parts.at(2) << parts.at(3) << senderAddress.protocol();
DeviceDescriptor d(netPwrCtlDeviceClassId, parts.at(2), datagram.senderAddress().toString()); DeviceDescriptor d(netPwrCtlDeviceClassId, parts.at(2), senderAddress.toString());
ParamList params; ParamList params;
params << Param(netPwrCtlDeviceIpAddressParamTypeId, datagram.senderAddress().toString()); params << Param(netPwrCtlDeviceIpAddressParamTypeId, senderAddress.toString());
params << Param(netPwrCtlDevicePortParamTypeId, parts.at(3).toInt()); params << Param(netPwrCtlDevicePortParamTypeId, parts.at(3).toInt());
params << Param(netPwrCtlDeviceUsernameParamTypeId, "user7"); params << Param(netPwrCtlDeviceUsernameParamTypeId, "user7");
params << Param(netPwrCtlDevicePasswordParamTypeId, "anel"); params << Param(netPwrCtlDevicePasswordParamTypeId, "anel");