[Gcblue-commits] gcb_wx/src/network tcAuthenticationMessageHandler.cpp, 1.2, 1.3 tcConnectionData.cpp, 1.15, 1.16 tcTextMessageHandler.cpp, 1.8, 1.9

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/network
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29807/src/network

Modified Files:
	tcAuthenticationMessageHandler.cpp tcConnectionData.cpp 
	tcTextMessageHandler.cpp 
Log Message:


Index: tcConnectionData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcConnectionData.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcConnectionData.cpp	23 Mar 2006 01:11:02 -0000	1.15
--- tcConnectionData.cpp	20 Nov 2006 00:17:43 -0000	1.16
***************
*** 51,55 ****
      // max number of acks assuming 2 bytes per ack
      unsigned int maxAcks = (tcMessage::MESSAGE_SIZE - messageSize) / sizeof(unsigned short);
!     unsigned int nAcks = sendAck.size();
      
  	unsigned char* data = message->GetMessageData();
--- 51,55 ----
      // max number of acks assuming 2 bytes per ack
      unsigned int maxAcks = (tcMessage::MESSAGE_SIZE - messageSize) / sizeof(unsigned short);
!     unsigned int nAcks = (unsigned int)sendAck.size();
      
  	unsigned char* data = message->GetMessageData();

Index: tcTextMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcTextMessageHandler.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcTextMessageHandler.cpp	23 Mar 2006 01:11:02 -0000	1.8
--- tcTextMessageHandler.cpp	20 Nov 2006 00:17:43 -0000	1.9
***************
*** 35,39 ****
      if (messageSize > maxSize) messageSize = maxSize;
  
!     strncpy((char*)data, text.c_str(), messageSize);
      data[messageSize++] = 0; // append terminating null
  }
--- 35,41 ----
      if (messageSize > maxSize) messageSize = maxSize;
  
!     //strncpy((char*)data, text.c_str(), messageSize);
!     strncpy_s((char*)data, maxSize, text.c_str(), messageSize);
! 
      data[messageSize++] = 0; // append terminating null
  }

Index: tcAuthenticationMessageHandler.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/network/tcAuthenticationMessageHandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcAuthenticationMessageHandler.cpp	23 Mar 2006 01:11:02 -0000	1.2
--- tcAuthenticationMessageHandler.cpp	20 Nov 2006 00:17:43 -0000	1.3
***************
*** 68,72 ****
  	stream << hash;
  
! 	messageSize = stream.size();
  	stream.read((char*)data, messageSize);
  
--- 68,72 ----
  	stream << hash;
  
! 	messageSize = (unsigned int)stream.size();
  	stream.read((char*)data, messageSize);