Merge branch 'rel/5.2' of https://git.web.boeing.com/Boeing-CORE/CORE into rel/5.2

This commit is contained in:
Kevin Larson 2018-07-26 12:25:54 -07:00
commit 07dfb48c86

View file

@ -131,10 +131,7 @@ class EmaneNode(EmaneNet):
for netif in self.netifs():
external = self.session.emane.get_config("external", self.objid, self.model.name)
if external == "0":
logger.info("I AM NOT SKIPPING EMANE ADDRESSES")
netif.setaddrs()
else:
logger.info("I AM SKIPPING EMANE ADDRESSES")
if not self.session.emane.genlocationevents():
netif.poshook = None