vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix mujson_mgr.py crash on windows

Browse source
This commit is contained in:
noisyfox 2017-01-07 19:14:02 +11:00
parent fd9214b334
commit 84fd119f26
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mujson_mgr.py
View file

@ -42,7 +42,6 @@ class MuMgr(object):
def getipaddr(self, ifname='eth0'): def getipaddr(self, ifname='eth0'):
import socket import socket
import struct import struct
import fcntl
ret = '127.0.0.1' ret = '127.0.0.1'
try: try:
ret = socket.gethostbyname(socket.getfqdn(socket.gethostname())) ret = socket.gethostbyname(socket.getfqdn(socket.gethostname()))
@ -50,6 +49,7 @@ class MuMgr(object):
pass pass
if ret == '127.0.0.1': if ret == '127.0.0.1':
try: try:
import fcntl
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
ret = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s', ifname[:15]))[20:24]) ret = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s', ifname[:15]))[20:24])
except: except: