Add missing brainpool.h.

[tinc] / gui / tinc-gui

diff --git a/gui/tinc-gui b/gui/tinc-gui
index 89a8afa..2b4f903 100755 (executable)
--- a/gui/tinc-gui
+++ b/gui/tinc-gui
@@ -111,11 +111,28 @@ 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.");
+                       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())
@@ -287,7 +304,7 @@ class SuperListCtrl(wx.ListCtrl, ColumnSorterMixin, ListCtrlAutoWidthMixin):
     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
@@ -300,12 +317,12 @@ class SettingsPage(wx.Panel):
        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)
@@ -328,7 +345,7 @@ class SettingsPage(wx.Panel):
 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')
@@ -358,6 +375,7 @@ class ConnectionsPage(wx.Panel):
                self.PopupMenu(self.ContextMenu(self.list.itemDataMap[event.GetIndex()]), event.GetPosition())
 
        def refresh(self):
+               sortstate = self.list.GetSortState()
                self.list.itemDataMap = {}
                i = 0
 
@@ -372,11 +390,13 @@ class ConnectionsPage(wx.Panel):
                        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):
@@ -405,6 +425,7 @@ class NodesPage(wx.Panel):
                self.refresh()
 
        def refresh(self):
+               sortstate = self.list.GetSortState()
                self.list.itemDataMap = {}
                i = 0
 
@@ -432,17 +453,19 @@ class NodesPage(wx.Panel):
                        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)
+                       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')
@@ -456,6 +479,7 @@ class EdgesPage(wx.Panel):
                self.refresh()
 
        def refresh(self):
+               sortstate = self.list.GetSortState()
                self.list.itemDataMap = {}
                i = 0
 
@@ -470,11 +494,14 @@ class EdgesPage(wx.Panel):
                        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)
@@ -488,6 +515,7 @@ class SubnetsPage(wx.Panel):
                self.refresh()
 
        def refresh(self):
+               sortstate = self.list.GetSortState()
                self.list.itemDataMap = {}
                i = 0
 
@@ -499,11 +527,14 @@ class SubnetsPage(wx.Panel):
                        self.list.SetStringItem(i, 1, 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)