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

fix two exceptions when using ns2 scripted mobility along with SDT3D

Browse source 
(Boeing r1813)
This commit is contained in:
ahrenholz 2013-12-16 23:29:27 +00:00
parent 9e955d22f0
commit c635c54a3a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/mobility.py
View file

@ -689,7 +689,7 @@ class WayPointMobility(WirelessModel):
node.position.set(x, y, z) node.position.set(x, y, z)
msg = node.tonodemsg(flags=0) msg = node.tonodemsg(flags=0)
self.session.broadcastraw(None, msg) self.session.broadcastraw(None, msg)
self.session.sdt.updatenode(node, flags=0, x=x, y=y, z=z) self.session.sdt.updatenode(node.objid, flags=0, x=x, y=y, z=z)
def setendtime(self): def setendtime(self):
''' Set self.endtime to the time of the last waypoint in the queue of ''' Set self.endtime to the time of the last waypoint in the queue of

2
daemon/core/sdt.py
View file

@ -331,6 +331,6 @@ class Sdt(object):
n = self.session.obj(nodenum) n = self.session.obj(nodenum)
except KeyError: except KeyError:
return False return False
if isinstance(n, (pycore.nodes.WlanNode, pycore.nodes.EmaneNode)): if isinstance(n, (nodes.WlanNode, nodes.EmaneNode)):
return True return True
return False return False