From 2ec4d8ff3cd3634e15f719c358f6716291a865db Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 17 Aug 2015 16:38:59 -0700 Subject: [PATCH] rename return of HifiSockAddr objects for connections --- libraries/networking/src/udt/Socket.cpp | 2 +- libraries/networking/src/udt/Socket.h | 4 ++-- tools/udt-test/src/UDTTest.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp index a280a68716..a55a129c0a 100644 --- a/libraries/networking/src/udt/Socket.cpp +++ b/libraries/networking/src/udt/Socket.cpp @@ -237,7 +237,7 @@ ConnectionStats::Stats Socket::sampleStatsForConnection(const HifiSockAddr& dest } } -std::vector Socket::getSockAddr() { +std::vector Socket::getConnectionSockAddrs() { std::vector addr; addr.reserve(_connectionsHash.size()); for (const auto& connectionPair : _connectionsHash) { diff --git a/libraries/networking/src/udt/Socket.h b/libraries/networking/src/udt/Socket.h index 602cfaf8ec..e3cf347905 100644 --- a/libraries/networking/src/udt/Socket.h +++ b/libraries/networking/src/udt/Socket.h @@ -65,7 +65,7 @@ public: void connectToSendSignal(const HifiSockAddr& destinationAddr, QObject* receiver, const char* slot); ConnectionStats::Stats sampleStatsForConnection(const HifiSockAddr& destination); - std::vector getSockAddr(); + std::vector getConnectionSockAddrs(); private slots: void readPendingDatagrams(); @@ -83,7 +83,7 @@ private: std::unordered_map _unreliableSequenceNumbers; std::unordered_map> _connectionsHash; - int32_t _synInterval = 10; // 10ms + int _synInterval = 10; // 10ms QTimer _synTimer; std::unique_ptr _ccFactory { new CongestionControlFactory() }; diff --git a/tools/udt-test/src/UDTTest.cpp b/tools/udt-test/src/UDTTest.cpp index 6c163a726e..d24a9282e9 100644 --- a/tools/udt-test/src/UDTTest.cpp +++ b/tools/udt-test/src/UDTTest.cpp @@ -264,7 +264,7 @@ void UDTTest::sampleStats() { first = false; } - auto sockets = _socket.getSockAddr(); + auto sockets = _socket.getConnectionSockAddrs(); if (sockets.size() > 0) { udt::ConnectionStats::Stats stats = _socket.sampleStatsForConnection(sockets.front());