Merge #15345: net: Correct comparison of addr count

laanwj · laanwj · commit bfbe42585e9b · 2019-02-04T20:05:41.000+01:00
107623c net: Correct comparison of addr count (Carl Dong) Pull request description: `LOCAL_NONE` is supposed to be an enum indicating the `nScore` of a `LocalServiceInfo` rather than the count of an addr in `mapLocalHost`. Tree-SHA512: a47a0859dd11c991d75b54e96b08c502e3d235f7a6522a2355053f377d05e7853483996919292f458d917a561b23951e6945d6bf0ff5a2f29513c477c640bdd2
diff --git a/src/net.cpp b/src/net.cpp
@@ -174,8 +174,7 @@ CAddress GetLocalAddress(const CNetAddr *paddrPeer, ServiceFlags nLocalServices)
 static int GetnScore(const CService& addr)
 {
     LOCK(cs_mapLocalHost);
-    if (mapLocalHost.count(addr) == LOCAL_NONE)
-        return 0;
+    if (mapLocalHost.count(addr) == 0) return 0;
     return mapLocalHost[addr].nScore;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,7 @@ CAddress GetLocalAddress(const CNetAddr *paddrPeer, ServiceFlags nLocalServices)`
`174`	`174`	`static int GetnScore(const CService& addr)`
`175`	`175`	`{`
`176`	`176`	`LOCK(cs_mapLocalHost);`
`177`		`- if (mapLocalHost.count(addr) == LOCAL_NONE)`
`178`		`- return 0;`
	`177`	`+ if (mapLocalHost.count(addr) == 0) return 0;`
`179`	`178`	`return mapLocalHost[addr].nScore;`
`180`	`179`	`}`
`181`	`180`