linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2890
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2012-03-22 20:48:02 +0100
message:
  add more info in /conn
modified:
  dcpp/ConnectivityManager.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/ConnectivityManager.cpp'
--- dcpp/ConnectivityManager.cpp	2012-03-03 19:33:45 +0000
+++ dcpp/ConnectivityManager.cpp	2012-03-22 19:48:02 +0000
@@ -188,20 +188,23 @@
 		}
 	}
 
-	string ip = CONNSETTING(EXTERNAL_IP);
-	if(ip.empty()) {
-		ip = _("undefined");
-	}
+	auto field = [](const string& s) { return s.empty() ? _("undefined") : s; };
 
 	return str(F_(
 		"Connectivity information:\n\n"
 		"Automatic connectivity setup is: %1%\n\n"
 		"\t%2%\n"
-		"\tExternal IP: %3%\n"
-		"\tTransfer port: %4%\n"
-		"\tEncrypted transfer port: %5%\n"
-		"\tSearch port: %6%") % autoStatus % mode % ip % ConnectionManager::getInstance()->getPort() %
-		ConnectionManager::getInstance()->getSecurePort() % SearchManager::getInstance()->getPort());
+		"\tExternal IP (v4): %3%\n"
+		"\tExternal IP (v6): %4%\n"
+		"\tBound interface (v4): %5%\n"
+		"\tBound interface (v6): %6%\n"
+		"\tTransfer port: %7%\n"
+		"\tEncrypted transfer port: %8%\n"
+		"\tSearch port: %9%") % autoStatus % mode %
+		field(CONNSETTING(EXTERNAL_IP)) % field(CONNSETTING(EXTERNAL_IP6)) %
+		field(CONNSETTING(BIND_ADDRESS)) % field(CONNSETTING(BIND_ADDRESS6)) %
+		field(ConnectionManager::getInstance()->getPort()) % field(ConnectionManager::getInstance()->getSecurePort()) %
+		field(SearchManager::getInstance()->getPort()));
 }
 
 void ConnectivityManager::startMapping() {