mirror of
https://github.com/moparisthebest/SickRage
synced 2024-12-13 03:22:22 -05:00
Updated code for get_lan_ip to fix issues with returning local lan ip from network interface.
This commit is contained in:
parent
4e0a4c3f99
commit
8e9f4f47cb
@ -823,18 +823,18 @@ def get_lan_ip():
|
||||
http://stackoverflow.com/questions/11735821/python-get-localhost-ip
|
||||
"""
|
||||
|
||||
ip = socket.gethostbyname(socket.gethostname())
|
||||
if os.name != "nt":
|
||||
import fcntl
|
||||
import struct
|
||||
|
||||
def get_interface_ip(ifname):
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||
return socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s',
|
||||
ifname[:15]))[20:24])
|
||||
return socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s', ifname[:15]))[20:24])
|
||||
|
||||
ip = socket.gethostbyname(socket.gethostname())
|
||||
if ip.startswith("127.") and os.name != "nt":
|
||||
interfaces = [
|
||||
interfaces = []
|
||||
if ip.startswith("127."):
|
||||
interfaces += [
|
||||
"eth0",
|
||||
"eth1",
|
||||
"eth2",
|
||||
@ -844,7 +844,11 @@ def get_lan_ip():
|
||||
"ath0",
|
||||
"ath1",
|
||||
"ppp0",
|
||||
"rge0",
|
||||
"rge1",
|
||||
"rge2",
|
||||
]
|
||||
|
||||
for ifname in interfaces:
|
||||
try:
|
||||
ip = get_interface_ip(ifname)
|
||||
@ -852,6 +856,7 @@ def get_lan_ip():
|
||||
break
|
||||
except IOError:
|
||||
pass
|
||||
|
||||
return ip
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user