more compact CAddrInfo serialization + bugfix

db.cpp

@@ -61,7 +61,7 @@ bool CAddrDb::Get_(CIPPort &ip, int &wait) {
       }
       unkId.erase(ret);
     } else {
-      int ret = ourId.front();
+      ret = ourId.front();
       if (time(NULL) - idToInfo[ret].ourLastTry < MIN_RETRY) return false;
       ourId.pop_front();
     }
@@ -169,7 +169,7 @@ void CAddrDb::Add_(const CAddress &addr) {
   int id = nId++;
   idToInfo[id] = ai;
   ipToId[ipp] = id;
-  printf("%s: added\n", ToString(ipp).c_str(), ipToId[ipp]);
+//  printf("%s: added\n", ToString(ipp).c_str(), ipToId[ipp]);
   unkId.insert(id);
   nDirty++;
 }

db.h

@@ -100,15 +100,19 @@ public:
     READWRITE(ip);
     READWRITE(services);
     READWRITE(lastTry);
-    READWRITE(ourLastTry);
+    unsigned char tried = ourLastTry != 0;
-    READWRITE(ignoreTill);
+    READWRITE(tried);
-    READWRITE(stat2H);
+    if (tried) {
-    READWRITE(stat8H);
+      READWRITE(ourLastTry);
-    READWRITE(stat1D);
+      READWRITE(ignoreTill);
-    READWRITE(stat1W);
+      READWRITE(stat2H);
-    READWRITE(total);
+      READWRITE(stat8H);
-    READWRITE(success);
+      READWRITE(stat1D);
-    READWRITE(clientVersion);
+      READWRITE(stat1W);
+      READWRITE(total);
+      READWRITE(success);
+      READWRITE(clientVersion);
+    }
   )
 };