mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bad prints if no default route

Browse source
This commit is contained in:
ed 2020-04-26 23:30:36 +02:00
parent 9e3a560ea6
commit 836463bab2
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
copyparty/tcpsrv.py
View file

@ -71,7 +71,7 @@ class TcpSrv(object):
def shutdown(self):
self.log("tcpsrv", "ok bye")
def detect_interfaces(self, ext_ip):
def detect_interfaces(self, listen_ip):
eps = {}
# get all ips and their interfaces
@ -85,29 +85,27 @@ class TcpSrv(object):
for ln in ip_addr.split("\n"):
try:
ip, dev = r.match(ln.rstrip()).groups()
if ext_ip in ["0.0.0.0", ip]:
if listen_ip in ["0.0.0.0", ip]:
eps[ip] = dev
except:
pass
# get ip with default route
default_route = None
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
try:
s.connect(("10.255.255.255", 1))
ip = s.getsockname()[0]
default_route = s.getsockname()[0]
except (OSError, socket.error) as ex:
if ex.errno not in [101, 10065]:
raise
return None
s.close()
if ext_ip in ["0.0.0.0", ip]:
if default_route and listen_ip in ["0.0.0.0", default_route]:
desc = "\033[32mexternal"
try:
eps[ip] += ", " + desc
eps[default_route] += ", " + desc
except:
eps[ip] = desc
eps[default_route] = desc
return eps