Merge #10424: Populate services in GetLocalAddress

laanwj · laanwj · commit 651291383047 · 2017-05-22T12:50:19.000+02:00
3070134 Populate services in GetLocalAddress (Alex Morcos) Tree-SHA512: b822d7e898ccb5b959ccb1b1d0f159f27190c2105fbf8f5b67ae54debab6fa6a0723d65a66e7341f55cd0d80398c3fbb39a41e067b9f4e0bfa2c1cd366032404
diff --git a/src/net.cpp b/src/net.cpp
@@ -148,7 +148,7 @@ static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn
 // one by discovery.
 CAddress GetLocalAddress(const CNetAddr *paddrPeer, ServiceFlags nLocalServices)
 {
-    CAddress ret(CService(CNetAddr(),GetListenPort()), NODE_NONE);
+    CAddress ret(CService(CNetAddr(),GetListenPort()), nLocalServices);
     CService addr;
     if (GetLocal(addr, paddrPeer))
     {

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn`
`148`	`148`	`// one by discovery.`
`149`	`149`	`CAddress GetLocalAddress(const CNetAddr *paddrPeer, ServiceFlags nLocalServices)`
`150`	`150`	`{`
`151`		`- CAddress ret(CService(CNetAddr(),GetListenPort()), NODE_NONE);`
	`151`	`+ CAddress ret(CService(CNetAddr(),GetListenPort()), nLocalServices);`
`152`	`152`	`CService addr;`
`153`	`153`	`if (GetLocal(addr, paddrPeer))`
`154`	`154`	`{`