Merged new versions from NRL

daemon/core/emane/emane.py

@@ -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

daemon/core/emane/rfpipe.py

@@ -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)

daemon/core/netns/vnet.py

@@ -11,8 +11,6 @@ vnet.py: PyCoreNet and LxBrNet classes that implement virtual networks using
 Linux Ethernet bridging and ebtables rules.
 '''
 
-import traceback
-
 import os, sys, threading, time, subprocess
 
 from core.api import coreapi
@@ -347,7 +345,6 @@ class LxBrNet(PyCoreNet):
         ''' Configure link parameters by applying tc queuing disciplines on the
             interface.
         '''
-        
         if devname is None:
             devname = netif.localname
         tc = [TC_BIN, "qdisc", "replace", "dev", devname]

daemon/core/services/nrl.py

@@ -91,7 +91,7 @@ class NrlNhdp(NrlService):
         
         servicenames = map(lambda x: x._name,  services)
         if "SMF" in servicenames:
-            cmd += " -flooding ecds"
+            cmd += " -flooding ecds-etx sticky"
             cmd += " -smfClient %s_smf" % node.name
         
         netifs = filter(lambda x: not getattr(x, 'control', False), \