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

12
daemon/core/emane/emane.py
View file

@ -347,7 +347,7 @@ class Emane(ConfigurableManager):
def poststartup(self):
''' Retransmit location events now that all NEMs are active.
'''
if self.doeventmonitor():
if not self.genlocationevents():
return
with self._objslock:
for n in sorted(self._objs.keys()):
@ -999,6 +999,16 @@ class Emane(ConfigurableManager):
# generate the EMANE events when nodes are moved
return self.session.getcfgitembool('emane_event_monitor', False)
def genlocationevents(self):
''' Returns boolean whether or not EMANE events will be generated.
'''
# By default, CORE generates EMANE location events when nodes
# are moved; this can be explicitly disabled in core.conf
tmp = self.session.getcfgitembool('emane_event_generate')
if tmp is None:
tmp = not self.doeventmonitor()
return tmp
def starteventmonitor(self):
''' Start monitoring EMANE location events if configured to do so.
'''