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

Ipv6 compatibility in AnnounceZero plugin

Browse source
This commit is contained in:
shortcutme 2019-01-20 19:13:00 +01:00
parent da538f6424
commit 0beef302c6
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/AnnounceZero/AnnounceZeroPlugin.py
View file

@ -1,4 +1,5 @@
import time import time
import itertools
from Plugin import PluginManager from Plugin import PluginManager
from util import helper from util import helper
@ -21,9 +22,10 @@ def importHostClasses():
def processPeerRes(tracker_address, site, peers): def processPeerRes(tracker_address, site, peers):
added = 0 added = 0
# Ip4 # Ip4
found_ip4 = 0 found_ipv4 = 0
for packed_address in peers["ip4"]: peers_normal = itertools.chain(peers.get("ip4", []), peers.get("ipv4", []), peers.get("ipv6", []))
found_ip4 += 1 for packed_address in peers_normal:
found_ipv4 += 1
peer_ip, peer_port = helper.unpackAddress(packed_address) peer_ip, peer_port = helper.unpackAddress(packed_address)
if site.addPeer(peer_ip, peer_port, source="tracker"): if site.addPeer(peer_ip, peer_port, source="tracker"):
added += 1 added += 1
@ -53,7 +55,8 @@ class SiteAnnouncerPlugin(object):
global time_full_announced global time_full_announced
s = time.time() s = time.time()
need_types = ["ip4"] need_types = ["ip4"] # ip4 for backward compatibility reasons
need_types += self.site.connection_server.supported_ip_types
if self.site.connection_server.tor_manager.enabled: if self.site.connection_server.tor_manager.enabled:
need_types.append("onion") need_types.append("onion")
@ -86,7 +89,7 @@ class SiteAnnouncerPlugin(object):
# Sent request to tracker # Sent request to tracker
tracker_peer = connection_pool.get(tracker_address) # Re-use tracker connection if possible tracker_peer = connection_pool.get(tracker_address) # Re-use tracker connection if possible
if not tracker_peer: if not tracker_peer:
tracker_ip, tracker_port = tracker_address.split(":") tracker_ip, tracker_port = tracker_address.rsplit(":", 1)
tracker_peer = Peer(str(tracker_ip), int(tracker_port), connection_server=self.site.connection_server) tracker_peer = Peer(str(tracker_ip), int(tracker_port), connection_server=self.site.connection_server)
tracker_peer.is_tracker_connection = True tracker_peer.is_tracker_connection = True
connection_pool[tracker_address] = tracker_peer connection_pool[tracker_address] = tracker_peer