From: Forrest Voight <forrest@forre.st>
Date: Fri, 16 Mar 2012 03:27:00 +0000 (-0400)
Subject: fixed "peer too old" warning message, which previously was displayed as "peer sent... 
X-Git-Tag: 0.10.0~38
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=a503c5696db50db367c4b5ac4315df9f1ab293d7;p=p2pool.git

fixed "peer too old" warning message, which previously was displayed as "peer sent version message multiple times"
---

diff --git a/p2pool/p2p.py b/p2pool/p2p.py
index 1d862e2..e823864 100644
--- a/p2pool/p2p.py
+++ b/p2pool/p2p.py
@@ -105,8 +105,10 @@ class Protocol(bitcoin_p2p.BaseProtocol):
         ('best_share_hash', pack.PossiblyNoneType(0, pack.IntType(256))),
     ])
     def handle_version(self, version, services, addr_to, addr_from, nonce, sub_version, mode, best_share_hash):
-        if self.other_version is not None or version < 2:
+        if self.other_version is not None:
             raise PeerMisbehavingError('more than one version message')
+        if version < 2:
+            raise PeerMisbehavingError('peer too old')
         
         self.other_version = version
         self.other_sub_version = sub_version[:512]