-#!/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
import sys
import os
import platform
+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
class Node:
def parse(self, args):
self.name = args[0]
- self.address = args[2]
- if args[3] != 'port':
- args.insert(3, 'port')
- args.insert(4, '')
- self.port = args[4]
- self.cipher = int(args[6])
- self.digest = int(args[8])
- self.maclength = int(args[10])
- self.compression = int(args[12])
- self.options = int(args[14], 0x10)
- self.status = int(args[16], 0x10)
- self.nexthop = args[18]
- self.via = args[20]
- self.distance = int(args[22])
- self.pmtu = int(args[24])
- self.minmtu = int(args[26])
- self.maxmtu = int(args[28][:-1])
+ self.address = args[1]
+ self.port = args[3]
+ self.cipher = int(args[4])
+ self.digest = int(args[5])
+ self.maclength = int(args[6])
+ self.compression = int(args[7])
+ self.options = int(args[8], 0x10)
+ self.status = int(args[9], 0x10)
+ self.nexthop = args[10]
+ self.via = args[11]
+ self.distance = int(args[12])
+ self.pmtu = int(args[13])
+ self.minmtu = int(args[14])
+ self.maxmtu = int(args[15])
+ self.last_state_change = float(args[16])
self.subnets = {}
class Edge:
def parse(self, args):
self.fr = args[0]
- self.to = args[2]
- self.address = args[4]
- self.port = args[6]
- self.options = int(args[8], 16)
- self.weight = int(args[10])
+ self.to = args[1]
+ self.address = args[2]
+ self.port = args[4]
+ self.options = int(args[-2], 16)
+ self.weight = int(args[-1])
class Subnet:
def parse(self, args):
self.address = address
self.prefixlen = '48'
- self.owner = args[2]
+ self.owner = args[1]
class Connection:
def parse(self, args):
self.name = args[0]
- self.address = args[2]
- if args[3] != 'port':
- args.insert(3, 'port')
- args.insert(4, '')
- self.port = args[4]
- self.options = int(args[6], 0x10)
- self.socket = int(args[8])
- self.status = int(args[10], 0x10)
+ self.address = args[1]
+ self.port = args[3]
+ self.options = int(args[4], 0x10)
+ self.socket = int(args[5])
+ self.status = int(args[6], 0x10)
self.weight = 123
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())
if resp[0] != '18':
break
if resp[1] == '3':
- if len(resp) < 3:
+ if len(resp) < 19:
continue
node = self.nodes.get(resp[2]) or Node()
node.parse(resp[2:])
node.visited = True
self.nodes[resp[2]] = node
elif resp[1] == '4':
- if len(resp) < 5:
+ if len(resp) < 9:
continue
- edge = self.nodes.get((resp[2], resp[4])) or Edge()
+ edge = self.nodes.get((resp[2], resp[3])) or Edge()
edge.parse(resp[2:])
edge.visited = True
- self.edges[(resp[2], resp[4])] = edge
+ self.edges[(resp[2], resp[3])] = edge
elif resp[1] == '5':
- if len(resp) < 5:
+ if len(resp) < 4:
continue
- subnet = self.subnets.get((resp[2], resp[4])) or Subnet()
+ subnet = self.subnets.get((resp[2], resp[3])) or Subnet()
subnet.parse(resp[2:])
subnet.visited = True
- self.subnets[(resp[2], resp[4])] = subnet
+ 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) < 5:
+ if len(resp) < 9:
break
- connection = self.connections.get((resp[2], resp[4])) or Connection()
+ connection = self.connections.get((resp[2], resp[3], resp[5])) or Connection()
connection.parse(resp[2:])
connection.visited = True
- self.connections[(resp[2], resp[4])] = connection
+ self.connections[(resp[2], resp[3], resp[5])] = connection
else:
break
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
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:
def __init__(self, parent, style):
wx.ListCtrl.__init__(self, parent, -1, style=wx.LC_REPORT | wx.LC_HRULES | wx.LC_VRULES)
ListCtrlAutoWidthMixin.__init__(self)
- ColumnSorterMixin.__init__(self, 14)
+ ColumnSorterMixin.__init__(self, 16)
def GetListCtrl(self):
return self
def __init__(self, parent, id):
wx.Panel.__init__(self, parent, id)
grid = wx.FlexGridSizer(cols = 2)
- grid.AddGrowableCol(0, 1)
+ grid.AddGrowableCol(1, 1)
namelabel = wx.StaticText(self, -1, 'Name:')
self.name = wx.TextCtrl(self, -1, vpn.name)
grid.Add(namelabel)
- grid.Add(self.name)
+ grid.Add(self.name, 1, wx.EXPAND)
portlabel = wx.StaticText(self, -1, 'Port:')
self.port = wx.TextCtrl(self, -1, vpn.port)
class ConnectionsPage(wx.Panel):
def __init__(self, parent, id):
wx.Panel.__init__(self, parent, id)
- self.list = wx.ListCtrl(self, id, style=wx.LC_REPORT | wx.LC_HRULES | wx.LC_VRULES)
+ self.list = SuperListCtrl(self, id)
self.list.InsertColumn(0, 'Name')
self.list.InsertColumn(1, 'Address')
self.list.InsertColumn(2, 'Port')
self.PopupMenu(self.ContextMenu(self.list.itemDataMap[event.GetIndex()]), event.GetPosition())
def refresh(self):
+ sortstate = self.list.GetSortState()
self.list.itemDataMap = {}
i = 0
self.list.SetStringItem(i, 4, str(connection.weight))
self.list.itemDataMap[i] = (connection.name, connection.address, connection.port, connection.options, connection.weight)
self.list.Bind(wx.EVT_LIST_ITEM_RIGHT_CLICK, self.OnContext)
+ self.list.SetItemData(i, i)
i += 1
while self.list.GetItemCount() > i:
self.list.DeleteItem(self.list.GetItemCount() - 1)
+ self.list.SortListItems(sortstate[0], sortstate[1])
class NodesPage(wx.Panel):
def __init__(self, parent, id):
self.list.InsertColumn(12, 'PMTU')
self.list.InsertColumn(13, 'Min MTU')
self.list.InsertColumn(14, 'Max MTU')
+ self.list.InsertColumn(15, 'Since')
hbox = wx.BoxSizer(wx.HORIZONTAL)
hbox.Add(self.list, 1, wx.EXPAND)
self.refresh()
def refresh(self):
+ sortstate = self.list.GetSortState()
self.list.itemDataMap = {}
i = 0
self.list.SetStringItem(i, 4, str(node.digest))
self.list.SetStringItem(i, 5, str(node.maclength))
self.list.SetStringItem(i, 6, str(node.compression))
- self.list.SetStringItem(i, 7, str(node.options))
- self.list.SetStringItem(i, 8, str(node.status))
+ self.list.SetStringItem(i, 7, format(node.options, "x"))
+ self.list.SetStringItem(i, 8, format(node.status, "04x"))
self.list.SetStringItem(i, 9, node.nexthop)
self.list.SetStringItem(i, 10, node.via)
self.list.SetStringItem(i, 11, str(node.distance))
self.list.SetStringItem(i, 12, str(node.pmtu))
self.list.SetStringItem(i, 13, str(node.minmtu))
self.list.SetStringItem(i, 14, str(node.maxmtu))
- self.list.itemDataMap[i] = (node.name, node.address, node.port, node.cipher, node.digest, node.maclength, node.compression, node.options, node.status, node.nexthop, node.via, node.distance, node.pmtu, node.minmtu, node.maxmtu)
+ if node.last_state_change:
+ since = time.strftime("%Y-%m-%d %H:%M", time.localtime(node.last_state_change))
+ else:
+ since = "never"
+ self.list.SetStringItem(i, 15, since)
+ self.list.itemDataMap[i] = (node.name, node.address, node.port, node.cipher, node.digest, node.maclength, node.compression, node.options, node.status, node.nexthop, node.via, node.distance, node.pmtu, node.minmtu, node.maxmtu, since)
self.list.SetItemData(i, i)
i += 1
while self.list.GetItemCount() > i:
self.list.DeleteItem(self.list.GetItemCount() - 1)
+ self.list.SortListItems(sortstate[0], sortstate[1])
+
class EdgesPage(wx.Panel):
def __init__(self, parent, id):
wx.Panel.__init__(self, parent, id)
- self.list = wx.ListCtrl(self, id, style=wx.LC_REPORT | wx.LC_HRULES | wx.LC_VRULES)
+ self.list = SuperListCtrl(self, id)
self.list.InsertColumn(0, 'From')
self.list.InsertColumn(1, 'To')
self.list.InsertColumn(2, 'Address')
self.refresh()
def refresh(self):
+ sortstate = self.list.GetSortState()
self.list.itemDataMap = {}
i = 0
self.list.SetStringItem(i, 1, edge.to)
self.list.SetStringItem(i, 2, edge.address)
self.list.SetStringItem(i, 3, edge.port)
- self.list.SetStringItem(i, 4, str(edge.options))
+ self.list.SetStringItem(i, 4, format(edge.options, "x"))
self.list.SetStringItem(i, 5, str(edge.weight))
self.list.itemDataMap[i] = (edge.fr, edge.to, edge.address, edge.port, edge.options, edge.weight)
+ self.list.SetItemData(i, i)
i += 1
while self.list.GetItemCount() > i:
self.list.DeleteItem(self.list.GetItemCount() - 1)
+ self.list.SortListItems(sortstate[0], sortstate[1])
+
class SubnetsPage(wx.Panel):
def __init__(self, parent, id):
wx.Panel.__init__(self, parent, id)
self.refresh()
def refresh(self):
+ sortstate = self.list.GetSortState()
self.list.itemDataMap = {}
i = 0
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)
- i = i + 1
+ self.list.SetItemData(i, i)
+ i += 1
while self.list.GetItemCount() > i:
self.list.DeleteItem(self.list.GetItemCount() - 1)
+ self.list.SortListItems(sortstate[0], sortstate[1])
+
class StatusPage(wx.Panel):
def __init__(self, parent, id):
wx.Panel.__init__(self, parent, id)