X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Faddrman.h;h=fa70a079689470f3092709b1267e1a2e4ae8cbcd;hp=7af6afd78f099118d1b526ea7d5ab958bf662ab2;hb=18770118e846622f59a86f9937a33da0bb761775;hpb=95dd79118759f3e14a3d3e093111676e2efea8f9

diff --git a/src/addrman.h b/src/addrman.h
index 7af6afd..fa70a07 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -245,6 +245,7 @@ protected:
 
 public:
 
+#ifndef _MSC_VER 
     IMPLEMENT_SERIALIZE
     (({
         // serialized format:
@@ -378,7 +379,183 @@ public:
             }
         }
     });)
+#else
+    IMPLEMENT_SERIALIZE
+            (
+            LOCK(cs);
+                unsigned char 
+                    nVersion = 0;
+
+                READWRITE(nVersion);
+                READWRITE(nKey);
+                READWRITE(nNew);
+                READWRITE(nTried);
+
+                CAddrMan 
+                    *am = const_cast<CAddrMan*>(this);
+
+                if (fWrite)
+                {
+                    int 
+                        nUBuckets = ADDRMAN_NEW_BUCKET_COUNT;
+
+                    READWRITE(nUBuckets);
+/************
+                    std::map<int, int>  
+                        mapUnkIds;
+************/  
+                    int 
+                        nIds = 0;
+                    for (std::map<int, CAddrInfo>::iterator it = am->mapInfo.begin(); it != am->mapInfo.end(); it++)
+                    {
+                        if (nIds == nNew) 
+                            break; // this means nNew was wrong, oh ow
+                        mapUnkIds[(*it).first] = nIds;
+
+                        CAddrInfo 
+                            &info = (*it).second;
+
+                        if (info.nRefCount)
+                        {
+                            READWRITE(info);
+                            nIds++;
+                        }
+                    }
+                    nIds = 0;
+                    for (std::map<int, CAddrInfo>::iterator it = am->mapInfo.begin(); it != am->mapInfo.end(); it++)
+                    {
+                        if (nIds == nTried) 
+                            break; /* this means nTried was wrong, oh ow */
+
+                        CAddrInfo 
+                            &info = (*it).second;
+
+                        if (info.fInTried)
+                        {
+                            READWRITE(info);
+                            nIds++;
+                        }
+                    }
+                    for (
+                         std::vector<std::set<int> >::iterator it = am->vvNew.begin(); 
+                         it != am->vvNew.end(); 
+                         it++
+                        )
+                    {
+                        std::set<int> 
+                            &vNew = (*it);
+
+                        int 
+                            nSize = int( vNew.size() );
+
+                        READWRITE(nSize);
+                        for (std::set<int>::iterator it2 = vNew.begin(); it2 != vNew.end(); it2++)
+                        {
+                        int 
+                            nIndex = mapUnkIds[*it2];
+                        READWRITE(nIndex);
+                        }
+                    }
+                } 
+                else 
+                {
+                    int 
+                        nUBuckets = 0;
+
+                    READWRITE(nUBuckets);
+                    am->nIdCount = 0;
+                    am->mapInfo.clear();
+                    am->mapAddr.clear();
+                    am->vRandom.clear();
+                    am->vvTried = 
+                        std::vector<std::vector<int> >(
+                                                        ADDRMAN_TRIED_BUCKET_COUNT, 
+                                                        std::vector<int>(0)
+                                                      );
+                    am->vvNew = 
+                        std::vector<std::set<int> >(
+                                                    ADDRMAN_NEW_BUCKET_COUNT, 
+                                                    std::set<int>()
+                                                   );
+                    for (int n = 0; n < am->nNew; n++)
+                    {
+                        CAddrInfo 
+                            &info = am->mapInfo[n];
+
+                        READWRITE(info);
+                        am->mapAddr[info] = n;
+                        info.nRandomPos = int( vRandom.size() );
+                        am->vRandom.push_back(n);
+                        if (nUBuckets != ADDRMAN_NEW_BUCKET_COUNT)
+                        {
+                            am->vvNew[info.GetNewBucket(am->nKey)].insert(n);
+                            info.nRefCount++;
+                        }
+                    }
+                    am->nIdCount = am->nNew;
+
+                    int 
+                        nLost = 0;
+
+                    for (int n = 0; n < am->nTried; n++)
+                    {
+                        CAddrInfo 
+                            info;
+
+                        READWRITE(info);
+
+                        std::vector<int> 
+                            &vTried = am->vvTried[info.GetTriedBucket(am->nKey)];
+
+                        if (vTried.size() < ADDRMAN_TRIED_BUCKET_SIZE)
+                        {
+                            info.nRandomPos = int( vRandom.size() );
+                            info.fInTried = true;
+                            am->vRandom.push_back(am->nIdCount);
+                            am->mapInfo[am->nIdCount] = info;
+                            am->mapAddr[info] = am->nIdCount;
+                            vTried.push_back(am->nIdCount);
+                            am->nIdCount++;
+                        } 
+                        else 
+                        {
+                            nLost++;
+                        }
+                    }
+                    am->nTried -= nLost;
+                    for (int b = 0; b < nUBuckets; b++)
+                    {
+                        std::set<int> 
+                            &vNew = am->vvNew[b];
+
+                        int 
+                            nSize = 0;
+
+                        READWRITE(nSize);
+                        for (int n = 0; n < nSize; n++)
+                        {
+                            int 
+                                nIndex = 0;
+
+                            READWRITE(nIndex);
+
+                            CAddrInfo 
+                                &info = am->mapInfo[nIndex];
+
+                            if (
+                                (nUBuckets == ADDRMAN_NEW_BUCKET_COUNT) && 
+                                (info.nRefCount < ADDRMAN_NEW_BUCKETS_PER_ADDRESS)
+                               )
+                            {
+                                info.nRefCount++;
+                                vNew.insert(nIndex);
+                            }
+                        }
+                    }
+                }
+            )
 
+#endif  //_MSC_VER
     CAddrMan() : vRandom(0), vvTried(ADDRMAN_TRIED_BUCKET_COUNT, std::vector<int>(0)), vvNew(ADDRMAN_NEW_BUCKET_COUNT, std::set<int>())
     {
          nKey.resize(32);