linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2479
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Sun 2011-04-03 19:28:00 +0200
message:
  Fix NAT-T & search socket binding when auto conn. det. enabled
modified:
  dcpp/BufferedSocket.cpp
  dcpp/SearchManager.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/BufferedSocket.cpp'
--- dcpp/BufferedSocket.cpp	2011-03-29 20:40:28 +0000
+++ dcpp/BufferedSocket.cpp	2011-04-03 17:28:00 +0000
@@ -106,7 +106,7 @@
 
 	s->create();
 	setSocket(move(s));
-	sock->bind(localPort, SETTING(BIND_ADDRESS));
+	sock->bind(localPort, BOOLSETTING(AUTO_DETECT_CONNECTION) ? Util::emptyString : SETTING(BIND_ADDRESS));
 
 	Lock l(cs);
 	addTask(CONNECT, new ConnectInfo(aAddress, aPort, localPort, natRole, proxy && (SETTING(OUTGOING_CONNECTIONS) == SettingsManager::OUTGOING_SOCKS5)));

=== modified file 'dcpp/SearchManager.cpp'
--- dcpp/SearchManager.cpp	2011-03-29 20:40:28 +0000
+++ dcpp/SearchManager.cpp	2011-04-03 17:28:00 +0000
@@ -146,7 +146,7 @@
 				socket->disconnect();
 				socket->create(Socket::TYPE_UDP);
 				socket->setBlocking(true);
-				socket->bind(port, SETTING(BIND_ADDRESS));
+				socket->bind(port, BOOLSETTING(AUTO_DETECT_CONNECTION) ? Util::emptyString : SETTING(BIND_ADDRESS));
 				if(failed) {
 					LogManager::getInstance()->message(_("Search enabled again"));
 					failed = false;