nLastTry is only used for addrman entries

sipa · sipa · commit 1d5b47a90337 · 2015-04-19T11:10:23.000-07:00
No need to define it for every CAddress, as it's memory only anyway.
diff --git a/src/addrman.cpp b/src/addrman.cpp
@@ -332,10 +332,10 @@ void CAddrMan::Attempt_(const CService& addr, int64_t nTime)
     info.nAttempts++;
 }
 
-CAddress CAddrMan::Select_()
+CAddrInfo CAddrMan::Select_()
 {
     if (size() == 0)
-        return CAddress();
+        return CAddrInfo();
 
     // Use a 50% chance for choosing between tried and new table entries.
     if (nTried > 0 && (nNew == 0 || GetRandInt(2) == 0)) {
diff --git a/src/addrman.h b/src/addrman.h
@@ -22,16 +22,17 @@
  */
 class CAddrInfo : public CAddress
 {
+public:
+    //! last try whatsoever by us (memory only)
+    int64_t nLastTry;
+
 private:
     //! where knowledge about this address first came from
     CNetAddr source;
 
     //! last successful connection by us
     int64_t nLastSuccess;
 
-    //! last try whatsoever by us:
-    // int64_t CAddress::nLastTry
-
     //! connection attempts since last successful attempt
     int nAttempts;
 
@@ -231,7 +232,7 @@ class CAddrMan
 
     //! Select an address to connect to.
     //! nUnkBias determines how much to favor new addresses over tried ones (min=0, max=100)
-    CAddress Select_();
+    CAddrInfo Select_();
 
 #ifdef DEBUG_ADDRMAN
     //! Perform consistency check. Returns an error code or zero.
@@ -533,9 +534,9 @@ class CAddrMan
      * Choose an address to connect to.
      * nUnkBias determines how much "new" entries are favored over "tried" ones (0-100).
      */
-    CAddress Select()
+    CAddrInfo Select()
     {
-        CAddress addrRet;
+        CAddrInfo addrRet;
         {
             LOCK(cs);
             Check();
diff --git a/src/net.cpp b/src/net.cpp
@@ -1221,7 +1221,7 @@ void ThreadOpenConnections()
         int nTries = 0;
         while (true)
         {
-            CAddress addr = addrman.Select();
+            CAddrInfo addr = addrman.Select();
 
             // if we selected an invalid address, restart
             if (!addr.IsValid() || setConnected.count(addr.GetGroup()) || IsLocal(addr))
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -89,7 +89,6 @@ void CAddress::Init()
 {
     nServices = NODE_NETWORK;
     nTime = 100000000;
-    nLastTry = 0;
 }
 
 CInv::CInv()
diff --git a/src/protocol.h b/src/protocol.h
@@ -116,9 +116,6 @@ class CAddress : public CService
 
     // disk and network only
     unsigned int nTime;
-
-    // memory only
-    int64_t nLastTry;
 };
 
 /** inv message data */

Original file line number	Diff line number	Diff line change
`@@ -332,10 +332,10 @@ void CAddrMan::Attempt_(const CService& addr, int64_t nTime)`
`332`	`332`	`info.nAttempts++;`
`333`	`333`	`}`
`334`	`334`
`335`		`-CAddress CAddrMan::Select_()`
	`335`	`+CAddrInfo CAddrMan::Select_()`
`336`	`336`	`{`
`337`	`337`	`if (size() == 0)`
`338`		`- return CAddress();`
	`338`	`+ return CAddrInfo();`
`339`	`339`
`340`	`340`	`// Use a 50% chance for choosing between tried and new table entries.`
`341`	`341`	`if (nTried > 0 && (nNew == 0 \|\| GetRandInt(2) == 0)) {`
Original file line number	Diff line number	Diff line change
`@@ -1221,7 +1221,7 @@ void ThreadOpenConnections()`
`1221`	`1221`	`int nTries = 0;`
`1222`	`1222`	`while (true)`
`1223`	`1223`	`{`
`1224`		`- CAddress addr = addrman.Select();`
	`1224`	`+ CAddrInfo addr = addrman.Select();`
`1225`	`1225`
`1226`	`1226`	`// if we selected an invalid address, restart`
`1227`	`1227`	`if (!addr.IsValid() \|\| setConnected.count(addr.GetGroup()) \|\| IsLocal(addr))`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ void CAddress::Init()`
`89`	`89`	`{`
`90`	`90`	`nServices = NODE_NETWORK;`
`91`	`91`	`nTime = 100000000;`
`92`		`- nLastTry = 0;`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`CInv::CInv()`