ripped out xmlrpc, experimented with xmlrpc but with bencode, finally

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

diff --git a/knode.py b/knode.py
index a15c568b9e11c8d4af6d35fd969376f9aaa0ebb6..b5ecedcc0bfd6d70b25b2b53a6d689d877f01f94 100644 (file)
--- a/knode.py
+++ b/knode.py
@@ -1,38 +1,27 @@
 from node import Node
 from twisted.internet.defer import Deferred
-from xmlrpcclient import XMLRPCClientFactory as factory
 from const import reactor, NULL_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
+        """ Make our callback cover that checks to make sure the id of the response is the same as what we are expecting """
+        def _callback(dict, d=df):
+            try:
+                senderid = dict['sender']['id']
+            except KeyError:
+                d.errback()
+            else:
+                if self.id != NULL_ID and senderid != self._senderDict['id']:
+                    d.errback()
+                else:
+                    d.callback(dict)
+        return _callback
+        
     def ping(self, sender):
-       df = Deferred()
-       f = factory('ping', (sender,), self.makeResponse(df), df.errback)
-       reactor.connectTCP(self.host, self.port, f)
-       return df
+        return self.conn.protocol.sendRequest('ping', {"sender":sender})
     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
+        return self.conn.protocol.sendRequest('find_node', {"target" : target, "sender": sender})
     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
+        return self.conn.protocol.sendRequest('store_value', {"key" : key, "value" : value, "sender": sender})
     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
+        return self.conn.protocol.sendRequest('find_value', {"key" : key, "sender" : sender})
\ No newline at end of file