Remove the originated time from the DHT value storage.

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

diff --git a/apt_dht_Khashmir/knode.py b/apt_dht_Khashmir/knode.py
index d2cea727766f3d9865febb7bdc46043a99307f5c..984514aae75f7ef1241882bfc7975119f3efa4b2 100644 (file)
--- a/apt_dht_Khashmir/knode.py
+++ b/apt_dht_Khashmir/knode.py
@@ -1,25 +1,26 @@
 ## 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.python import log
+
+from node import Node, NULL_ID
 
 class KNodeBase(Node):
     def checkSender(self, dict):
         try:
             senderid = dict['rsp']['id']
         except KeyError:
-            print ">>>> No peer id in response"
+            log.msg("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."
+                log.msg("Got response from different node than expected.")
                 self.table.invalidateNode(self)
                 
         return dict
 
     def errBack(self, err):
-        print ">>> ", err
+        log.err(err)
         return err
         
     def ping(self, id):
@@ -27,6 +28,13 @@ class KNodeBase(Node):
         df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df
+    
+    def join(self, id):
+        df = self.conn.sendRequest('join', {"id":id})
+        df.addErrback(self.errBack)
+        df.addCallback(self.checkSender)
+        return df
+    
     def findNode(self, target, id):
         df = self.conn.sendRequest('find_node', {"target" : target, "id": id})
         df.addErrback(self.errBack)
@@ -46,8 +54,3 @@ class KNodeWrite(KNodeRead):
         df.addErrback(self.errBack)
         df.addCallback(self.checkSender)
         return df
-    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