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
This commit is contained in:
@@ -17,6 +17,10 @@ cPacket_Metadata::cPacket_Metadata(int s, int id)
|
||||
FormPacket();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
cPacket_Metadata::cPacket_Metadata()
|
||||
: m_UniqueID( 0 )
|
||||
, m_Type( 0 )
|
||||
@@ -27,19 +31,30 @@ cPacket_Metadata::cPacket_Metadata()
|
||||
FormPacket();
|
||||
}
|
||||
|
||||
cPacket_Metadata::~cPacket_Metadata() {
|
||||
//if( m_MetaData ) delete [] m_MetaData;
|
||||
|
||||
|
||||
|
||||
|
||||
cPacket_Metadata::~cPacket_Metadata()
|
||||
{
|
||||
delete [] m_MetaData;
|
||||
}
|
||||
|
||||
void cPacket_Metadata::FormPacket() {
|
||||
if( m_MetaData ) delete [] m_MetaData;
|
||||
|
||||
|
||||
|
||||
|
||||
void cPacket_Metadata::FormPacket()
|
||||
{
|
||||
delete [] m_MetaData;
|
||||
m_MetaData = new char[3];
|
||||
m_MetaDataSize = 3;
|
||||
//m_UniqueID = GetUniqueID();
|
||||
// m_UniqueID = GetUniqueID();
|
||||
m_MetaData[0] = 0x00;
|
||||
|
||||
m_MetaData[2] = 0x7f;
|
||||
switch(m_EMetaData) {
|
||||
switch(m_EMetaData)
|
||||
{
|
||||
case cPawn::NORMAL:
|
||||
m_MetaData[1] = 0x00;
|
||||
break;
|
||||
@@ -65,15 +80,17 @@ void cPacket_Metadata::FormPacket() {
|
||||
}
|
||||
}
|
||||
|
||||
bool cPacket_Metadata::Send(cSocket & a_Socket) {
|
||||
unsigned int TotalSize = c_Size + m_MetaDataSize;
|
||||
char* Message = new char[TotalSize];
|
||||
unsigned int i = 0;
|
||||
|
||||
AppendByte ( (char)m_PacketID, Message, i );
|
||||
AppendInteger ( m_UniqueID, Message, i );
|
||||
AppendData ( m_MetaData, m_MetaDataSize, Message, i );
|
||||
|
||||
bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) );
|
||||
return RetVal;
|
||||
|
||||
|
||||
void cPacket_Metadata::Serialize(AString & a_Data) const
|
||||
{
|
||||
AppendByte (a_Data, m_PacketID);
|
||||
AppendInteger(a_Data, m_UniqueID);
|
||||
AppendData (a_Data, m_MetaData, m_MetaDataSize);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user