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

daemon: Make generation of EMANE location events explicitly configurable.

Browse source
This commit is contained in:
Tom Goff 2015-09-23 16:22:43 -04:00
parent 04e934c93c
commit 1c8c9ce6ea
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
daemon/core/emane/nodes.py
View file

@ -207,7 +207,7 @@ class EmaneNode(EmaneNet):
EMANE daemons have been started, because that is their only chance
to bind to the TAPs.
'''
if not self.session.emane.doeventmonitor() and \
if self.session.emane.genlocationevents() and \
self.session.emane.service is None:
warntxt = "unable to publish EMANE events because the eventservice "
warntxt += "Python bindings failed to load"
@ -218,8 +218,7 @@ class EmaneNode(EmaneNet):
if do_netns and "virtual" in netif.transport_type.lower():
netif.install()
netif.setaddrs()
# if we are listening for EMANE events, don't generate them
if self.session.emane.doeventmonitor():
if not self.session.emane.genlocationevents():
netif.poshook = None
continue
# at this point we register location handlers for generating