Don't rely on external IP resolvers.

adapts the Bitcoin way of figuring the IP address.

Occasionally the IP address as reported by the peer is reported to them
back. If this leads to more incoming connections, they had better
knowing of our IP than we did.

also changed:
 * Debug from NOISY to NET
 * cleanup of mixed vfLimited and vfReachable.
 * some re-sorting to match the order in bitcoins net.cpp more closely
 * smeared timeout for address broadcasts.

Author: Tetrix42

src/init.cpp

@@ -781,7 +781,7 @@ bool AppInit2(ThreadHandlerPtr threads)
         for (int n = 0; n < NET_MAX; n++) {
             enum Network net = (enum Network)n;
             if (!nets.count(net))
-                SetLimited(net);
+                SetReachable(net, false);
         }
     }
 
@@ -812,7 +812,7 @@ bool AppInit2(ThreadHandlerPtr threads)
         if (!addrOnion.IsValid())
             return InitError(strprintf(_("Invalid -tor address: '%s'"), mapArgs["-tor"]));
         SetProxy(NET_TOR, addrOnion, 5);
-        SetReachable(NET_TOR);
+        SetReachable(NET_TOR, true);
     }
 
     // see Step 2: parameter interactions for more information about these

src/main.cpp

@@ -3872,9 +3872,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
 
 
+        pfrom->addrLocal = addrMe;
         if (pfrom->fInbound && addrMe.IsRoutable())
         {
-            pfrom->addrLocal = addrMe;
             SeenLocal(addrMe);
         }
 
@@ -3912,9 +3912,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // Advertise our address
             if (!fNoListen && !IsInitialBlockDownload())
             {
-                CAddress addr = GetLocalAddress(&pfrom->addr);
-                if (addr.IsRoutable())
-                    pfrom->PushAddress(addr);
+                AdvertiseLocal(pfrom);
             }
 
             // Get recent addresses
@@ -4737,27 +4735,19 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
     ResendWalletTransactions();
 
     // Address refresh broadcast
-    static int64_t nLastRebroadcast;
-    if (!IsInitialBlockDownload() && ( GetAdjustedTime() - nLastRebroadcast > 24 * 60 * 60))
+    if (!IsInitialBlockDownload())
     {
+        if (GetAdjustedTime() > pto->nNextRebroadcastTime)
         {
-            LOCK(cs_vNodes);
-            for (auto const& pnode : vNodes)
+            // Periodically clear setAddrKnown to allow refresh broadcasts
+            //pnode->setAddrKnown.clear();
+            // Rebroadcast our address
+            if (!fNoListen)
             {
-                // Periodically clear setAddrKnown to allow refresh broadcasts
-                if (nLastRebroadcast)
-                    pnode->setAddrKnown.clear();
-
-                // Rebroadcast our address
-                if (!fNoListen)
-                {
-                    CAddress addr = GetLocalAddress(&pnode->addr);
-                    if (addr.IsRoutable())
-                        pnode->PushAddress(addr);
-                }
+                AdvertiseLocal(pto);
+                pto->nNextRebroadcastTime = GetAdjustedTime() + 12*60*60 + GetRand(12*60*60);
             }
         }
-        nLastRebroadcast =  GetAdjustedTime();
     }
 
     //