much better handling of ip addresses and potentially unreachable peers

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

diff --git a/actions.py b/actions.py
index edaa655a89fab9322655e55edb7e2a7a5b84d5b2..e6d53507202964e1c8c654821aa7dba18ac0225e 100644 (file)
--- a/actions.py
+++ b/actions.py
@@ -10,9 +10,6 @@ from hash import intify
 from knode import KNode as Node
 from ktable import KTable, K
 
-# concurrent FIND_NODE/VALUE requests!
-N = 3
-
 class ActionBase:
     """ base class for some long running asynchronous proccesses like finding nodes or values """
     def __init__(self, table, target, callback):
@@ -46,7 +43,9 @@ FIND_NODE_TIMEOUT = 15
 class FindNode(ActionBase):
     """ find node action merits it's own class as it is a long running stateful process """
     def handleGotNodes(self, args):
+       args, conn = args
        l, sender = args
+       sender['host'] = conn['host']
        sender = Node().initWithDict(sender)
        self.table.table.insertNode(sender)
        if self.finished or self.answered.has_key(sender.id):
@@ -58,7 +57,6 @@ class FindNode(ActionBase):
            n = Node().initWithDict(node)
            if not self.found.has_key(n.id):
                self.found[n.id] = n
-               self.table.insertNode(n)
        self.schedule()
                
     def schedule(self):
@@ -80,7 +78,7 @@ class FindNode(ActionBase):
                df.addCallbacks(self.handleGotNodes, self.makeMsgFailed(node))
                self.outstanding = self.outstanding + 1
                self.queried[node.id] = 1
-           if self.outstanding >= N:
+           if self.outstanding >= const.CONCURRENT_REQS:
                break
        assert(self.outstanding) >=0
        if self.outstanding == 0:
@@ -111,6 +109,9 @@ class FindNode(ActionBase):
            df.addCallbacks(self.handleGotNodes, self.makeMsgFailed(node))
            self.outstanding = self.outstanding + 1
            self.queried[node.id] = 1
+           if self.outstanding >= const.CONCURRENT_REQS:
+               break
+
        if self.outstanding == 0:
            self.callback(nodes)
 
@@ -119,7 +120,9 @@ GET_VALUE_TIMEOUT = 15
 class GetValue(FindNode):
     """ get value task """
     def handleGotNodes(self, args):
+       args, conn = args
        l, sender = args
+       sender['host'] = conn['host']
        sender = Node().initWithDict(sender)
        self.table.table.insertNode(sender)
        if self.finished or self.answered.has_key(sender.id):
@@ -134,7 +137,6 @@ class GetValue(FindNode):
                n = Node().initWithDict(node)
                if not self.found.has_key(n.id):
                    self.found[n.id] = n
-                   self.table.insertNode(n)
        elif l.has_key('values'):
            def x(y, z=self.results):
                y = y.data
@@ -163,7 +165,7 @@ class GetValue(FindNode):
                df.addErrback(self.makeMsgFailed(node))
                self.outstanding = self.outstanding + 1
                self.queried[node.id] = 1
-           if self.outstanding >= N:
+           if self.outstanding >= const.CONCURRENT_REQS:
                break
        assert(self.outstanding) >=0
        if self.outstanding == 0:
@@ -187,6 +189,9 @@ class GetValue(FindNode):
            df.addErrback(self.makeMsgFailed(node))
            self.outstanding = self.outstanding + 1
            self.queried[node.id] = 1
+           if self.outstanding >= const.CONCURRENT_REQS:
+               break
+
        if self.outstanding == 0:
            reactor.callFromThread(self.callback, [])