Use old IP address lookup logic as fallback (#275)

On some machines, resolving the local hostname results in a loopback IP
address (127.0.0.0/8). This breaks discovery. In these situations, fall
back to the old IP address lookup logic that was removed on commit 790edb9.
This commit is contained in:
Leonardo Brondani Schenkel 2019-08-16 11:13:53 +02:00 committed by Daniel Høyer Iversen
parent 1cea255dce
commit 11c5981793

View file

@ -64,6 +64,10 @@ def gendevice(devtype, host, mac):
def discover(timeout=None, local_ip_address=None): def discover(timeout=None, local_ip_address=None):
if local_ip_address is None: if local_ip_address is None:
local_ip_address = socket.gethostbyname(socket.gethostname()) local_ip_address = socket.gethostbyname(socket.gethostname())
if local_ip_address.startswith('127.'):
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
s.connect(('8.8.8.8', 53)) # connecting to a UDP address doesn't send packets
local_ip_address = s.getsockname()[0]
address = local_ip_address.split('.') address = local_ip_address.split('.')
cs = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) cs = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
cs.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) cs.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)