Make it also work from the command-line.

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

diff --git a/knode.py b/knode.py
index 44341ae6324386a1e8782b82f584266eaa2ebc6e..d2cea727766f3d9865febb7bdc46043a99307f5c 100644 (file)
--- 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,6 +32,15 @@ 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)
@@ -47,8 +51,3 @@ class KNode(Node):
         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})
-        df.addErrback(self.errBack)
-        df.addCallback(self.checkSender)
-        return df