Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-06-15 23:39:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15863 from SimonWalton-HiFi/public-address-change2

Browse source 
BUGZ-894: Propagate a Node's public address change, part 2
This commit is contained in:
Shannon Romano 2019-07-02 08:23:34 -07:00 committed by GitHub
commit 2f07d35eb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/networking/src/LimitedNodeList.cpp
View file

@ -754,6 +754,7 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t
connect(newNodePointer.data(), &NetworkPeer::socketUpdated, this, [this, weakPtr] { connect(newNodePointer.data(), &NetworkPeer::socketUpdated, this, [this, weakPtr] {
emit nodeSocketUpdated(weakPtr); emit nodeSocketUpdated(weakPtr);
}); });
connect(newNodePointer.data(), &NetworkPeer::socketUpdated, &_nodeSocket, &udt::Socket::handleRemoteAddressChange);
return newNodePointer; return newNodePointer;
} }

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

@ -99,14 +99,14 @@ signals:
public slots: public slots:
void cleanupConnection(HifiSockAddr sockAddr); void cleanupConnection(HifiSockAddr sockAddr);
void clearConnections(); void clearConnections();
void handleRemoteAddressChange(HifiSockAddr previousAddress, HifiSockAddr currentAddress);
private slots: private slots:
void readPendingDatagrams(); void readPendingDatagrams();
void checkForReadyReadBackup(); void checkForReadyReadBackup();
void handleSocketError(QAbstractSocket::SocketError socketError); void handleSocketError(QAbstractSocket::SocketError socketError);
void handleStateChanged(QAbstractSocket::SocketState socketState); void handleStateChanged(QAbstractSocket::SocketState socketState);
void handleRemoteAddressChange(HifiSockAddr previousAddress, HifiSockAddr currentAddress);
private: private:
void setSystemBufferSizes(); void setSystemBufferSizes();