Peerdisc: handle protocol 1.1 server.version replies

2017-09-07 17:03:17 +09:00 · 2017-09-07 17:03:17 +09:00 · 794e1d86ff
commit 794e1d86ff
parent af9c82dbdb
1 changed files with 7 additions and 3 deletions
--- a/server/peers.py
+++ b/server/peers.py
@ -176,9 +176,13 @@ class PeerSession(JSONSession):
        if error:
            self.failed = True
            self.log_error('server.version returned an error')
-        elif isinstance(result, str):
-            self.peer.server_version = result
-            self.peer.features['server_version'] = result
+        else:
+            # Protocol version 1.1 returns a pair with the version first
+            if isinstance(result, list) and len(result) == 2:
+                result = result[0]
+            if isinstance(result, str):
+                self.peer.server_version = result
+                self.peer.features['server_version'] = result
        self.close_if_done()

    def check_remote_peers(self):