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

Support ipv6 for Checkport request

Browse source
This commit is contained in:
shortcutme 2019-01-20 16:23:53 +01:00
parent 18b9df62e4
commit 1350096545
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/File/FileRequest.py
View file

@ -425,9 +425,14 @@ class FileRequest(object):
# Check requested port of the other peer # Check requested port of the other peer
def actionCheckport(self, params): def actionCheckport(self, params):
with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock: if helper.getIpType(self.connection.ip) == "ipv6":
sock_address = (self.connection.ip, params["port"], 0, 0)
else:
sock_address = (self.connection.ip, params["port"])
with closing(helper.createSocket(self.connection.ip)) as sock:
sock.settimeout(5) sock.settimeout(5)
if sock.connect_ex((self.connection.ip, params["port"])) == 0: if sock.connect_ex(sock_address) == 0:
self.response({"status": "open", "ip_external": self.connection.ip}) self.response({"status": "open", "ip_external": self.connection.ip})
else: else:
self.response({"status": "closed", "ip_external": self.connection.ip}) self.response({"status": "closed", "ip_external": self.connection.ip})