Merge branch 'shy'

2011-03-14 09:15:06 -04:00
parent 4b88647966 cbc920d474
commit 27b7f3b43a
2 changed files with 20 additions and 8 deletions
--- a/main.cpp
+++ b/main.cpp
@@ -2396,6 +2396,10 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
            return true;
        }

+        // Be shy and don't send version until we hear
+        if (pfrom->fInbound)
+            pfrom->PushVersion();
+
        pfrom->fClient = !(pfrom->nServices & NODE_NETWORK);

        AddTimeData(pfrom->addr.ip, nTime);