major cleanup, updated for twisted

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

diff --git a/knode.py b/knode.py
index a15c568b9e11c8d4af6d35fd969376f9aaa0ebb6..70069fae710339686bd978bfca8ecf802afe505a 100644 (file)
--- a/knode.py
+++ b/knode.py
@@ -1,38 +1,41 @@
+## 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 xmlrpcclient import XMLRPCClientFactory as factory
 from const import reactor, NULL_ID
 
+
+class IDChecker:
+    def __init__(id):
+        self.id = id
+
 class KNode(Node):
-    def makeResponse(self, df):
-       def _callback(args, d=df):
-           try:
-               l, sender = args
-           except:
-               d.callback(args)
-           else:
-               if self.id != NULL_ID and sender['id'] != self._senderDict['id']:
-                   d.errback()
-               else:
-                   d.callback(args)
-       return _callback
+    def checkSender(self, dict):
+        try:
+            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 = Deferred()
-       f = factory('ping', (sender,), self.makeResponse(df), df.errback)
-       reactor.connectTCP(self.host, self.port, f)
-       return df
+        df = self.conn.sendRequest('ping', {"sender":sender})
+        df.addCallback(self.checkSender)
+        return df
     def findNode(self, target, sender):
-       df = Deferred()
-       f = factory('find_node', (target.encode('base64'), sender), self.makeResponse(df), df.errback)
-       reactor.connectTCP(self.host, self.port, f)
-       return df
+        df = self.conn.sendRequest('find_node', {"target" : target, "sender": sender})
+        df.addCallback(self.checkSender)
+        return df
     def storeValue(self, key, value, sender):
-       df = Deferred()
-       f = factory('store_value', (key.encode('base64'), value.encode('base64'), sender), self.makeResponse(df), df.errback)
-       reactor.connectTCP(self.host, self.port, f)
-       return df
+        df = self.conn.sendRequest('store_value', {"key" : key, "value" : value, "sender": sender})
+        df.addCallback(self.checkSender)
+        return df
     def findValue(self, key, sender):
-       df = Deferred()
-       f = factory('find_value', (key.encode('base64'), sender), self.makeResponse(df), df.errback)
-       reactor.connectTCP(self.host, self.port, f)
-       return df
+        df =  self.conn.sendRequest('find_value', {"key" : key, "sender" : sender})
+        df.addCallback(self.checkSender)
+        return df