util get-ip fallback added

master
Stefan Krulj 14 years ago
parent 632f6f07e9
commit f2de91ec9a
  1. 6
      sys/config.py
  2. 5
      sys/util.py

@ -32,6 +32,12 @@ try:
PIDFILE = cp.get("General","PIDFILE") PIDFILE = cp.get("General","PIDFILE")
except: except:
PIDFILE = 'pid' PIDFILE = 'pid'
try:
IP = cp.get("General","IP")
except:
IP = '127.0.0.1'
try: try:
S5B_PROXY = cp.get("General","PROXY") S5B_PROXY = cp.get("General","PROXY")
except: except:

@ -3,6 +3,7 @@ import select
import socket import socket
import threading import threading
import random import random
import config
from Queue import Queue, Empty from Queue import Queue, Empty
MAGIC_PACKET = "" MAGIC_PACKET = ""
@ -77,7 +78,7 @@ def get_local_ip():
try: try:
address = queue.get(False) address = queue.get(False)
except Empty: except Empty:
pass address = [config.IP]
else: finally:
waiting = False waiting = False
return address[0] return address[0]

Loading…
Cancel
Save