projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f57d53c
)
tinc-gui: Don't assign broadcast subnets to any node, fix parsing of Edges, fix...
author
groxxda
<ried@mytum.de>
Tue, 14 Oct 2014 20:18:56 +0000
(22:18 +0200)
committer
groxxda
<ried@mytum.de>
Tue, 14 Oct 2014 20:18:56 +0000
(22:18 +0200)
gui/tinc-gui
patch
|
blob
|
history
diff --git
a/gui/tinc-gui
b/gui/tinc-gui
index
d610d9d
..
0a6370a
100755
(executable)
--- a/
gui/tinc-gui
+++ b/
gui/tinc-gui
@@
-78,8
+78,8
@@
class Edge:
self.to = args[1]
self.address = args[2]
self.port = args[4]
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):
class Subnet:
def parse(self, args):
@@
-192,6
+192,8
@@
class VPN:
subnet.parse(resp[2:])
subnet.visited = True
self.subnets[(resp[2], resp[3])] = subnet
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:
self.nodes[subnet.owner].subnets[resp[2]] = subnet
elif resp[1] == '6':
if len(resp) < 9:
@@
-535,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.InsertStringItem(i, subnet.address + '/' + subnet.prefixlen)
else:
self.list.SetStringItem(i, 0, subnet.address + '/' + subnet.prefixlen)
- self.list.SetStringItem(i, 1, s
ubnet.weight
)
+ self.list.SetStringItem(i, 1, s
tr(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)
self.list.SetStringItem(i, 2, subnet.owner)
self.list.itemDataMap[i] = (subnet.address + '/' + subnet.prefixlen, subnet.weight, subnet.owner)
self.list.SetItemData(i, i)