Merge PR #175: Fix TCP server warning and pointer initialization

pull/379/head
Jenkins nymea 2021-01-29 15:42:58 +01:00
commit 7172ad1bed
2 changed files with 3 additions and 3 deletions

View File

@ -129,7 +129,7 @@ void TcpServer::sendData(const QUuid &clientId, const QByteArray &data)
qCDebug(dcTcpServerTraffic()) << "Sending to client" << clientId.toString() << data;
client->write(data + '\n');
} else {
qCWarning(dcTcpServer()) << "Client" << clientId << "unknown to this transport";
qCWarning(dcTcpServer()) << "Client" << clientId.toString() << "unknown to this transport";
}
}

View File

@ -90,9 +90,9 @@ public:
void terminateClientConnection(const QUuid &clientId) override;
private:
QTimer *m_timer;
QTimer *m_timer = nullptr;
SslServer * m_server;
SslServer *m_server = nullptr;
QHash<QUuid, QTcpSocket *> m_clientList;
QSslConfiguration m_sslConfig;