oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev450, PEX quickfix

Browse source
This commit is contained in:
HelloZeroNet 2015-09-27 12:42:53 +02:00
parent 4b403da056
commit 3173313ca2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -8,7 +8,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.3.2" self.version = "0.3.2"
self.rev = 448 self.rev = 450
self.argv = argv self.argv = argv
self.action = None self.action = None
self.createParser() self.createParser()

6
src/File/FileRequest.py
View file

@ -220,13 +220,13 @@ class FileRequest(object):
added += 1 added += 1
connected_peer.connect(self.connection) # Assign current connection to peer connected_peer.connect(self.connection) # Assign current connection to peer
for addr_packed in params["peers"]: # Add sent peers to site for packed_address in params["peers"]: # Add sent peers to site
address = helper.unpackAddress(addr_packed) address = helper.unpackAddress(packed_address)
got_peer_keys.append("%s:%s" % address) got_peer_keys.append("%s:%s" % address)
if site.addPeer(*address): if site.addPeer(*address):
added += 1 added += 1
# Send back peers that is not in the sent list and connectable (not port 0) # Send back peers that is not in the sent list and connectable (not port 0)
packed_peers = [peer.packAddress() for peer in site.getConnectablePeers(params["need"], got_peer_keys)] packed_peers = [peer.packMyAddress() for peer in site.getConnectablePeers(params["need"], got_peer_keys)]
if added: if added:
site.worker_manager.onPeers() site.worker_manager.onPeers()
self.log.debug("Added %s peers to %s using pex, sending back %s" % (added, site, len(packed_peers))) self.log.debug("Added %s peers to %s using pex, sending back %s" % (added, site, len(packed_peers)))