mirror of
https://bitbucket.org/theswgsource/src-1.2.git
synced 2026-07-31 01:15:48 -04:00
mostly template initializations to prevent undefined behavior in the
(unlikely) chance some of these properties are used
This commit is contained in:
DarthArgus
+199
-216
@@ -10,46 +10,45 @@
|
||||
// ********************************** DO NOT EDIT THIS FILE ***********************************
|
||||
// **********************************************************************************************
|
||||
// **********************************************************************************************
|
||||
void set_bit( unsigned char p[], int bit){ p[bit >> 3] |= 1 << (bit & 0x7); }
|
||||
void unset_bit(unsigned char p[], int bit){ p[bit >> 3] &= ~(1 << (bit & 0x7)); }
|
||||
int get_bit( unsigned char p[], int bit){ return (p[bit >> 3] >> (bit & 0x7)) & 1; }
|
||||
int ZEXPORT uncompress2( Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
|
||||
|
||||
void set_bit(unsigned char p[], int bit) { p[bit >> 3] |= 1 << (bit & 0x7); }
|
||||
void unset_bit(unsigned char p[], int bit) { p[bit >> 3] &= ~(1 << (bit & 0x7)); }
|
||||
int get_bit(unsigned char p[], int bit) { return (p[bit >> 3] >> (bit & 0x7)) & 1; }
|
||||
int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
|
||||
|
||||
////////////////////////////////////////
|
||||
// Player implementation
|
||||
////////////////////////////////////////
|
||||
MonitorObject::MonitorObject(UdpConnection *con,CMonitorData *_gamedata, char *passwd, char **addressList,bool _bprint)
|
||||
MonitorObject::MonitorObject(UdpConnection *con, CMonitorData *_gamedata, char *passwd, char **addressList, bool _bprint)
|
||||
{
|
||||
mbprint = _bprint;
|
||||
mMonitorData = _gamedata;
|
||||
mbAuthenticated = false;
|
||||
mPasswd = passwd;
|
||||
mAddressList = addressList;
|
||||
mHierarchySent = false;
|
||||
mSequence = 1;
|
||||
mbprint = _bprint;
|
||||
mMonitorData = _gamedata;
|
||||
mbAuthenticated = false;
|
||||
mPasswd = passwd;
|
||||
mAddressList = addressList;
|
||||
mHierarchySent = false;
|
||||
mSequence = 1;
|
||||
mlastUpdateTime = 0;
|
||||
mConnection = con;
|
||||
mConnection = con;
|
||||
mConnection->AddRef();
|
||||
mConnection->SetHandler(this);
|
||||
|
||||
// Flag all the descriptions
|
||||
mMark = new unsigned char [ (mMonitorData->DataMax()/8)+2];
|
||||
memset(mMark,0,(mMonitorData->DataMax()/8)+2);
|
||||
mMark = new unsigned char[(mMonitorData->DataMax() / 8) + 2];
|
||||
memset(mMark, 0, (mMonitorData->DataMax() / 8) + 2);
|
||||
char hold[256];
|
||||
if( mbprint )
|
||||
if (mbprint)
|
||||
{
|
||||
fprintf(stderr,"MONITOR API CONNECTED: %s:%d\n",
|
||||
mConnection->GetDestinationIp().GetAddress(hold),
|
||||
fprintf(stderr, "MONITOR API CONNECTED: %s:%d\n",
|
||||
mConnection->GetDestinationIp().GetAddress(hold),
|
||||
mConnection->GetDestinationPort());
|
||||
}
|
||||
}
|
||||
|
||||
MonitorObject::~MonitorObject()
|
||||
{
|
||||
delete [] mMark;
|
||||
delete[] mMark;
|
||||
|
||||
if( mConnection )
|
||||
if (mConnection)
|
||||
{
|
||||
mConnection->SetHandler(nullptr);
|
||||
mConnection->Disconnect();
|
||||
@@ -57,22 +56,22 @@ MonitorObject::~MonitorObject()
|
||||
}
|
||||
}
|
||||
|
||||
void MonitorObject::OnTerminated( UdpConnection * /* con */)
|
||||
void MonitorObject::OnTerminated(UdpConnection * /* con */)
|
||||
{
|
||||
char hold[214];
|
||||
char hold[214];
|
||||
|
||||
if( mConnection )
|
||||
if (mConnection)
|
||||
{
|
||||
if( mbprint )
|
||||
if (mbprint)
|
||||
{
|
||||
mConnection->GetDestinationIp().GetAddress(hold);
|
||||
if( mbprint )
|
||||
if (mbprint)
|
||||
{
|
||||
fprintf(stderr,"MONITOR API TERMINATE %s:%d %s - %s\n",
|
||||
hold,
|
||||
fprintf(stderr, "MONITOR API TERMINATE %s:%d %s - %s\n",
|
||||
hold,
|
||||
mConnection->GetDestinationPort(),
|
||||
UdpConnection::DisconnectReasonText( mConnection->GetDisconnectReason()),
|
||||
UdpConnection::DisconnectReasonText( mConnection->GetOtherSideDisconnectReason()));
|
||||
UdpConnection::DisconnectReasonText(mConnection->GetDisconnectReason()),
|
||||
UdpConnection::DisconnectReasonText(mConnection->GetOtherSideDisconnectReason()));
|
||||
}
|
||||
}
|
||||
mConnection->SetHandler(nullptr);
|
||||
@@ -82,32 +81,30 @@ char hold[214];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void MonitorObject::OnRoutePacket( UdpConnection * con, const unsigned char *data, int dataLen)
|
||||
void MonitorObject::OnRoutePacket(UdpConnection * con, const unsigned char *data, int dataLen)
|
||||
{
|
||||
|
||||
if( dataLen < 6 )
|
||||
if (dataLen < 6)
|
||||
{
|
||||
if( mbprint )
|
||||
fprintf(stderr,"MONITOR API: This should not happen, line %d\n",__LINE__);
|
||||
if (mbprint)
|
||||
fprintf(stderr, "MONITOR API: This should not happen, line %d\n", __LINE__);
|
||||
}
|
||||
|
||||
simpleMessage msg(data);
|
||||
|
||||
if( con == nullptr )
|
||||
if (con == nullptr)
|
||||
{
|
||||
if( mbprint)
|
||||
fprintf(stderr,"MONITOR API: MonitorObject.OnRoutePacket, recived a nullptr connection.?\n");
|
||||
if (mbprint)
|
||||
fprintf(stderr, "MONITOR API: MonitorObject.OnRoutePacket, recived a nullptr connection.?\n");
|
||||
return;
|
||||
}
|
||||
|
||||
// ************************* Login Process ***************************
|
||||
if ( mbAuthenticated == false )
|
||||
{
|
||||
if ( msg.getCommand() != MON_MSG_AUTH )
|
||||
return;
|
||||
if (mbAuthenticated == false)
|
||||
{
|
||||
if (msg.getCommand() != MON_MSG_AUTH)
|
||||
return;
|
||||
|
||||
if( processAuthRequest(data, dataLen) == false )
|
||||
if (processAuthRequest(data, dataLen) == false)
|
||||
return;
|
||||
|
||||
mbAuthenticated = true;
|
||||
@@ -115,21 +112,20 @@ void MonitorObject::OnRoutePacket( UdpConnection * con, const unsigned char *da
|
||||
}
|
||||
|
||||
// ************************* Process Commands ***********************
|
||||
switch(msg.getCommand())
|
||||
switch (msg.getCommand())
|
||||
{
|
||||
|
||||
// *********************** Game Server Processing ******************
|
||||
// *********************** Game Server Processing ******************
|
||||
case MON_MSG_QUERY_ELEMENTS:
|
||||
if( mHierarchySent == true )
|
||||
{
|
||||
mMonitorData->processElementsRequest(con,mSequence,(char *)&data[6],dataLen,mlastUpdateTime );
|
||||
if (mHierarchySent == true)
|
||||
{
|
||||
mMonitorData->processElementsRequest(con, mSequence, (char *)&data[6], dataLen, mlastUpdateTime);
|
||||
mlastUpdateTime = (long)time(nullptr);
|
||||
break;
|
||||
}
|
||||
|
||||
// When the hierarchy has changed, fall through
|
||||
case MON_MSG_QUERY_HIERARCHY_BLOCK:
|
||||
if( mMonitorData->processHierarchyRequestBlock(con,mSequence) == false)
|
||||
if (mMonitorData->processHierarchyRequestBlock(con, mSequence) == false)
|
||||
{
|
||||
break;
|
||||
}
|
||||
@@ -137,7 +133,7 @@ void MonitorObject::OnRoutePacket( UdpConnection * con, const unsigned char *da
|
||||
break;
|
||||
|
||||
case MON_MSG_QUERY_DESCRIPTION:
|
||||
mMonitorData->processDescriptionRequest(con,mSequence,(char *)&data[6], dataLen,mMark);
|
||||
mMonitorData->processDescriptionRequest(con, mSequence, (char *)&data[6], dataLen, mMark);
|
||||
break;
|
||||
|
||||
case MON_MSG_ERROR:
|
||||
@@ -145,43 +141,41 @@ void MonitorObject::OnRoutePacket( UdpConnection * con, const unsigned char *da
|
||||
break;
|
||||
|
||||
default:
|
||||
fprintf(stderr,"MONITOR API: unknown message type received from client [%x]\n",msg.getCommand());
|
||||
fprintf(stderr, "MONITOR API: unknown message type received from client [%x]\n", msg.getCommand());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool MonitorObject::checkAddress(const char * address)
|
||||
{
|
||||
int x = 0;
|
||||
while( mAddressList[x] )
|
||||
int x = 0;
|
||||
while (mAddressList[x])
|
||||
{
|
||||
if (strncmp(mAddressList[x], address, strlen(mAddressList[x]))== 0)
|
||||
if (strncmp(mAddressList[x], address, strlen(mAddressList[x])) == 0)
|
||||
return true;
|
||||
x++;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool MonitorObject::checkPasswd( const char *passwd)
|
||||
bool MonitorObject::checkPasswd(const char *passwd)
|
||||
{
|
||||
if (strcmp(mPasswd,passwd)== 0 )
|
||||
if (strcmp(mPasswd, passwd) == 0)
|
||||
return true;
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool MonitorObject::processAuthRequest(const unsigned char * data, int /* dataLen */)
|
||||
{
|
||||
char reply;
|
||||
stringMessage strMsg(data);
|
||||
char addBuff[16] = {0};
|
||||
char sendBuf[32];
|
||||
int len;
|
||||
|
||||
char reply;
|
||||
stringMessage strMsg(data);
|
||||
char addBuff[16] = { 0 };
|
||||
char sendBuf[32];
|
||||
int len;
|
||||
|
||||
reply = '1';
|
||||
|
||||
if ( checkAddress(mConnection->GetDestinationIp().GetAddress(addBuff)) == false)
|
||||
|
||||
if (checkAddress(mConnection->GetDestinationIp().GetAddress(addBuff)) == false)
|
||||
{
|
||||
reply = '3';
|
||||
}
|
||||
@@ -191,21 +185,21 @@ int len;
|
||||
}
|
||||
|
||||
memset(sendBuf, 0, sizeof(sendBuf));
|
||||
|
||||
|
||||
len = 0;
|
||||
packShort( sendBuf + len, len,(short)MON_MSG_AUTHREPLY);
|
||||
packShort( sendBuf + len, len, mSequence);
|
||||
packShort( sendBuf + len, len,(short)3);
|
||||
packShort( sendBuf + len, len,(short)CURRENT_API_VERSION);
|
||||
packByte( sendBuf + len, len, reply);
|
||||
|
||||
mConnection->Send(cUdpChannelReliable1, sendBuf, 9 );
|
||||
packShort(sendBuf + len, len, (short)MON_MSG_AUTHREPLY);
|
||||
packShort(sendBuf + len, len, mSequence);
|
||||
packShort(sendBuf + len, len, (short)3);
|
||||
packShort(sendBuf + len, len, (short)CURRENT_API_VERSION);
|
||||
packByte(sendBuf + len, len, reply);
|
||||
|
||||
mConnection->Send(cUdpChannelReliable1, sendBuf, 9);
|
||||
return true;
|
||||
}
|
||||
|
||||
void MonitorObject::DescriptionMark(int x,int mode)
|
||||
void MonitorObject::DescriptionMark(int x, int mode)
|
||||
{
|
||||
if( mode == 0 ) set_bit(mMark,x); else unset_bit(mMark,x);
|
||||
if (mode == 0) set_bit(mMark, x); else unset_bit(mMark, x);
|
||||
}
|
||||
|
||||
char * getErrorString(unsigned short errorCode)
|
||||
@@ -240,7 +234,6 @@ char * getErrorString(unsigned short errorCode)
|
||||
|
||||
case INVALID_ERROR_CODE:
|
||||
return "Received invalid error message";
|
||||
|
||||
}
|
||||
}
|
||||
return "Undefined error code";
|
||||
@@ -250,7 +243,7 @@ bool MonitorObject::processError(const unsigned char * data)
|
||||
{
|
||||
stringMessage strMsg(data);
|
||||
unsigned short errCode = (unsigned short)atoi(strMsg.getData());
|
||||
fprintf(stderr,"MONITOR API Error: %s\n", getErrorString(errCode));
|
||||
fprintf(stderr, "MONITOR API Error: %s\n", getErrorString(errCode));
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -261,46 +254,46 @@ MonitorManager::MonitorManager(const char *configFile, CMonitorData *_gamedata,
|
||||
{
|
||||
mManager = manager;
|
||||
mbprint = _bprint;
|
||||
passString = nullptr;
|
||||
passString = nullptr;
|
||||
mMonitorData = _gamedata;
|
||||
mObjectCount = 0;
|
||||
|
||||
for(int x=0;x<AUTHADDRESS_MAX;x++)
|
||||
for (int x = 0; x < AUTHADDRESS_MAX; x++)
|
||||
allowedAddressList[x] = 0;
|
||||
|
||||
|
||||
loadAuthData(configFile);
|
||||
}
|
||||
|
||||
MonitorManager::~MonitorManager()
|
||||
{
|
||||
int x;
|
||||
int x;
|
||||
|
||||
x=0;
|
||||
while( allowedAddressList[x])
|
||||
x = 0;
|
||||
while (allowedAddressList[x])
|
||||
free(allowedAddressList[x++]);
|
||||
|
||||
free( passString );
|
||||
free(passString);
|
||||
|
||||
for (int i =0; i < mObjectCount; i++ )
|
||||
for (int i = 0; i < mObjectCount; i++)
|
||||
delete mObject[i];
|
||||
}
|
||||
|
||||
void MonitorManager::OnConnectRequest(UdpConnection *con)
|
||||
{
|
||||
if( mObjectCount == CONNECTION_MAX )
|
||||
if (mObjectCount == CONNECTION_MAX)
|
||||
{
|
||||
if( con )
|
||||
if (con)
|
||||
{
|
||||
con->SetHandler(nullptr);
|
||||
con->Disconnect();
|
||||
con->Release();
|
||||
}
|
||||
if( mbprint )
|
||||
fprintf(stderr,"MonitorAPI: Collector connection reached max (%d).\n",CONNECTION_MAX);
|
||||
if (mbprint)
|
||||
fprintf(stderr, "MonitorAPI: Collector connection reached max (%d).\n", CONNECTION_MAX);
|
||||
return;
|
||||
}
|
||||
|
||||
AddObject(new MonitorObject(con,mMonitorData,passString,allowedAddressList,mbprint));
|
||||
|
||||
AddObject(new MonitorObject(con, mMonitorData, passString, allowedAddressList, mbprint));
|
||||
}
|
||||
|
||||
void MonitorManager::AddObject(MonitorObject *Object)
|
||||
@@ -313,8 +306,8 @@ void MonitorManager::GiveTime()
|
||||
// check if the monitor object is no longer connected
|
||||
for (int i = 0; i < mObjectCount; i++)
|
||||
{
|
||||
if( mObject[i]->mConnection == nullptr ||
|
||||
mObject[i]->mConnection->GetStatus() == UdpConnection::cStatusDisconnected )
|
||||
if (mObject[i]->mConnection == nullptr ||
|
||||
mObject[i]->mConnection->GetStatus() == UdpConnection::cStatusDisconnected)
|
||||
{
|
||||
MonitorObject *o = mObject[i];
|
||||
mObjectCount--;
|
||||
@@ -331,32 +324,31 @@ void MonitorManager::HierarchyChanged()
|
||||
mObject[i]->HeirarchyChanged();
|
||||
}
|
||||
|
||||
void MonitorManager::DescriptionMark(int x ,int mode)
|
||||
void MonitorManager::DescriptionMark(int x, int mode)
|
||||
{
|
||||
for (int i = 0; i < mObjectCount; i++)
|
||||
mObject[i]->DescriptionMark(x,mode);
|
||||
mObject[i]->DescriptionMark(x, mode);
|
||||
}
|
||||
|
||||
bool MonitorManager::loadAuthData(const char * filename)
|
||||
{
|
||||
int nline;
|
||||
int len;
|
||||
int x;
|
||||
char buffer[1024];
|
||||
int nline;
|
||||
int len;
|
||||
int x;
|
||||
char buffer[1024];
|
||||
|
||||
FILE *fp = fopen(filename,"r");
|
||||
FILE *fp = fopen(filename, "r");
|
||||
if (fp == nullptr)
|
||||
{
|
||||
fprintf(stderr,"Monitor API: could not open %s file\nTHIS FILE IS REQUIRED.\n", filename);
|
||||
fprintf(stderr, "Monitor API: could not open %s file\nTHIS FILE IS REQUIRED.\n", filename);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
free(passString);
|
||||
|
||||
|
||||
for(x=0;x<AUTHADDRESS_MAX;x++)
|
||||
for (x = 0; x < AUTHADDRESS_MAX; x++)
|
||||
{
|
||||
if( allowedAddressList[x] )
|
||||
if (allowedAddressList[x])
|
||||
{
|
||||
free(allowedAddressList[x]);
|
||||
allowedAddressList[x] = 0;
|
||||
@@ -365,28 +357,28 @@ char buffer[1024];
|
||||
|
||||
nline = 0;
|
||||
x = 0;
|
||||
while(!feof(fp))
|
||||
while (!feof(fp))
|
||||
{
|
||||
if (fgets( buffer, 1023, fp) != nullptr) {
|
||||
if (fgets(buffer, 1023, fp) != nullptr) {
|
||||
// get rid of '\n' and '\r' for comparisons
|
||||
strtok(buffer,"\r\n");
|
||||
strtok(buffer, "\r\n");
|
||||
len = (int)strlen(buffer);
|
||||
if( len > 0 )
|
||||
if (len > 0)
|
||||
{
|
||||
if( nline == 0 )
|
||||
if (nline == 0)
|
||||
{
|
||||
passString = (char *)malloc( len + 1 );
|
||||
strcpy(passString,buffer);
|
||||
passString = (char *)malloc(len + 1);
|
||||
strcpy(passString, buffer);
|
||||
}
|
||||
else
|
||||
{
|
||||
allowedAddressList[x] = (char *)malloc( len + 1 );
|
||||
strcpy(allowedAddressList[x],buffer);
|
||||
allowedAddressList[x] = (char *)malloc(len + 1);
|
||||
strcpy(allowedAddressList[x], buffer);
|
||||
x++;
|
||||
}
|
||||
}
|
||||
nline++;
|
||||
}
|
||||
}
|
||||
}
|
||||
// clean up
|
||||
fclose(fp);
|
||||
@@ -398,40 +390,40 @@ char buffer[1024];
|
||||
// ******************************************************************************************************
|
||||
// ******************************************************************************************************
|
||||
|
||||
CMonitorAPI::CMonitorAPI( const char *configFile, unsigned short Port, bool _bprint , char *address, UdpManager * mang )
|
||||
CMonitorAPI::CMonitorAPI(const char *configFile, unsigned short Port, bool _bprint, char *address, UdpManager * mang)
|
||||
{
|
||||
mbprint = _bprint;
|
||||
mPort = Port;
|
||||
|
||||
mAddress = nullptr;
|
||||
if( address )
|
||||
if (address)
|
||||
{
|
||||
mAddress = (char *)malloc(strlen(address)+1);
|
||||
strcpy(mAddress,address);
|
||||
mAddress = (char *)malloc(strlen(address) + 1);
|
||||
strcpy(mAddress, address);
|
||||
}
|
||||
|
||||
if( mang == nullptr )
|
||||
if (mang == nullptr)
|
||||
{
|
||||
UdpManager::Params params;
|
||||
params.handler = nullptr;
|
||||
params.maxConnections = CONNECTION_MAX;
|
||||
params.handler = nullptr;
|
||||
params.maxConnections = CONNECTION_MAX;
|
||||
params.outgoingBufferSize = 1000000;
|
||||
params.noDataTimeout = 130000;
|
||||
params.noDataTimeout = 130000;
|
||||
params.oldestUnacknowledgedTimeout = 120000;
|
||||
params.processIcmpErrors = false;
|
||||
params.port = mPort;
|
||||
mManager = new UdpManager(¶ms);
|
||||
mMonitorData = new CMonitorData();
|
||||
params.port = mPort;
|
||||
mManager = new UdpManager(¶ms);
|
||||
mMonitorData = new CMonitorData();
|
||||
}
|
||||
|
||||
mObjectManager = new MonitorManager(configFile,mMonitorData,mManager,mbprint);
|
||||
|
||||
mObjectManager = new MonitorManager(configFile, mMonitorData, mManager, mbprint);
|
||||
|
||||
mManager->SetHandler(mObjectManager);
|
||||
|
||||
if( mbprint )
|
||||
fprintf(stderr,"MonitorAPI: started on port->%d\n",mPort);
|
||||
if (mbprint)
|
||||
fprintf(stderr, "MonitorAPI: started on port->%d\n", mPort);
|
||||
}
|
||||
|
||||
|
||||
CMonitorAPI::~CMonitorAPI()
|
||||
{
|
||||
free(mAddress);
|
||||
@@ -441,127 +433,123 @@ CMonitorAPI::~CMonitorAPI()
|
||||
mManager->Release();
|
||||
|
||||
delete mMonitorData;
|
||||
|
||||
}
|
||||
|
||||
void CMonitorAPI::Update()
|
||||
{
|
||||
if( mManager )
|
||||
if (mManager)
|
||||
mManager->GiveTime();
|
||||
if( mObjectManager )
|
||||
if (mObjectManager)
|
||||
mObjectManager->GiveTime();
|
||||
}
|
||||
|
||||
int CMonitorAPI::add(const char *label, int id, int ping, const char *des )
|
||||
{
|
||||
int rnt;
|
||||
int CMonitorAPI::add(const char *label, int id, int ping, const char *des)
|
||||
{
|
||||
int rnt;
|
||||
|
||||
rnt = mMonitorData->add(label,id,ping,des);
|
||||
if( rnt )
|
||||
rnt = mMonitorData->add(label, id, ping, des);
|
||||
if (rnt)
|
||||
mObjectManager->HierarchyChanged();
|
||||
return rnt;
|
||||
return rnt;
|
||||
}
|
||||
|
||||
void CMonitorAPI::remove(int Id)
|
||||
{
|
||||
mMonitorData->remove(Id);
|
||||
{
|
||||
mMonitorData->remove(Id);
|
||||
mObjectManager->HierarchyChanged();
|
||||
}
|
||||
|
||||
void CMonitorAPI::setDescription( int Id, const char *Description )
|
||||
void CMonitorAPI::setDescription(int Id, const char *Description)
|
||||
{
|
||||
int x;
|
||||
int mode;
|
||||
|
||||
x = mMonitorData->setDescription(Id,Description,mode);
|
||||
if( x == -1 )
|
||||
int x;
|
||||
int mode;
|
||||
|
||||
x = mMonitorData->setDescription(Id, Description, mode);
|
||||
if (x == -1)
|
||||
return;
|
||||
mObjectManager->DescriptionMark(x,mode);
|
||||
mObjectManager->DescriptionMark(x, mode);
|
||||
}
|
||||
|
||||
void CMonitorAPI::dump(){ mMonitorData->dump(); }
|
||||
void CMonitorAPI::dump() { mMonitorData->dump(); }
|
||||
|
||||
//----------------------------------------------------------------
|
||||
monMessage::monMessage():command(0),sequence(0),size(0){}
|
||||
monMessage::monMessage() :command(0), sequence(0), size(0) {}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
monMessage::monMessage(short cmd,short seq,short s):command(cmd),sequence(seq),size(s){}
|
||||
monMessage::monMessage(short cmd, short seq, short s) : command(cmd), sequence(seq), size(s) {}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
monMessage::monMessage(const unsigned char * source):command(0),sequence(0),size(0)
|
||||
{
|
||||
int len;
|
||||
monMessage::monMessage(const unsigned char * source) : command(0), sequence(0), size(0)
|
||||
{
|
||||
int len;
|
||||
|
||||
len = 0;
|
||||
unpackShort( (char *)source + len, len,command);
|
||||
unpackShort( (char *)source + len, len,sequence);
|
||||
unpackShort( (char *)source + len, len,size);
|
||||
unpackShort((char *)source + len, len, command);
|
||||
unpackShort((char *)source + len, len, sequence);
|
||||
unpackShort((char *)source + len, len, size);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
// monMessage::monMessage(const monMessage ©):command(copy.command),sequence(copy.sequence),size(copy.size){}
|
||||
|
||||
|
||||
|
||||
//----------------------------------------------------------------
|
||||
stringMessage::stringMessage(const unsigned char * source):monMessage(source)
|
||||
stringMessage::stringMessage(const unsigned char * source) :monMessage(source)
|
||||
{
|
||||
int size;
|
||||
int size;
|
||||
|
||||
size = (int)strlen((char *)source+6) +1;
|
||||
data = new char [ size ];
|
||||
strcpy(data,(char *)source+6); // Add six for the size of the header
|
||||
size = (int)strlen((char *)source + 6) + 1;
|
||||
data = new char[size];
|
||||
strcpy(data, (char *)source + 6); // Add six for the size of the header
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
stringMessage::stringMessage(const unsigned short command,const unsigned short sequence,const unsigned short size,char * newData):
|
||||
monMessage(command, sequence, size)
|
||||
stringMessage::stringMessage(const unsigned short command, const unsigned short sequence, const unsigned short size, char * newData) :
|
||||
monMessage(command, sequence, size)
|
||||
{
|
||||
data = new char [strlen(newData) + 1];
|
||||
data = new char[strlen(newData) + 1];
|
||||
strncpy(data, newData, strlen(newData + 1));
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
stringMessage::~stringMessage()
|
||||
{
|
||||
delete [] data;
|
||||
delete[] data;
|
||||
data = 0;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
authReplyMessage::authReplyMessage(const unsigned char * source) :
|
||||
monMessage(source)
|
||||
monMessage(source)
|
||||
{
|
||||
int len = 6;
|
||||
unpackShort((char *)source+len,len,version);
|
||||
unpackByte((char *)source+len,len,data);
|
||||
unpackShort((char *)source + len, len, version);
|
||||
unpackByte((char *)source + len, len, data);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
authReplyMessage::authReplyMessage(const unsigned short command,
|
||||
const unsigned short sequence,
|
||||
const unsigned short size,
|
||||
unsigned char newData):
|
||||
monMessage(command, sequence, size),data(newData){}
|
||||
|
||||
authReplyMessage::authReplyMessage(const unsigned short command,
|
||||
const unsigned short sequence,
|
||||
const unsigned short size,
|
||||
unsigned char newData) :
|
||||
monMessage(command, sequence, size), data(newData), version() {}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
dataReplyMessage::dataReplyMessage(const unsigned char * source) :
|
||||
monMessage(source)
|
||||
monMessage(source)
|
||||
{
|
||||
data = new unsigned char[getSize()+1];
|
||||
data = new unsigned char[getSize() + 1];
|
||||
|
||||
memcpy(data, source + 6, getSize());
|
||||
data[getSize()] = 0;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
dataReplyMessage::dataReplyMessage(const unsigned short command,
|
||||
const unsigned short sequence,
|
||||
const unsigned short size,
|
||||
unsigned char * newData,
|
||||
int newDataLen):
|
||||
monMessage(command, sequence, size)
|
||||
dataReplyMessage::dataReplyMessage(const unsigned short command,
|
||||
const unsigned short sequence,
|
||||
const unsigned short size,
|
||||
unsigned char * newData,
|
||||
int newDataLen) :
|
||||
monMessage(command, sequence, size)
|
||||
{
|
||||
data = new unsigned char[newDataLen];
|
||||
memcpy(data, newData, newDataLen);
|
||||
@@ -570,51 +558,46 @@ monMessage(command, sequence, size)
|
||||
//----------------------------------------------------------------
|
||||
dataReplyMessage::~dataReplyMessage()
|
||||
{
|
||||
delete [] data;
|
||||
delete[] data;
|
||||
data = 0;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
simpleMessage::simpleMessage(const unsigned char * source):monMessage(source){}
|
||||
simpleMessage::simpleMessage(const unsigned char * source) :monMessage(source) {}
|
||||
//----------------------------------------------------------------
|
||||
simpleMessage::simpleMessage(const unsigned short command,
|
||||
const unsigned short sequence,
|
||||
const unsigned short size):
|
||||
monMessage(command, sequence, size){}
|
||||
simpleMessage::simpleMessage(const unsigned short command,
|
||||
const unsigned short sequence,
|
||||
const unsigned short size) :
|
||||
monMessage(command, sequence, size) {}
|
||||
//----------------------------------------------------------------
|
||||
simpleMessage::~simpleMessage(){}
|
||||
simpleMessage::~simpleMessage() {}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
|
||||
|
||||
//----------------------------------------------------------------
|
||||
dataBlockReplyMessage::dataBlockReplyMessage(const unsigned char * source) :
|
||||
monMessage(source)
|
||||
monMessage(source)
|
||||
{
|
||||
int err;
|
||||
unsigned long S = 4000000;
|
||||
unsigned char *p;
|
||||
int err;
|
||||
unsigned long S = 4000000;
|
||||
unsigned char *p;
|
||||
|
||||
data = nullptr;
|
||||
p = (unsigned char *)malloc(4000000);
|
||||
memset(p,0,4000000);
|
||||
err = uncompress(p,&S,(source+6),(long)getSize());
|
||||
if( Z_OK != err ) { free(p);return; }
|
||||
data = new unsigned char[S+1];
|
||||
memcpy(data,p,S);
|
||||
memset(p, 0, 4000000);
|
||||
err = uncompress(p, &S, (source + 6), (long)getSize());
|
||||
if (Z_OK != err) { free(p); return; }
|
||||
data = new unsigned char[S + 1];
|
||||
memcpy(data, p, S);
|
||||
setSize((unsigned short)S);
|
||||
free(p);
|
||||
}
|
||||
//----------------------------------------------------------------
|
||||
dataBlockReplyMessage::~dataBlockReplyMessage()
|
||||
{
|
||||
if (data)
|
||||
{
|
||||
delete [] data;
|
||||
data = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
if (data)
|
||||
{
|
||||
delete[] data;
|
||||
data = 0;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user