Make it also work from the command-line.

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

diff --git a/knode.py b/knode.py
index 8453942ba0c3ca847a06969375cc3cb330b1b078..d2cea727766f3d9865febb7bdc46043a99307f5c 100644 (file)
--- a/knode.py
+++ b/knode.py
@@ -1,38 +1,53 @@
-from node import Node
-from twisted.internet.defer import Deferred
-from const import reactor, NULL_ID
-
+## Copyright 2002-2004 Andrew Loewenstern, All Rights Reserved
+# see LICENSE.txt for license information
 
-class IDChecker:
-    def __init__(id):
-        self.id = id
+from const import NULL_ID
+from node import Node
 
-class KNode(Node):
+class KNodeBase(Node):
     def checkSender(self, dict):
         try:
-            senderid = dict['rsp']['sender']['id']
+            senderid = dict['rsp']['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."
+                self.table.invalidateNode(self)
+                
         return dict
+
+    def errBack(self, err):
+        print ">>> ", err
+        return err
         
-    def ping(self, sender):
-        df = self.conn.protocol.sendRequest('ping', {"sender":sender})
+    def ping(self, id):
+        df = self.conn.sendRequest('ping', {"id":id})
+        df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df
-    def findNode(self, target, sender):
-        df = self.conn.protocol.sendRequest('find_node', {"target" : target, "sender": sender})
+    def findNode(self, target, id):
+        df = self.conn.sendRequest('find_node', {"target" : target, "id": id})
+        df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df
-    def storeValue(self, key, value, sender):
-        df = self.conn.protocol.sendRequest('store_value', {"key" : key, "value" : value, "sender": sender})
+
+class KNodeRead(KNodeBase):
+    def findValue(self, key, id):
+        df =  self.conn.sendRequest('find_value', {"key" : key, "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})
+        df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df
-    def findValue(self, key, sender):
-        df =  self.conn.protocol.sendRequest('find_value', {"key" : key, "sender" : sender})
+    def storeValues(self, key, value, id):
+        df = self.conn.sendRequest('store_values', {"key" : key, "values" : value, "id": id})
+        df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df