more constants

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

diff --git a/knode.py b/knode.py
index 66b8b5318d9c25e2425a0e0306e2c525e418708f..3e32ce83409aebffe04eec98f17b5dec1533e508 100644 (file)
--- a/knode.py
+++ b/knode.py
@@ -2,8 +2,10 @@ from node import Node
 from twisted.internet.defer import Deferred
 from xmlrpcclient import XMLRPCClientFactory as factory
 from const import reactor
 from twisted.internet.defer import Deferred
 from xmlrpcclient import XMLRPCClientFactory as factory
 from const import reactor

+from xmlrpclib import Binary

 
 

-class KNode(Node):
+
+class KNode(Node):     

     def ping(self, sender):
        df = Deferred()
        f = factory('ping', (sender,), df.callback, df.errback)
     def ping(self, sender):
        df = Deferred()
        f = factory('ping', (sender,), df.callback, df.errback)


@@ -11,16 +13,16 @@ class KNode(Node):
        return df
     def findNode(self, target, sender):
        df = Deferred()
        return df
     def findNode(self, target, sender):
        df = Deferred()

-       f = factory('find_node', (target, sender), df.callback, df.errback)
+       f = factory('find_node', (Binary(target), sender), df.callback, df.errback)

        reactor.connectTCP(self.host, self.port, f)
        return df
     def storeValue(self, key, value, sender):
        df = Deferred()
        reactor.connectTCP(self.host, self.port, f)
        return df
     def storeValue(self, key, value, sender):
        df = Deferred()

-       f = factory('store_value', (key, value, sender), df.callback, df.errback)
+       f = factory('store_value', (Binary(key), Binary(value), sender), df.callback, df.errback)

        reactor.connectTCP(self.host, self.port, f)
        return df
     def findValue(self, key, sender):
        reactor.connectTCP(self.host, self.port, f)
        return df
     def findValue(self, key, sender):

-       f = factory('find_value', (key, sender), df.callback, df.errback)
-       reactor.connectTCP(self.host, self.port, f)

        df = Deferred()
        df = Deferred()

+       f = factory('find_value', (Binary(key), sender), df.callback, df.errback)
+       reactor.connectTCP(self.host, self.port, f)

        return df
        return df