From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 25 Dec 2014 17:13:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'groxxda/gui-fixes' into 1.1
X-Git-Tag: release-1.1pre11~10
X-Git-Url: https://www.tinc-vpn.org/git/browse?a=commitdiff_plain;h=266afc6c63d3d02584feb24b69063f97057daac8;hp=7730d5f3ed9bd7c011dced5808130ffcbd74ea6b;p=tinc

Merge remote-tracking branch 'groxxda/gui-fixes' into 1.1
---

diff --git a/gui/tinc-gui b/gui/tinc-gui
index d610d9d8..0a6370a1 100755
--- 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.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):
@@ -192,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:
@@ -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.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)