Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:23:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix typo in last commit; remove useless call of getGuessedLocalAddress; logging tweak

Browse source
This commit is contained in:
Simon Walton 2019-08-23 13:19:31 -07:00
parent c262b7a3b8
commit d9558e35c3
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/networking/src/udt/Socket.cpp
View file

@ -263,7 +263,7 @@ Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr, bool fi
if (filterCreate && _connectionCreationFilterOperator && !_connectionCreationFilterOperator(sockAddr)) { if (filterCreate && _connectionCreationFilterOperator && !_connectionCreationFilterOperator(sockAddr)) {
// the connection creation filter did not allow us to create a new connection // the connection creation filter did not allow us to create a new connection
#ifdef UDT_CONNECTION_DEBUG #ifdef UDT_CONNECTION_DEBUG
qCDebug(networking) << "Socket::findOrCreateConnection refusing to create connection for" << sockAddr qCDebug(networking) << "Socket::findOrCreateConnection refusing to create Connection class for" << sockAddr
<< "due to connection creation filter"; << "due to connection creation filter";
#endif // UDT_CONNECTION_DEBUG #endif // UDT_CONNECTION_DEBUG
return nullptr; return nullptr;
@ -279,7 +279,7 @@ Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr, bool fi
QObject::connect(connection.get(), &Connection::receiverHandshakeRequestComplete, QObject::connect(connection.get(), &Connection::receiverHandshakeRequestComplete,
this, &Socket::clientHandshakeRequestComplete); this, &Socket::clientHandshakeRequestComplete);
qCDebug(networking) << "Creating new connection to" << sockAddr; qCDebug(networking) << "Creating new Connection class for" << sockAddr;
it = _connectionsHash.insert(it, std::make_pair(sockAddr, std::move(connection))); it = _connectionsHash.insert(it, std::make_pair(sockAddr, std::move(connection)));
} }

1
libraries/shared/src/shared/FileLogger.cpp
View file

@ -56,7 +56,6 @@ static FilePersistThread* _persistThreadInstance;
QString getLogRollerFilename() { QString getLogRollerFilename() {
QString result = FileUtils::standardPath(LOGS_DIRECTORY); QString result = FileUtils::standardPath(LOGS_DIRECTORY);
QHostAddress clientAddress = getGuessedLocalAddress();
QDateTime now = QDateTime::currentDateTime(); QDateTime now = QDateTime::currentDateTime();
QString fileSessionID; QString fileSessionID;

2
libraries/shared/src/shared/NetworkUtils.cpp
View file

@ -10,7 +10,7 @@
#include <QtNetwork/QNetworkInterface> #include <QtNetwork/QNetworkInterface>
namespace { namespace {
const QString LINK_LOCAL_SUBNET {"169.154."}; const QString LINK_LOCAL_SUBNET {"169.254."};
// Is address local-subnet valid only (rfc 3927): // Is address local-subnet valid only (rfc 3927):
bool isLinkLocalAddress(const QHostAddress& ip4Addr) { bool isLinkLocalAddress(const QHostAddress& ip4Addr) {