Merge branch 'apt-dht' of ssh://git.camrdale.org/git/apt-dht into apt-dht

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

diff --git a/apt_dht_Khashmir/knode.py b/apt_dht_Khashmir/knode.py
index 984514aae75f7ef1241882bfc7975119f3efa4b2..ea714e603a4ffdd7fa752bf2d807db1779ef1298 100644 (file)
--- a/apt_dht_Khashmir/knode.py
+++ b/apt_dht_Khashmir/knode.py
@@ -35,22 +35,28 @@ class KNodeBase(Node):
         df.addCallback(self.checkSender)
         return df
     
-    def findNode(self, target, id):
+    def findNode(self, id, target):
         df = self.conn.sendRequest('find_node', {"target" : target, "id": id})
         df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df
 
 class KNodeRead(KNodeBase):
-    def findValue(self, key, id):
+    def findValue(self, id, key):
         df =  self.conn.sendRequest('find_value', {"key" : key, "id" : id})
         df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df
 
+    def getValue(self, id, key, num):
+        df = self.conn.sendRequest('get_value', {"key" : key, "num": num, "id" : id})
+        df.addErrback(self.errBack)
+        df.addCallback(self.checkSender)
+        return df
+
 class KNodeWrite(KNodeRead):
-    def storeValue(self, key, value, id):
-        df = self.conn.sendRequest('store_value', {"key" : key, "value" : value, "id": id})
+    def storeValue(self, id, key, value, token):
+        df = self.conn.sendRequest('store_value', {"key" : key, "value" : value, "token" : token, "id": id})
         df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df