Adding packet class for chat cleaner as separate file.

This commit is contained in:
lotodore
2009-08-14 19:22:34 +00:00
parent 6003a54b8f
commit 0c5f2623a3
5 changed files with 96 additions and 37 deletions
+6 -34
View File
@@ -18,6 +18,7 @@
***************************************************************************/
#include <net/chatcleanermanager.h>
#include <net/internalchatcleanerpacket.h>
#include <net/encodedpacket.h>
#include <boost/bind.hpp>
#include <core/loghelper.h>
@@ -27,35 +28,6 @@
using namespace std;
using boost::asio::ip::tcp;
class InternalChatCleanerMessage
{
public:
InternalChatCleanerMessage()
{
m_msg = (ChatCleanerMessage_t *)calloc(1, sizeof(ChatCleanerMessage_t));
}
InternalChatCleanerMessage(ChatCleanerMessage_t *msg)
: m_msg(msg)
{
}
~InternalChatCleanerMessage()
{
if (m_msg)
ASN_STRUCT_FREE(asn_DEF_ChatCleanerMessage, m_msg);
}
ChatCleanerMessage_t *GetMsg()
{
return m_msg;
}
ChatCleanerMessage_t **GetMsgPtr()
{
return &m_msg;
}
private:
ChatCleanerMessage_t *m_msg;
};
ChatCleanerManager::ChatCleanerManager(boost::shared_ptr<boost::asio::io_service> ioService)
: m_ioService(ioService), m_connected(false), m_curRequestId(0), m_recvBufUsed(0)
@@ -96,7 +68,7 @@ ChatCleanerManager::HandleChatText(unsigned playerId, const std::string &name, c
{
if (m_connected)
{
InternalChatCleanerMessage tmpChat;
InternalChatCleanerPacket tmpChat;
tmpChat.GetMsg()->present = ChatCleanerMessage_PR_cleanerChatRequestMessage;
CleanerChatRequestMessage_t *netRequest = &tmpChat.GetMsg()->choice.cleanerChatRequestMessage;
netRequest->requestId = GetNextRequestId();
@@ -137,7 +109,7 @@ ChatCleanerManager::HandleConnect(const boost::system::error_code& ec,
{
if (!ec)
{
InternalChatCleanerMessage tmpInit;
InternalChatCleanerPacket tmpInit;
tmpInit.GetMsg()->present = ChatCleanerMessage_PR_cleanerInitMessage;
CleanerInitMessage_t *netInit = &tmpInit.GetMsg()->choice.cleanerInitMessage;
netInit->requestedVersion = CLEANER_PROTOCOL_VERSION;
@@ -194,7 +166,7 @@ ChatCleanerManager::HandleRead(const boost::system::error_code &ec, size_t bytes
asn_dec_rval_t retVal;
do
{
InternalChatCleanerMessage recvMsg;
InternalChatCleanerPacket recvMsg;
retVal = ber_decode(0, &asn_DEF_ChatCleanerMessage, (void **)recvMsg.GetMsgPtr(), m_recvBuf, m_recvBufUsed);
if(retVal.code == RC_OK)
{
@@ -231,7 +203,7 @@ ChatCleanerManager::HandleRead(const boost::system::error_code &ec, size_t bytes
}
bool
ChatCleanerManager::HandleMessage(InternalChatCleanerMessage &msg)
ChatCleanerManager::HandleMessage(InternalChatCleanerPacket &msg)
{
bool error = false;
if (msg.GetMsg()->present == ChatCleanerMessage_PR_cleanerInitAckMessage)
@@ -254,7 +226,7 @@ ChatCleanerManager::HandleMessage(InternalChatCleanerMessage &msg)
}
void
ChatCleanerManager::SendMessageToServer(InternalChatCleanerMessage &msg)
ChatCleanerManager::SendMessageToServer(InternalChatCleanerPacket &msg)
{
unsigned char buf[MAX_CLEANER_PACKET_SIZE];
asn_enc_rval_t e = der_encode_to_buffer(&asn_DEF_ChatCleanerMessage, msg.GetMsg(), buf, MAX_CLEANER_PACKET_SIZE);