Merge #8740: net: No longer send local address in addrMe

laanwj · laanwj · commit 239e8ce95896 · 2016-09-19T09:27:50.000+02:00
d9c99c3 net: No longer send local address in addrMe (Wladimir J. van der Laan)
diff --git a/src/net.cpp b/src/net.cpp
@@ -448,7 +448,7 @@ void CNode::PushVersion()
 {
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
-    CAddress addrMe = GetLocalAddress(&addr, nLocalServices);
+    CAddress addrMe = CAddress(CService(), nLocalServices);
     if (fLogIPs)
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nMyStartingHeight, addrMe.ToString(), addrYou.ToString(), id);
     else

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ void CNode::PushVersion()`
`448`	`448`	`{`
`449`	`449`	`int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());`
`450`	`450`	`CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));`
`451`		`- CAddress addrMe = GetLocalAddress(&addr, nLocalServices);`
	`451`	`+ CAddress addrMe = CAddress(CService(), nLocalServices);`
`452`	`452`	`if (fLogIPs)`
`453`	`453`	`LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nMyStartingHeight, addrMe.ToString(), addrYou.ToString(), id);`
`454`	`454`	`else`