X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=gui%2Ftinc-gui;h=0a6370a1bef4682330dd3cdea82e708d0cb1b72a;hp=9c6485f8a929b7fcab75a334bb262c4c0c0cff46;hb=c58eba587da3ac884c6c18b64c262aed8fd1c452;hpb=f417271ea1447589ea05901f54fbb0377e7afaf9

diff --git a/gui/tinc-gui b/gui/tinc-gui
index 9c6485f8..0a6370a1 100755
--- a/gui/tinc-gui
+++ b/gui/tinc-gui
@@ -1,7 +1,8 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # tinc-gui -- GUI for controlling a running tincd
-# Copyright (C) 2009-2012 Guus Sliepen <guus@tinc-vpn.org>
+# Copyright (C) 2009-2014 Guus Sliepen <guus@tinc-vpn.org>
+#                    2014 Dennis Joachimsthaler <dennis@efjot.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +28,7 @@ import time
 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
@@ -77,8 +78,8 @@ class Edge:
 		self.to = args[1]
 		self.address = args[2]
 		self.port = args[4]
-		self.options = int(args[5], 16)
-		self.weight = int(args[6])
+		self.options = int(args[-2], 16)
+		self.weight = int(args[-1])
 
 class Subnet:
 	def parse(self, args):
@@ -111,11 +112,32 @@ class VPN:
 	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.");
+			if ':' in info[2]:
+				af = socket.AF_INET6
+			else:
+				af = socket.AF_INET
+			s = socket.socket(af, socket.SOCK_STREAM)
+			s.connect((info[2], int(info[4])))
+
 		self.sf = s.makefile()
 		s.close()
 		hello = string.split(self.sf.readline())
@@ -170,6 +192,8 @@ class VPN:
 				subnet.parse(resp[2:])
 				subnet.visited = True
 				self.subnets[(resp[2], resp[3])] = subnet
+				if subnet.owner == "(broadcast)":
+					continue
 				self.nodes[subnet.owner].subnets[resp[2]] = subnet
 			elif resp[1] == '6':
 				if len(resp) < 9:
@@ -216,10 +240,16 @@ class VPN:
 		return int(resp[2])
 
 	def __init__(self, netname = None, pidfile = None):
-		if platform.system == 'Windows':
+		if platform.system() == 'Windows':
+			sam = _winreg.KEY_READ
+			if platform.machine().endswith('64'):
+				sam = sam | _winreg.KEY_WOW64_64KEY
 			try:
-				reg = _winreg.ConnectRegistry(None, HKEY_LOCAL_MACHINE)
-				key = _winreg.OpenKey(reg, "SOFTWARE\\tinc")
+				reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+				try:
+					key = _winreg.OpenKey(reg, "SOFTWARE\\tinc", 0, sam)
+				except WindowsError:
+					key = _winreg.OpenKey(reg, "SOFTWARE\\Wow6432Node\\tinc", 0, sam)
 				VPN.confdir = _winreg.QueryValue(key, None)
 			except WindowsError:
 				pass
@@ -235,7 +265,7 @@ class VPN:
 		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:
@@ -507,7 +537,7 @@ class SubnetsPage(wx.Panel):
 				self.list.InsertStringItem(i, subnet.address + '/' + subnet.prefixlen)
 			else:
 				self.list.SetStringItem(i, 0, subnet.address + '/' + subnet.prefixlen)
-			self.list.SetStringItem(i, 1, subnet.weight)
+			self.list.SetStringItem(i, 1, str(subnet.weight))
 			self.list.SetStringItem(i, 2, subnet.owner)
 			self.list.itemDataMap[i] = (subnet.address + '/' + subnet.prefixlen, subnet.weight, subnet.owner)
 			self.list.SetItemData(i, i)