diff --git a/.cproject b/.cproject index f52491d..78de229 100644 --- a/.cproject +++ b/.cproject @@ -1,178 +1,354 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp index 78b8c4b..5957cae 100644 --- a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp +++ b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp @@ -262,7 +262,7 @@ void ClientRecvTask::log(Client* client, MQTTSNPacket* packet, MQTTSNString* id) void ClientRecvTask::log(const char* clientId, MQTTSNPacket* packet) { - char pbuf[ (SIZE_OF_LOG_PACKET + 3) * 3]; + char pbuf[ SIZE_OF_LOG_PACKET * 3 + 1]; char msgId[6]; switch (packet->getType()) diff --git a/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp index 478f6fc..fc8c412 100644 --- a/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp +++ b/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp @@ -84,7 +84,7 @@ void ClientSendTask::run() void ClientSendTask::log(Client* client, MQTTSNPacket* packet) { - char pbuf[(SIZE_OF_LOG_PACKET + 3) * 3]; + char pbuf[SIZE_OF_LOG_PACKET * 3 + 1]; char msgId[6]; const char* clientId = client ? (const char*)client->getClientId() : UNKNOWNCL ; diff --git a/MQTTSNGateway/src/MQTTSNGWPacket.cpp b/MQTTSNGateway/src/MQTTSNGWPacket.cpp index 1494a2c..c2a017a 100644 --- a/MQTTSNGateway/src/MQTTSNGWPacket.cpp +++ b/MQTTSNGateway/src/MQTTSNGWPacket.cpp @@ -423,12 +423,9 @@ char* MQTTSNPacket::print(char* pbuf) { char* ptr = pbuf; char** pptr = &pbuf; - int value = 0; - - int i = MQTTSNPacket_decode(_buf, _bufLen, &value); int size = _bufLen > SIZE_OF_LOG_PACKET ? SIZE_OF_LOG_PACKET : _bufLen; - for (i = 0; i < size; i++) + for (int i = 0; i < size; i++) { sprintf(*pptr, " %02X", *(_buf + i)); *pptr += 3;