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

Merged new versions from NRL

Browse source
This commit is contained in:
Rod A Santiago 2016-09-14 17:12:25 -07:00
parent 65803f9334
commit 928617e613
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,8 +45,8 @@ class Emane(ConfigurableManager):
(SUCCESS, NOT_NEEDED, NOT_READY) = (0, 1, 2)
EVENTCFGVAR = 'LIBEMANEEVENTSERVICECONFIG'
# possible self.version values
(EMANEUNK, EMANE074, EMANE081, EMANE091, EMANE092, EMANE093) = \
(0, 7, 8, 91, 92, 93)
(EMANEUNK, EMANE074, EMANE081, EMANE091, EMANE092, EMANE093, EMANE101) = \
(0, 7, 8, 91, 92, 93, 101)
DEFAULT_LOG_LEVEL = 3
def __init__(self, session):
@ -746,7 +746,7 @@ class Emane(ConfigurableManager):
'''
for n in sorted(self._objs.keys()):
emanenode = self._objs[n]
nems = emanenode.buildnemxmlfiles(self)
emanenode.buildnemxmlfiles(self)
def appendtransporttonem(self, doc, nem, nodenum, ifc=None):
''' Given a nem XML node and EMANE WLAN node number, append
@ -1175,6 +1175,8 @@ def emane_version():
v = Emane.EMANE092
elif result.startswith('0.9.3'):
v = Emane.EMANE093
elif result.startswith('1.0.1'):
v = Emane.EMANE101
return v, result.strip()
# set version variables for the Emane class

4
daemon/core/emane/rfpipe.py
View file

@ -124,8 +124,8 @@ class EmaneRfPipeModel(EmaneModel):
values = list(values)
values[i] = self.emane074_fixup(values[i], 1000)
# append MAC options to macdoc
map( lambda n: mac.appendChild(e.xmlparam(macdoc, n, \
self.valueof(n, values))), macnames)
map(lambda n: mac.appendChild(e.xmlparam(macdoc, n, \
self.valueof(n, values))), macnames)
e.xmlwrite(macdoc, self.macxmlname(ifc))
phydoc = EmaneUniversalModel.getphydoc(e, self, values, phynames)