Merge pull request #865 from benemorius/fix-add-knownnodes-call

fix/remove incorrect add_known_node() call

node/dht.py

@@ -46,7 +46,7 @@ def start(self, seed_peer):
         """
         ip = seed_peer.ip
         port = seed_peer.port
-        self.add_known_node(('tcp://%s:%s' % (ip, port), seed_peer.guid, seed_peer.nickname))
+        self._add_known_node(('tcp://%s:%s' % (ip, port), seed_peer.guid, seed_peer.nickname))
 
         self.log.debug('Starting Seed Peer: %s', seed_peer.nickname)
         self.add_peer(self.transport,
@@ -128,7 +128,7 @@ def add_peer(self, transport, uri, pubkey=None, guid=None, nickname=None):
             self.log.debug("This peer is already known and up to date")
             return
         else:
-            self.add_known_node(peer_tuple)
+            self._add_known_node(peer_tuple)
 
         self.log.info(
             'New peer seen; starting handshake - %s %s %s',
@@ -144,7 +144,7 @@ def cb():
         t = Thread(target=new_peer.start_handshake, args=(cb,))
         t.start()
 
-    def add_known_node(self, node):
+    def _add_known_node(self, node):
         """ Accept a peer tuple and add it to known nodes list
         :param node: (tuple)
         :return: N/A

node/transport.py

@@ -7,7 +7,6 @@
 import sys
 from threading import Thread
 import traceback
-from urlparse import urlparse
 import xmlrpclib
 
 import gnupg
@@ -471,12 +470,9 @@ def _on_message(self, msg):
 
         pubkey = msg.get('pubkey')
         uri = msg.get('uri')
-        ip = urlparse(uri).hostname
-        port = urlparse(uri).port
         guid = msg.get('senderGUID')
         nickname = msg.get('senderNick')[:120]
 
-        self.dht.add_known_node((ip, port, guid, nickname))
         self.log.info('On Message: %s', json.dumps(msg, ensure_ascii=False))
         self.dht.add_peer(self, uri, pubkey, guid, nickname)
         t = Thread(target=self.trigger_callbacks, args=(msg['type'], msg,))