Merge branch 'master' of http://www.github.com/greg-griffith/eccoin

project-ecc · Jun 21, 2017 · fd8b721 · fd8b721
2 parents 6301467 + 10604c7
commit fd8b721
Showing 1 changed file with 2 additions and 28 deletions.
diff --git a/src/messages.cpp b/src/messages.cpp
@@ -735,14 +735,6 @@ bool ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vR
         LogPrintf("finished processing version message \n");
     }
 
-
-    else if (pfrom->nVersion == 0)
-    {
-        pfrom->Misbehaving(1);
-        return false;
-    }
-
-
     else if (strCommand == NetMsgType::VERACK)
     {
         pfrom->vRecv.SetVersion(min(pfrom->nVersion, PROTOCOL_VERSION));
@@ -770,8 +762,9 @@ bool ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vR
 
     else if (!pfrom->fSuccessfullyConnected)
     {
+        ///dont ban just ignore for now
         // Must have a verack message before anything else
-        pfrom->Misbehaving(1);
+        //pfrom->Misbehaving(1);
         return false;
     }
 
@@ -798,25 +791,6 @@ bool ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vR
             if (fShutdown)
                 return true;
 
-            //###################
-            //###################
-            //###################
-            //###################
-            //###################
-            //###################
-            //###################
-            //###################
-            //###################
-            //###################
-            //possibly dont need
-            if ((addr.nServices & REQUIRED_SERVICES) != REQUIRED_SERVICES)
-                continue;
-            //###################
-            //###################
-            //###################
-            //###################
-            //###################
-
             if (addr.nTime <= 100000000 || addr.nTime > nNow + 10 * 60)
                 addr.nTime = nNow - 5 * 24 * 60 * 60;