From 056fbf03a54b2e3ee20f8d677649e407e50cc018 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 26 Jul 2018 10:36:48 +0200 Subject: QDtls - refactor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch renames rather awkward 'remote' into more conventional 'peer' (similar to what we have in QAbstractSocket). Change-Id: Ifc45e538b8adf9cc076bd7aee693277829fd94dc Reviewed-by: Edward Welbourne Reviewed-by: Mårten Nordheim --- examples/network/secureudpserver/server.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/network/secureudpserver/server.cpp') diff --git a/examples/network/secureudpserver/server.cpp b/examples/network/secureudpserver/server.cpp index 918307013c..c5887c9adb 100644 --- a/examples/network/secureudpserver/server.cpp +++ b/examples/network/secureudpserver/server.cpp @@ -151,8 +151,8 @@ void DtlsServer::readyRead() const auto client = std::find_if(knownClients.begin(), knownClients.end(), [&](const DtlsConnection &connection){ - return connection->remoteAddress() == peerAddress - && connection->remotePort() == peerPort; + return connection->peerAddress() == peerAddress + && connection->peerPort() == peerPort; }); if (client == knownClients.end()) @@ -189,7 +189,7 @@ void DtlsServer::handleNewConnection(const QHostAddress &peerAddress, DtlsConnection newConnection(new QDtls(QSslSocket::SslServerMode)); newConnection->setDtlsConfiguration(serverConfiguration); - newConnection->setRemote(peerAddress, peerPort); + newConnection->setPeer(peerAddress, peerPort); newConnection->connect(newConnection.data(), &QDtls::pskRequired, this, &DtlsServer::pskRequired); knownClients.push_back(newConnection); @@ -209,8 +209,8 @@ void DtlsServer::doHandshake(DtlsConnection newConnection, const QByteArray &cli return; } - const QString peerInfo = peer_info(newConnection->remoteAddress(), - newConnection->remotePort()); + const QString peerInfo = peer_info(newConnection->peerAddress(), + newConnection->peerPort()); switch (newConnection->handshakeState()) { case QDtls::HandshakeInProgress: emit infoMessage(peerInfo + tr(": handshake is in progress ...")); @@ -228,7 +228,7 @@ void DtlsServer::decryptDatagram(DtlsConnection connection, const QByteArray &cl { Q_ASSERT(connection->connectionEncrypted()); - const QString peerInfo = peer_info(connection->remoteAddress(), connection->remotePort()); + const QString peerInfo = peer_info(connection->peerAddress(), connection->peerPort()); const QByteArray dgram = connection->decryptDatagram(&serverSocket, clientMessage); if (dgram.size()) { emit datagramReceived(peerInfo, clientMessage, dgram); -- cgit v1.2.3