X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=knode.py;h=d2cea727766f3d9865febb7bdc46043a99307f5c;hb=d1507ff7d3cca77f48dffe460097f6ab3cd5d567;hp=791e725c4a616cd85b1f98e9af76a97755c7b32c;hpb=3a8164f9c878f1c8af2958bc932ddfdb9f799a09;p=quix0rs-apt-p2p.git

diff --git a/knode.py b/knode.py
index 791e725..d2cea72 100644
--- a/knode.py
+++ b/knode.py
@@ -1,16 +1,10 @@
-## Copyright 2002-2003 Andrew Loewenstern, All Rights Reserved
+## Copyright 2002-2004 Andrew Loewenstern, All Rights Reserved
 # see LICENSE.txt for license information
 
+from const import NULL_ID
 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['rsp']['id']
@@ -20,7 +14,8 @@ class KNode(Node):
         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):
@@ -37,13 +32,22 @@ class KNode(Node):
         df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df
+
+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, id):
-        df =  self.conn.sendRequest('find_value', {"key" : key, "id" : id})
+    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