major cleanup, updated for twisted

[quix0rs-apt-p2p.git] / knode.py

diff --git a/knode.py b/knode.py
index f952795c6d647634dd156a85487115aa424e83f7..70069fae710339686bd978bfca8ecf802afe505a 100644 (file)
--- a/knode.py
+++ b/knode.py
@@ -1,3 +1,6 @@
+## Copyright 2002-2003 Andrew Loewenstern, All Rights Reserved
+# see LICENSE.txt for license information
+
 from node import Node
 from twisted.internet.defer import Deferred
 from const import reactor, NULL_ID
@@ -10,27 +13,29 @@ class IDChecker:
 class KNode(Node):
     def checkSender(self, dict):
         try:
-            senderid = dict['sender']['id']
+            senderid = dict['rsp']['sender']['id']
         except KeyError:
+            print ">>>> No peer id in response"
             raise Exception, "No peer id in response."
         else:
             if self.id != NULL_ID and senderid != self.id:
+                print "Got response from different node than expected."
                 raise Exception, "Got response from different node than expected."
         return dict
         
     def ping(self, sender):
-        df = self.conn.protocol.sendRequest('ping', {"sender":sender})
+        df = self.conn.sendRequest('ping', {"sender":sender})
         df.addCallback(self.checkSender)
         return df
     def findNode(self, target, sender):
-        df = self.conn.protocol.sendRequest('find_node', {"target" : target, "sender": sender})
+        df = self.conn.sendRequest('find_node', {"target" : target, "sender": sender})
         df.addCallback(self.checkSender)
         return df
     def storeValue(self, key, value, sender):
-        df = self.conn.protocol.sendRequest('store_value', {"key" : key, "value" : value, "sender": sender})
+        df = self.conn.sendRequest('store_value', {"key" : key, "value" : value, "sender": sender})
         df.addCallback(self.checkSender)
         return df
     def findValue(self, key, sender):
-        df =  self.conn.protocol.sendRequest('find_value', {"key" : key, "sender" : sender})
+        df =  self.conn.sendRequest('find_value', {"key" : key, "sender" : sender})
         df.addCallback(self.checkSender)
         return df