afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into enhancement/wlan-loss

Browse source
This commit is contained in:
Blake Harnden 2020-04-23 14:05:11 -07:00
commit be3041c2ee
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/core/gui/coreclient.py
View file

@ -487,14 +487,13 @@ class CoreClient:
nodes = [x.core_node for x in self.canvas_nodes.values()] nodes = [x.core_node for x in self.canvas_nodes.values()]
links = [] links = []
for edge in self.links.values(): for edge in self.links.values():
link = edge.link link = core_pb2.Link()
logging.info("link: %s", link) link.CopyFrom(edge.link)
if link.HasField("interface_one") and not link.interface_one.mac: if link.HasField("interface_one") and not link.interface_one.mac:
link.interface_one.mac = self.interfaces_manager.next_mac() link.interface_one.mac = self.interfaces_manager.next_mac()
if link.HasField("interface_two") and not link.interface_two.mac: if link.HasField("interface_two") and not link.interface_two.mac:
link.interface_two.mac = self.interfaces_manager.next_mac() link.interface_two.mac = self.interfaces_manager.next_mac()
links.append(link) links.append(link)
links = [x.link for x in self.links.values()]
wlan_configs = self.get_wlan_configs_proto() wlan_configs = self.get_wlan_configs_proto()
mobility_configs = self.get_mobility_configs_proto() mobility_configs = self.get_mobility_configs_proto()
emane_model_configs = self.get_emane_model_configs_proto() emane_model_configs = self.get_emane_model_configs_proto()

1
daemon/core/gui/dialogs/macdialog.py
View file

@ -59,3 +59,4 @@ class MacConfigDialog(Dialog):
self.app.core.interfaces_manager.mac = netaddr.EUI(mac) self.app.core.interfaces_manager.mac = netaddr.EUI(mac)
self.app.guiconfig["mac"] = mac self.app.guiconfig["mac"] = mac
self.app.save_config() self.app.save_config()
self.destroy()