[Playerstage-commit] code/player/libplayertcp playertcp.cc,1.49,1.50

[Toby C. <th...@us...>]

Update of /cvsroot/playerstage/code/player/libplayertcp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8254/libplayertcp

Modified Files:
	playertcp.cc 
Log Message:
Updates to AMCL to make it more 'player 2' and fix some race conditions
fixed some indetation in playertcp
updated various .cvsignore files



Index: playertcp.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayertcp/playertcp.cc,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** playertcp.cc	16 Apr 2006 23:41:35 -0000	1.49
--- playertcp.cc	21 Apr 2006 09:22:51 -0000	1.50
***************
*** 835,860 ****
        else
        {
! 	if( packfunc )
! 	{
! 	  decode_msglen =
! 	    (*packfunc)(client->readbuffer + PLAYERXDR_MSGHDR_SIZE,
  			msglen - PLAYERXDR_MSGHDR_SIZE,
  			(void*)this->decode_readbuffer,
  			PLAYERXDR_DECODE);
! 	}
! 	else // no packing function? this had better be an empty message
! 	{
! 	    if( hdr.size == 0 )
! 	      decode_msglen = 0; // an empty message decoded is still empty
! 	    else
  	      decode_msglen = -1; // indicate error
! 	}
  
! 	if( decode_msglen < 0 )
! 	{
! 	  PLAYER_WARN3("decoding failed on message to %u:%u with type %u",
  		       hdr.addr.interf, hdr.addr.index, hdr.subtype);
! 	}
! 	else
          {
            // update the message size and send it off
--- 835,860 ----
        else
        {
!         if( packfunc )
!         {
!           decode_msglen =
!             (*packfunc)(client->readbuffer + PLAYERXDR_MSGHDR_SIZE,
  			msglen - PLAYERXDR_MSGHDR_SIZE,
  			(void*)this->decode_readbuffer,
  			PLAYERXDR_DECODE);
!         }
!         else // no packing function? this had better be an empty message
!         {
!           if( hdr.size == 0 )
! 	        decode_msglen = 0; // an empty message decoded is still empty
!           else
  	      decode_msglen = -1; // indicate error
!         }
  
!         if( decode_msglen < 0 )
!         {
!           PLAYER_WARN3("decoding failed on message to %u:%u with type %u",
  		       hdr.addr.interf, hdr.addr.index, hdr.subtype);
!         }
!         else
          {
            // update the message size and send it off