return K nodes and not K-1

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

diff --git a/khashmir.py b/khashmir.py
index 104c9e949211160848889d16899c193457cb0d49..ca6c3d0d1d5cd7c15e0b56f84b127615503d308b 100644 (file)
--- a/khashmir.py
+++ b/khashmir.py
@@ -1,6 +1,8 @@
 ## Copyright 2002 Andrew Loewenstern, All Rights Reserved
 
 from const import reactor
+import const
+
 import time
 from pickle import loads, dumps
 from sha import sha
@@ -23,9 +25,6 @@ from bsddb3._db import DBNotFoundError
 
 from xmlrpclib import Binary
 
-# don't ping unless it's been at least this many seconds since we've heard from a peer
-MAX_PING_INTERVAL = 60 * 15 # fifteen minutes
-
 
 
 # this is the main class!
@@ -126,12 +125,12 @@ class Khashmir(xmlrpc.XMLRPC):
                    def default(err, node=node, table=table):
                        table.nodeFailed(node)
                    df = node.storeValue(key, value, self.node.senderDict())
-                   df.addCallbacks(cb, default)
+                   df.addCallback(cb)
        # this call is asynch
        self.findNode(key, _storeValueForKey)
        
        
-    def insertNode(self, n):
+    def insertNode(self, n, contacted=1):
        """
        insert a node in our local table, pinging oldest contact in bucket, if necessary
        
@@ -140,8 +139,8 @@ class Khashmir(xmlrpc.XMLRPC):
        a node into the table without it's peer-ID.  That means of course the node passed into this
        method needs to be a properly formed Node object with a valid ID.
        """
-       old = self.table.insertNode(n)
-       if old and (time.time() - old.lastSeen) > MAX_PING_INTERVAL and old.id != self.node.id:
+       old = self.table.insertNode(n, contacted=contacted)
+       if old and (time.time() - old.lastSeen) > const.MIN_PING_INTERVAL and old.id != self.node.id:
            # the bucket is full, check to see if old node is still around and if so, replace it
            
            ## these are the callbacks used when we ping the oldest node in a bucket
@@ -151,6 +150,8 @@ class Khashmir(xmlrpc.XMLRPC):
        
            def _notStaleNodeHandler(sender, old=old):
                """ called when we get a pong from the old node """
+               sender, conn = sender
+               sender['host'] = conn['host']
                sender = Node().initWithDict(sender)
                if sender.id == old.id:
                    self.table.justSeenNode(old)
@@ -166,11 +167,11 @@ class Khashmir(xmlrpc.XMLRPC):
        df = node.ping(self.node.senderDict())
        ## these are the callbacks we use when we issue a PING
        def _pongHandler(sender, id=node.id, host=node.host, port=node.port, table=self.table):
+           sender = sender[0]
            if id != 20 * ' ' and id != sender['id'].data:
                # whoah, got response from different peer than we were expecting
                pass
            else:
-               #print "Got PONG from %s at %s:%s" % (`msg['id']`, t.target.host, t.target.port)
                sender['host'] = host
                sender['port'] = port
                n = Node().initWithDict(sender)
@@ -230,7 +231,7 @@ class Khashmir(xmlrpc.XMLRPC):
        ip = self.crequest.getClientIP()
        sender['host'] = ip
        n = Node().initWithDict(sender)
-       self.insertNode(n)
+       self.insertNode(n, contacted=0)
        return self.node.senderDict()
                
     def xmlrpc_find_node(self, target, sender):
@@ -239,7 +240,7 @@ class Khashmir(xmlrpc.XMLRPC):
        ip = self.crequest.getClientIP()
        sender['host'] = ip
        n = Node().initWithDict(sender)
-       self.insertNode(n)
+       self.insertNode(n, contacted=0)
        return nodes, self.node.senderDict()
     
     def xmlrpc_store_value(self, key, value, sender):
@@ -260,7 +261,7 @@ class Khashmir(xmlrpc.XMLRPC):
        ip = self.crequest.getClientIP()
        sender['host'] = ip
        n = Node().initWithDict(sender)
-       self.insertNode(n)
+       self.insertNode(n, contacted=0)
        return self.node.senderDict()
        
     def xmlrpc_find_value(self, key, sender):
@@ -268,7 +269,7 @@ class Khashmir(xmlrpc.XMLRPC):
        key = key.data
        sender['host'] = ip
        n = Node().initWithDict(sender)
-       self.insertNode(n)
+       self.insertNode(n, contacted=0)
 
        l = self.retrieveValues(key)
        if len(l) > 0:
@@ -384,7 +385,7 @@ def test_find_value(l, quiet=0):
            try:
                if(len(values) == 0):
                    if not self.found:
-                       print "find                FAILED"
+                       print "find                NOT FOUND"
                    else:
                        print "find                FOUND"
                    sys.stdout.flush()
@@ -402,14 +403,18 @@ def test_find_value(l, quiet=0):
     d.valueForKey(key, cb(fc).callback)    
     fc.wait()
     
-def test_one(port):
+def test_one(host, port):
     import thread
-    k = Khashmir('localhost', port)
+    k = Khashmir(host, port)
     thread.start_new_thread(k.app.run, ())
     return k
     
 if __name__ == "__main__":
-    l = test_build_net()
+    import sys
+    n = 8
+    if len(sys.argv) > 1:
+       n = int(sys.argv[1])
+    l = test_build_net(peers=n)
     time.sleep(3)
     print "finding nodes..."
     for i in range(10):