Remove vfReachable and modify IsReachable to only use vfLimited.

pstratem · MarcoFalke · commit a5bc6a1bc469 · 2016-04-27T22:34:48.000+02:00
We do not know that a class of Network is reachable, only that it is not. Github-Pull: #7553 Rebased-From: 110b62f
diff --git a/src/init.cpp b/src/init.cpp
@@ -1175,6 +1175,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // -proxy sets a proxy for all outgoing network traffic
     // -noproxy (or -proxy=0) as well as the empty string can be used to not set a proxy, this is the default
     std::string proxyArg = GetArg("-proxy", "");
+    SetLimited(NET_TOR);
     if (proxyArg != "" && proxyArg != "0") {
         proxyType addrProxy = proxyType(CService(proxyArg, 9050), proxyRandomize);
         if (!addrProxy.IsValid())
@@ -1184,7 +1185,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         SetProxy(NET_IPV6, addrProxy);
         SetProxy(NET_TOR, addrProxy);
         SetNameProxy(addrProxy);
-        SetReachable(NET_TOR); // by default, -proxy sets onion as reachable, unless -noonion later
+        SetLimited(NET_TOR, false); // by default, -proxy sets onion as reachable, unless -noonion later
     }
 
     // -onion can be used to set only a proxy for .onion, or override normal proxy for .onion addresses
@@ -1193,13 +1194,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     std::string onionArg = GetArg("-onion", "");
     if (onionArg != "") {
         if (onionArg == "0") { // Handle -noonion/-onion=0
-            SetReachable(NET_TOR, false); // set onions as unreachable
+            SetLimited(NET_TOR); // set onions as unreachable
         } else {
             proxyType addrOnion = proxyType(CService(onionArg, 9050), proxyRandomize);
             if (!addrOnion.IsValid())
                 return InitError(strprintf(_("Invalid -onion address: '%s'"), onionArg));
             SetProxy(NET_TOR, addrOnion);
-            SetReachable(NET_TOR);
+            SetLimited(NET_TOR, false);
         }
     }
 
diff --git a/src/net.cpp b/src/net.cpp
@@ -77,7 +77,6 @@ bool fListen = true;
 uint64_t nLocalServices = NODE_NETWORK;
 CCriticalSection cs_mapLocalHost;
 map<CNetAddr, LocalServiceInfo> mapLocalHost;
-static bool vfReachable[NET_MAX] = {};
 static bool vfLimited[NET_MAX] = {};
 static CNode* pnodeLocalHost = NULL;
 uint64_t nLocalHostNonce = 0;
@@ -224,14 +223,6 @@ void AdvertiseLocal(CNode *pnode)
     }
 }
 
-void SetReachable(enum Network net, bool fFlag)
-{
-    LOCK(cs_mapLocalHost);
-    vfReachable[net] = fFlag;
-    if (net == NET_IPV6 && fFlag)
-        vfReachable[NET_IPV4] = true;
-}
-
 // learn a new local address
 bool AddLocal(const CService& addr, int nScore)
 {
@@ -254,7 +245,6 @@ bool AddLocal(const CService& addr, int nScore)
             info.nScore = nScore + (fAlready ? 1 : 0);
             info.nPort = addr.GetPort();
         }
-        SetReachable(addr.GetNetwork());
     }
 
     return true;
@@ -317,7 +307,7 @@ bool IsLocal(const CService& addr)
 bool IsReachable(enum Network net)
 {
     LOCK(cs_mapLocalHost);
-    return vfReachable[net] && !vfLimited[net];
+    return !vfLimited[net];
 }
 
 /** check whether a given address is in a network we can probably connect to */
diff --git a/src/net.h b/src/net.h
@@ -146,7 +146,6 @@ bool IsLocal(const CService& addr);
 bool GetLocal(CService &addr, const CNetAddr *paddrPeer = NULL);
 bool IsReachable(enum Network net);
 bool IsReachable(const CNetAddr &addr);
-void SetReachable(enum Network net, bool fFlag = true);
 CAddress GetLocalAddress(const CNetAddr *paddrPeer = NULL);
 
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
@@ -460,7 +460,7 @@ void TorController::auth_cb(TorControlConnection& conn, const TorControlReply& r
         if (GetArg("-onion", "") == "") {
             proxyType addrOnion = proxyType(CService("127.0.0.1", 9050), true);
             SetProxy(NET_TOR, addrOnion);
-            SetReachable(NET_TOR);
+            SetLimited(NET_TOR, false);
         }
 
         // Finally - now create the service

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ bool fListen = true;`
`77`	`77`	`uint64_t nLocalServices = NODE_NETWORK;`
`78`	`78`	`CCriticalSection cs_mapLocalHost;`
`79`	`79`	`map<CNetAddr, LocalServiceInfo> mapLocalHost;`
`80`		`-static bool vfReachable[NET_MAX] = {};`
`81`	`80`	`static bool vfLimited[NET_MAX] = {};`
`82`	`81`	`static CNode* pnodeLocalHost = NULL;`
`83`	`82`	`uint64_t nLocalHostNonce = 0;`
`@@ -224,14 +223,6 @@ void AdvertiseLocal(CNode *pnode)`
`224`	`223`	`}`
`225`	`224`	`}`
`226`	`225`
`227`		`-void SetReachable(enum Network net, bool fFlag)`
`228`		`-{`
`229`		`- LOCK(cs_mapLocalHost);`
`230`		`- vfReachable[net] = fFlag;`
`231`		`- if (net == NET_IPV6 && fFlag)`
`232`		`- vfReachable[NET_IPV4] = true;`
`233`		`-}`
`234`		`-`
`235`	`226`	`// learn a new local address`
`236`	`227`	`bool AddLocal(const CService& addr, int nScore)`
`237`	`228`	`{`
`@@ -254,7 +245,6 @@ bool AddLocal(const CService& addr, int nScore)`
`254`	`245`	`info.nScore = nScore + (fAlready ? 1 : 0);`
`255`	`246`	`info.nPort = addr.GetPort();`
`256`	`247`	`}`
`257`		`- SetReachable(addr.GetNetwork());`
`258`	`248`	`}`
`259`	`249`
`260`	`250`	`return true;`
`@@ -317,7 +307,7 @@ bool IsLocal(const CService& addr)`
`317`	`307`	`bool IsReachable(enum Network net)`
`318`	`308`	`{`
`319`	`309`	`LOCK(cs_mapLocalHost);`
`320`		`- return vfReachable[net] && !vfLimited[net];`
	`310`	`+ return !vfLimited[net];`
`321`	`311`	`}`
`322`	`312`
`323`	`313`	`/** check whether a given address is in a network we can probably connect to */`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ void TorController::auth_cb(TorControlConnection& conn, const TorControlReply& r`
`460`	`460`	`if (GetArg("-onion", "") == "") {`
`461`	`461`	`proxyType addrOnion = proxyType(CService("127.0.0.1", 9050), true);`
`462`	`462`	`SetProxy(NET_TOR, addrOnion);`
`463`		`- SetReachable(NET_TOR);`
	`463`	`+ SetLimited(NET_TOR, false);`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`// Finally - now create the service`