X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=knode.py;h=6e4f4e3ff7070410123e7bf2e09b53b9bc4de338;hb=f32345be4ef1c3b04f17251803768b363d8d1a7a;hp=f952795c6d647634dd156a85487115aa424e83f7;hpb=67ea324e46570a42861fe6a342c626738134bbfc;p=quix0rs-apt-p2p.git

diff --git a/knode.py b/knode.py
index f952795..6e4f4e3 100644
--- a/knode.py
+++ b/knode.py
@@ -1,36 +1,55 @@
+## Copyright 2002-2004 Andrew Loewenstern, All Rights Reserved
+# see LICENSE.txt for license information
+
 from node import Node
 from twisted.internet.defer import Deferred
 from const import reactor, NULL_ID
 
 
-class IDChecker:
-    def __init__(id):
-        self.id = id
-
-class KNode(Node):
+class KNodeBase(Node):
     def checkSender(self, dict):
         try:
-            senderid = dict['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:
-                raise Exception, "Got response from different node than expected."
+                print "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