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

Add public ips from local adapters to external ip list

Browse source
This commit is contained in:
shortcutme 2019-01-29 02:59:15 +01:00
parent 20fb9ab97d
commit 4631f2223b
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/util/helper.py
View file

@ -263,9 +263,33 @@ def getIpType(ip):
return "ipv4"
def createSocket(ip):
def createSocket(ip, sock_type=socket.SOCK_STREAM):
ip_type = getIpType(ip)
if ip_type == "ipv6":
return socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
return socket.socket(socket.AF_INET6, sock_type)
else:
return socket.socket(socket.AF_INET, socket.SOCK_STREAM)
return socket.socket(socket.AF_INET, sock_type)
def getInterfaceIps(ip_type="ipv4"):
res = []
if ip_type == "ipv6":
test_ips = ["ff0e::c", "2606:4700:4700::1111"]
else:
test_ips = ['239.255.255.250', "8.8.8.8"]
for test_ip in test_ips:
try:
s = createSocket(test_ip, sock_type=socket.SOCK_DGRAM)
s.connect((test_ip, 1))
res.append(s.getsockname()[0])
except:
pass
try:
res += [ip[4][0] for ip in socket.getaddrinfo(socket.gethostname(), 1)]
except:
pass
res = [re.sub("%.*", "", ip) for ip in res if getIpType(ip) == ip_type]
return list(set(res))