GitHub/paho.mqtt-sn.embedded-c
1
0
Fork 0
mirror of https://github.com/eclipse/paho.mqtt-sn.embedded-c.git synced 2025-12-14 16:06:51 +01:00
Code Issues Projects Releases Wiki Activity

BugFix: MQTTSNDeserialize_XXXX() functions don't return error code when

Browse Source 
error occurs.

Do not store the length of packet into rc.

If the packet is incorrect, skip the processing that follows.

Bugfix: Print out the value of TopicId in SUBACK and UNSUBACK. 
 
Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
This commit is contained in:
tomoaki
2017-05-19 09:44:51 +09:00
parent 1b867589e5
commit 5c278f1aec
14 changed files with 64 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp
View File

@@ -69,7 +69,10 @@ void MQTTSNConnectionHandler::handleSearchgw(MQTTSNPacket* packet)
void MQTTSNConnectionHandler::handleConnect(Client* client, MQTTSNPacket* packet)
{
MQTTSNPacket_connectData data;
packet->getCONNECT(&data);
if ( packet->getCONNECT(&data) == 0 )
{
return;
}
/* clear ConnectData of Client */
Connect* connectData = client->getConnectData();
@@ -142,7 +145,10 @@ void MQTTSNConnectionHandler::handleWilltopic(Client* client, MQTTSNPacket* pack
uint8_t willRetain;
MQTTSNString willTopic;
packet->getWILLTOPIC(&willQos, &willRetain, &willTopic);
if ( packet->getWILLTOPIC(&willQos, &willRetain, &willTopic) == 0 )
{
return;
}
client->setWillTopic(willTopic);
Connect* connectData = client->getConnectData();
@@ -168,17 +174,6 @@ void MQTTSNConnectionHandler::handleWillmsg(Client* client, MQTTSNPacket* packet
if ( !client->isWaitWillMsg() )
{
DEBUGLOG(" MQTTSNConnectionHandler::handleWillmsg WaitWillMsgFlg is off.\n");
//if ( !client->isSecureNetwork() )
//{
// /* create CONNACK message */
// MQTTSNPacket* connack = new MQTTSNPacket();
// connack->setCONNACK(MQTTSN_RC_REJECTED_CONGESTED);
// /* return to the client */
// Event* evt = new Event();
// evt->setClientSendEvent(client, connack);
// _gateway->getClientSendQue()->post(evt);
//}
return;
}
@@ -188,7 +183,10 @@ void MQTTSNConnectionHandler::handleWillmsg(Client* client, MQTTSNPacket* packet
if( client->isConnectSendable() )
{
/* save WillMsg in the client */
packet->getWILLMSG(&willmsg);
if ( packet->getWILLMSG(&willmsg) == 0 )
{
return;
}
client->setWillMsg(willmsg);
/* create CONNECT message */
@@ -216,7 +214,10 @@ void MQTTSNConnectionHandler::handleDisconnect(Client* client, MQTTSNPacket* pac
_gateway->getClientSendQue()->post(ev);
uint16_t duration = 0;
packet->getDISCONNECT(&duration);
if ( packet->getDISCONNECT(&duration) == 0 )
{
return;
}
if ( duration == 0 )
{
MQTTGWPacket* mqMsg = new MQTTGWPacket();