Revision: 8649
http://playerstage.svn.sourceforge.net/playerstage/?rev=8649&view=rev
Author: thjc
Date: 2010-05-03 17:49:32 +0000 (Mon, 03 May 2010)
Log Message:
-----------
Applied patch 2960594: Player SVN trunk: unhandled messages in ranger related
code
Modified Paths:
--------------
code/player/trunk/server/drivers/dio/rangertodio/rangertodio.cc
code/player/trunk/server/drivers/shell/velcmd.cc
Modified: code/player/trunk/server/drivers/dio/rangertodio/rangertodio.cc
===================================================================
--- code/player/trunk/server/drivers/dio/rangertodio/rangertodio.cc
2010-05-03 17:46:38 UTC (rev 8648)
+++ code/player/trunk/server/drivers/dio/rangertodio/rangertodio.cc
2010-05-03 17:49:32 UTC (rev 8649)
@@ -373,6 +373,16 @@
}
return 0;
}
+ // handle other ranger data
+ if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_DATA, -1,
this->ranger_required_addr))
+ {
+ if (!data)
+ {
+ PLAYER_ERROR("NULL other ranger data");
+ return -1;
+ }
+ return 0;
+ }
if (this->use_dio_cmd)
{
if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_DATA,
PLAYER_DIO_DATA_VALUES, this->dio_required_addr))
Modified: code/player/trunk/server/drivers/shell/velcmd.cc
===================================================================
--- code/player/trunk/server/drivers/shell/velcmd.cc 2010-05-03 17:46:38 UTC
(rev 8648)
+++ code/player/trunk/server/drivers/shell/velcmd.cc 2010-05-03 17:49:32 UTC
(rev 8649)
@@ -427,6 +427,16 @@
this->mean_dist_valid = !0;
return 0;
}
+ // handle other ranger data
+ if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_DATA, -1,
this->required_ranger_addr))
+ {
+ if (!data)
+ {
+ PLAYER_ERROR("NULL other ranger data");
+ return -1;
+ }
+ return 0;
+ }
}
return -1;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
