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

Support ipv6 in Pex request

Browse source
This commit is contained in:
shortcutme 2019-01-20 16:22:32 +01:00
parent b2f25d7f0a
commit 42495a9914
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/File/FileRequest.py
View file

@ -2,6 +2,7 @@
import os import os
import time import time
import json import json
import collections
import itertools import itertools
import socket import socket
@ -284,13 +285,13 @@ class FileRequest(object):
connected_peer.connect(self.connection) # Assign current connection to peer connected_peer.connect(self.connection) # Assign current connection to peer
# Add sent peers to site # Add sent peers to site
for packed_address in params.get("peers", []): for packed_address in itertools.chain(params.get("peers", []), params.get("peers_ipv6", [])):
address = helper.unpackAddress(packed_address) address = helper.unpackAddress(packed_address)
got_peer_keys.append("%s:%s" % address) got_peer_keys.append("%s:%s" % address)
if site.addPeer(*address, source="pex"): if site.addPeer(*address, source="pex"):
added += 1 added += 1
# Add sent peers to site # Add sent onion peers to site
for packed_address in params.get("peers_onion", []): for packed_address in params.get("peers_onion", []):
address = helper.unpackOnionAddress(packed_address) address = helper.unpackOnionAddress(packed_address)
got_peer_keys.append("%s:%s" % address) got_peer_keys.append("%s:%s" % address)
@ -298,21 +299,21 @@ class FileRequest(object):
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 = helper.packPeers(site.getConnectablePeers(params["need"], got_peer_keys, allow_private=False)) packed_peers = helper.packPeers(site.getConnectablePeers(params["need"], ignore=got_peer_keys, allow_private=False))
if added: if added:
site.worker_manager.onPeers() site.worker_manager.onPeers()
if config.verbose: if config.verbose:
self.log.debug( self.log.debug(
"Added %s peers to %s using pex, sending back %s" % "Added %s peers to %s using pex, sending back %s" %
(added, site, len(packed_peers["ip4"]) + len(packed_peers["onion"])) (added, site, {key: len(val) for key, val in packed_peers.iteritems()})
) )
back = {} back = {
if packed_peers["ip4"]: "peers": packed_peers["ipv4"],
back["peers"] = packed_peers["ip4"] "peers_ipv6": packed_peers["ipv6"],
if packed_peers["onion"]: "peers_onion": packed_peers["onion"]
back["peers_onion"] = packed_peers["onion"] }
self.response(back) self.response(back)