Revision: 8311
http://playerstage.svn.sourceforge.net/playerstage/?rev=8311&view=rev
Author: thjc
Date: 2009-10-18 15:26:36 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
applied patch 2878829: Forward port of checksum fix for p2os
Modified Paths:
--------------
code/player/trunk/server/drivers/mixed/p2os/packet.cc
Modified: code/player/trunk/server/drivers/mixed/p2os/packet.cc
===================================================================
--- code/player/trunk/server/drivers/mixed/p2os/packet.cc 2009-10-18
15:21:24 UTC (rev 8310)
+++ code/player/trunk/server/drivers/mixed/p2os/packet.cc 2009-10-18
15:26:36 UTC (rev 8311)
@@ -56,8 +56,8 @@
bool P2OSPacket::Check( bool ignore_checksum ) {
- short chksum;
- chksum = CalcChkSum();
+ unsigned short recv_chksum = static_cast<unsigned short>(CalcChkSum() &
0xffff);
+ unsigned short pkg_chksum = (static_cast<unsigned short>(packet[size-2]) <<
8) | packet[size-1];
if ( ignore_checksum )
{
@@ -65,11 +65,8 @@
}
else
{
- if ( chksum == (packet[size-2] << 8 | packet[size-1]))
- return(true);
+ return recv_chksum == pkg_chksum;
}
-
- return(false);
}
int P2OSPacket::CalcChkSum() {
@@ -142,7 +139,7 @@
}
int P2OSPacket::Build( unsigned char *data, unsigned char datasize ) {
- short chksum;
+ unsigned short chksum;
size = datasize + 5;
@@ -158,7 +155,7 @@
memcpy( &packet[3], data, datasize );
- chksum = CalcChkSum();
+ chksum = static_cast<unsigned short> (CalcChkSum() & 0xffff);
packet[3+datasize] = chksum >> 8;
packet[3+datasize+1] = chksum & 0xFF;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
