renamed OrderedConnection to StreamConnection

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

diff --git a/knode.py b/knode.py
index 52abbed41f81d217b029e578579868274faade69..ef8226034f993926411fe6427d0a29eb60c09e6a 100644 (file)
--- a/knode.py
+++ b/knode.py
@@ -1,27 +1,39 @@
 from node import Node
 from twisted.internet.defer import Deferred
 from xmlrpcclient import XMLRPCClientFactory as factory
-from const import reactor
-from base64 import encodestring as encode
+from const import reactor, NULL_ID
 
 class KNode(Node):
-    def ping(self, sender):
-       df = Deferred()
-       f = factory('ping', (sender,), df.callback, df.errback)
-       reactor.connectTCP(self.host, self.port, f)
-       return df
-    def findNode(self, target, sender):
-       df = Deferred()
-       f = factory('find_node', (target, sender), df.callback, df.errback)
-       reactor.connectTCP(self.host, self.port, f)
-       return df
-    def storeValue(self, key, value, sender):
-       df = Deferred()
-       f = factory('store_value', (encode(key), encode(value), sender), df.callback, df.errback)
-       reactor.connectTCP(self.host, self.port, f)
-       return df
-    def findValue(self, key, sender):
-       df = Deferred()
-       f = factory('find_value', (encode(key), sender), df.callback, df.errback)
-       reactor.connectTCP(self.host, self.port, f)
-       return df
+       def makeResponse(self, df):
+               """ Make our callback cover that checks to make sure the id of the response is the same as what we are expecting """
+               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 ping(self, sender):
+               df = Deferred()
+               f = factory('ping', (sender,), self.makeResponse(df), df.errback)
+               reactor.connectTCP(self.host, self.port, f)
+               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
+       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
+       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