Populate services in GetLocalAddress

morcos · laanwj · commit b6548420291d · 2017-05-22T12:57:52.000+02:00
Previously if we didn't have any local addresses, GetLocalAddress would return 0.0.0.0 and then we'd swap in a peer's notion of our address in AdvertiseLocal, but then nServices would never get set. Github-Pull: #10424 Rebased-From: 3070134
diff --git a/src/net.cpp b/src/net.cpp
@@ -179,7 +179,7 @@ static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn
 // one by discovery.
 CAddress GetLocalAddress(const CNetAddr *paddrPeer)
 {
-    CAddress ret(CService("0.0.0.0",GetListenPort()), NODE_NONE);
+    CAddress ret(CService("0.0.0.0",GetListenPort()), nLocalServices);
     CService addr;
     if (GetLocal(addr, paddrPeer))
     {

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn`
`179`	`179`	`// one by discovery.`
`180`	`180`	`CAddress GetLocalAddress(const CNetAddr *paddrPeer)`
`181`	`181`	`{`
`182`		`- CAddress ret(CService("0.0.0.0",GetListenPort()), NODE_NONE);`
	`182`	`+ CAddress ret(CService("0.0.0.0",GetListenPort()), nLocalServices);`
`183`	`183`	`CService addr;`
`184`	`184`	`if (GetLocal(addr, paddrPeer))`
`185`	`185`	`{`