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

3
plugins/TrackerZero/TrackerZeroPlugin.py
View file

@ -122,7 +122,8 @@ class TrackerZero(object):
time_onion_check = time.time() - s
ip_type = helper.getIpType(file_request.connection.ip)
connection_server = file_request.server
ip_type = connection_server.getIpType(file_request.connection.ip)
if ip_type == "onion" or file_request.connection.ip in config.ip_local:
is_port_open = False

2
plugins/disabled-Bootstrapper/BootstrapperPlugin.py
View file

@ -49,7 +49,7 @@ class FileRequestPlugin(object):
time_onion_check = time.time() - s
ip_type = helper.getIpType(self.connection.ip)
ip_type = self.server.getIpType(self.connection.ip)
if ip_type == "onion" or self.connection.ip in config.ip_local:
is_port_open = False

6
plugins/disabled-Bootstrapper/Test/TestBootstrapper.py
View file

@ -28,7 +28,7 @@ def bootstrapper_db(request):
@pytest.mark.usefixtures("resetSettings")
class TestBootstrapper:
def testHashCache(self, file_server, bootstrapper_db):
ip_type = helper.getIpType(file_server.ip)
ip_type = file_server.getIpType(file_server.ip)
peer = Peer(file_server.ip, 1544, connection_server=file_server)
hash1 = hashlib.sha256(b"site1").digest()
hash2 = hashlib.sha256(b"site2").digest()
@ -50,7 +50,7 @@ class TestBootstrapper:
def testBootstrapperDb(self, file_server, bootstrapper_db):
ip_type = helper.getIpType(file_server.ip)
ip_type = file_server.getIpType(file_server.ip)
peer = Peer(file_server.ip, 1544, connection_server=file_server)
hash1 = hashlib.sha256(b"site1").digest()
hash2 = hashlib.sha256(b"site2").digest()
@ -111,7 +111,7 @@ class TestBootstrapper:
def testPassive(self, file_server, bootstrapper_db):
peer = Peer(file_server.ip, 1544, connection_server=file_server)
ip_type = helper.getIpType(file_server.ip)
ip_type = file_server.getIpType(file_server.ip)
hash1 = hashlib.sha256(b"hash1").digest()
bootstrapper_db.peerAnnounce(ip_type, address=None, port=15441, hashes=[hash1])