from wx.lib.mixins.listctrl import ColumnSorterMixin
from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
-if platform.system == 'Windows':
+if platform.system() == 'Windows':
import _winreg
# Classes to interface with a running tinc daemon
piddir = '/var/run/'
def connect(self):
+ # read the pidfile
f = open(self.pidfile)
info = string.split(f.readline())
f.close()
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- s.connect((info[2], int(info[4])))
+
+ # check if there is a UNIX socket as well
+ if self.pidfile.endswith(".pid"):
+ unixfile = self.pidfile.replace(".pid", ".socket");
+ else:
+ unixfile = self.pidfile + ".socket";
+
+ if os.path.exists(unixfile):
+ # use it if it exists
+ print(unixfile + " exists!");
+ s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+ s.connect(unixfile)
+ else:
+ # otherwise connect via TCP
+ print(unixfile + " does not exist.");
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ s.connect((info[2], int(info[4])))
+
self.sf = s.makefile()
s.close()
hello = string.split(self.sf.readline())
return int(resp[2])
def __init__(self, netname = None, pidfile = None):
- if platform.system == 'Windows':
+ if platform.system() == 'Windows':
try:
- reg = _winreg.ConnectRegistry(None, HKEY_LOCAL_MACHINE)
+ reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
key = _winreg.OpenKey(reg, "SOFTWARE\\tinc")
VPN.confdir = _winreg.QueryValue(key, None)
except WindowsError:
if pidfile != None:
self.pidfile = pidfile
else:
- if platform.system == 'Windows':
+ if platform.system() == 'Windows':
self.pidfile = os.path.join(self.confbase, 'pid')
else:
if netname: