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

Force new IP port on local address change

Browse source
This commit is contained in:
Simon Walton 2019-06-07 12:04:04 -07:00
parent 0cfc090655
commit 498d681d3e
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1172,7 +1172,7 @@ void LimitedNodeList::stopInitialSTUNUpdate(bool success) {
// We now setup a timer here to fire every so often to check that our IP address has not changed. // We now setup a timer here to fire every so often to check that our IP address has not changed.
// Or, if we failed - if will check if we can eventually get a public socket // Or, if we failed - if will check if we can eventually get a public socket
const int STUN_IP_ADDRESS_CHECK_INTERVAL_MSECS = 30 * 1000; const int STUN_IP_ADDRESS_CHECK_INTERVAL_MSECS = 10 * 1000;
QTimer* stunOccasionalTimer = new QTimer { this }; QTimer* stunOccasionalTimer = new QTimer { this };
connect(stunOccasionalTimer, &QTimer::timeout, this, &LimitedNodeList::sendSTUNRequest); connect(stunOccasionalTimer, &QTimer::timeout, this, &LimitedNodeList::sendSTUNRequest);
@ -1230,12 +1230,16 @@ void LimitedNodeList::errorTestingLocalSocket() {
} }
void LimitedNodeList::setLocalSocket(const HifiSockAddr& sockAddr) { void LimitedNodeList::setLocalSocket(const HifiSockAddr& sockAddr) {
if (sockAddr != _localSockAddr) { if (sockAddr.getAddress() != _localSockAddr.getAddress()) {
if (_localSockAddr.isNull()) { if (_localSockAddr.isNull()) {
qCInfo(networking) << "Local socket is" << sockAddr; qCInfo(networking) << "Local socket is" << sockAddr;
} else { } else {
qCInfo(networking) << "Local socket has changed from" << _localSockAddr << "to" << sockAddr; qCInfo(networking) << "Local socket has changed from" << _localSockAddr << "to" << sockAddr;
if (_hasTCPCheckedLocalSocket) { // Force a port change for NAT:
_nodeSocket.rebind(0);
_localSockAddr.setPort(_nodeSocket.localPort());
}
} }
_localSockAddr = sockAddr; _localSockAddr = sockAddr;

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

@ -73,6 +73,7 @@ void Socket::rebind() {
void Socket::rebind(quint16 localPort) { void Socket::rebind(quint16 localPort) {
_udpSocket.close(); _udpSocket.close();
_udpSocket.waitForDisconnected();
bind(QHostAddress::AnyIPv4, localPort); bind(QHostAddress::AnyIPv4, localPort);
} }