moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-11-15 13:55:05 -05:00
Code Issues Releases Wiki Activity

Updated code for get_lan_ip to fix issues with returning local lan ip from network interface.

Browse Source
This commit is contained in:
echel0n 2014-12-19 22:30:06 -08:00
parent 4e0a4c3f99
commit 8e9f4f47cb
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sickbeard/helpers.py
View File

@ -823,28 +823,32 @@ def get_lan_ip():
http://stackoverflow.com/questions/11735821/python-get-localhost-ip http://stackoverflow.com/questions/11735821/python-get-localhost-ip
""" """
ip = socket.gethostbyname(socket.gethostname())
if os.name != "nt": if os.name != "nt":
import fcntl import fcntl
import struct import struct
def get_interface_ip(ifname): def get_interface_ip(ifname):
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
return socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s', return socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s', ifname[:15]))[20:24])
ifname[:15]))[20:24])
interfaces = []
if ip.startswith("127."):
interfaces += [
"eth0",
"eth1",
"eth2",
"wlan0",
"wlan1",
"wifi0",
"ath0",
"ath1",
"ppp0",
"rge0",
"rge1",
"rge2",
]
ip = socket.gethostbyname(socket.gethostname())
if ip.startswith("127.") and os.name != "nt":
interfaces = [
"eth0",
"eth1",
"eth2",
"wlan0",
"wlan1",
"wifi0",
"ath0",
"ath1",
"ppp0",
]
for ifname in interfaces: for ifname in interfaces:
try: try:
ip = get_interface_ip(ifname) ip = get_interface_ip(ifname)
@ -852,6 +856,7 @@ def get_lan_ip():
break break
except IOError: except IOError:
pass pass
return ip return ip