From b7d524423c23470cd11e720eeb48368c072838cb Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Tue, 7 Feb 2012 20:49:52 +0000 Subject: Rewritten all packets to use buffers instead of direct sockets, for future cSocketThreads compatibility. Moved data sending from cPacket into cSocket git-svn-id: http://mc-server.googlecode.com/svn/trunk@240 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_Handshake.cpp | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'source/packets/cPacket_Handshake.cpp') diff --git a/source/packets/cPacket_Handshake.cpp b/source/packets/cPacket_Handshake.cpp index 482f25d26..2c4f058e7 100644 --- a/source/packets/cPacket_Handshake.cpp +++ b/source/packets/cPacket_Handshake.cpp @@ -7,25 +7,23 @@ -bool cPacket_Handshake::Parse(cSocket & a_Socket) +int cPacket_Handshake::Parse(const char * a_Data, int a_Size) { - //printf("Parse: NEW Handshake\n"); - m_Socket = a_Socket; - if( !ReadString16( m_Username ) ) return false; - return true; + int TotalBytes = 0; + HANDLE_PACKET_READ(ReadString16, m_Username, TotalBytes); + return TotalBytes; } -bool cPacket_Handshake::Send(cSocket & a_Socket) + + + + +void cPacket_Handshake::Serialize(AString & a_Data) const { - //LOG("Send: NEW Handshake %s", m_Username.c_str() ); - unsigned int TotalSize = c_Size + m_Username.size() * sizeof(short); - char* Message = new char[TotalSize]; - - unsigned int i = 0; - AppendByte ( (char)m_PacketID, Message, i ); - AppendString16( m_Username, Message, i ); - - bool RetVal = !cSocket::IsSocketError( cPacket::SendData( a_Socket, Message, TotalSize, 0 ) ); - delete [] Message; - return RetVal; -} \ No newline at end of file + AppendByte (a_Data, m_PacketID); + AppendString16(a_Data, m_Username); +} + + + + -- cgit v1.2.3