linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2125
committer: cologic <ne5@xxxxxxxxxxx>
branch nick: dcplusplus
timestamp: Fri 2010-04-09 11:43:20 -0400
message:
  fix active/passive ADC inf bug
modified:
  dcpp/AdcHub.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/AdcHub.cpp'
--- dcpp/AdcHub.cpp	2010-04-09 08:08:48 +0000
+++ dcpp/AdcHub.cpp	2010-04-09 15:43:20 +0000
@@ -825,17 +825,17 @@
 	}
 
 #ifndef DISABLE_NAT_TRAVERSAL
-	// FIXME this was presumably the source of the A/P bug in StrongDC++, examine
 	if(BOOLSETTING(NO_IP_OVERRIDE) && !SETTING(EXTERNAL_IP).empty()) {
 		addParam(lastInfoMap, c, "I4", Socket::resolve(SETTING(EXTERNAL_IP)));
 	} else {
 		addParam(lastInfoMap, c, "I4", "0.0.0.0");
 	}
-	addParam(lastInfoMap, c, "U4", Util::toString(SearchManager::getInstance()->getPort()));
 	if(ClientManager::getInstance()->isActive()) {
+		addParam(lastInfoMap, c, "U4", Util::toString(SearchManager::getInstance()->getPort()));
 		su += TCP4_FEATURE + ",";
 		su += UDP4_FEATURE + ",";
 	} else {
+		addParam(lastInfoMap, c, "U4", "");
 		su += NAT0_FEATURE + ",";
 	}
 #else