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

Move getIpType() from helper to ConnectionServer

Browse source
This commit is contained in:
Vadim Ushakov 2021-11-03 11:48:02 +07:00
parent 168c436b73
commit d32d9f781b
12 changed files with 109 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/AnnounceBitTorrent/AnnounceBitTorrentPlugin.py
View file

@ -52,7 +52,7 @@ class SiteAnnouncerPlugin(object):
ip, port = tracker_address.split("/")[0].split(":")
tracker = UdpTrackerClient(ip, int(port))
if helper.getIpType(ip) in self.getOpenedServiceTypes():
if self.connection_server.getIpType(ip) in self.getOpenedServiceTypes():
tracker.peer_port = self.fileserver_port
else:
tracker.peer_port = 0
@ -101,7 +101,7 @@ class SiteAnnouncerPlugin(object):
def announceTrackerHttp(self, tracker_address, mode="start", num_want=10, protocol="http"):
tracker_ip, tracker_port = tracker_address.rsplit(":", 1)
if helper.getIpType(tracker_ip) in self.getOpenedServiceTypes():
if self.connection_server.getIpType(tracker_ip) in self.getOpenedServiceTypes():
port = self.fileserver_port
else:
port = 1