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

daemon: CoreInterface now defaults to a virtual transport type, added utility methods to check if an interface is virtual/raw, cleaned up all emane code using these types of checks

Browse source
This commit is contained in:
Blake Harnden 2020-07-03 09:08:36 -07:00
parent ac1c27b1c8
commit fcda1f9f14
3 changed files with 26 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

9
daemon/core/emane/emanemanager.py
View file

@ -26,7 +26,6 @@ from core.emulator.enumerations import (
LinkTypes,
MessageFlags,
RegisterTlvs,
TransportType,
)
from core.errors import CoreCommandError, CoreError
from core.nodes.base import CoreNode, NodeBase
@ -536,8 +535,7 @@ class EmaneManager(ModelManager):
if realtime:
emanecmd += " -r"
node = iface.node
transport_type = emanexml.get_transport_type(iface)
if not transport_type == TransportType.RAW:
if iface.is_virtual():
otagroup, _otaport = self.get_config("otamanagergroup").split(":")
otadev = self.get_config("otamanagerdevice")
otanetidx = self.session.get_control_net_index(otadev)
@ -590,8 +588,7 @@ class EmaneManager(ModelManager):
node = iface.node
if not node.up:
continue
transport_type = emanexml.get_transport_type(iface)
if transport_type == TransportType.RAW:
if iface.is_raw():
node.host_cmd(kill_emaned, wait=False)
else:
node.cmd(kill_emaned, wait=False)
@ -614,7 +611,7 @@ class EmaneManager(ModelManager):
for key in sorted(self._emane_nets):
emane_net = self._emane_nets[key]
for iface in emane_net.get_ifaces():
if iface.transport_type == TransportType.VIRTUAL:
if iface.is_virtual():
iface.shutdown()
iface.poshook = None