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-15 08:26:51 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix of #196, #214, #222

Browse Source 
Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
This commit is contained in:
tomoaki
2021-05-15 18:32:43 +09:00
parent f079211ea7
commit dc3142f2f0
2 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
View File

@@ -142,19 +142,6 @@ void BrokerRecvTask::run(void)
ERRMSG_FOOTER); ERRMSG_FOOTER);
client->getNetwork()->close(); client->getNetwork()->close();
client->disconnected(); client->disconnected();
/*
client->getNetwork()->close();
delete packet;
if (client)
{
client = client->getNextClient();
}
continue;
*/
} }
else if (rc == -1) else if (rc == -1)
{ {
@@ -188,14 +175,6 @@ void BrokerRecvTask::run(void)
|| client->isSleep() || client->isSleep()
|| client->isAwake())) || client->isAwake()))
{ {
/* disconnect the client */
/*
packet = new MQTTGWPacket();
packet->setHeader(DISCONNECT);
ev = new Event();
ev->setBrokerRecvEvent(client, packet);
_gateway->getPacketEventQue()->post(ev);
*/
client->getNetwork()->close(); client->getNetwork()->close();
client->disconnected(); client->disconnected();
} }

10
MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
View File

@@ -166,10 +166,8 @@ void ClientRecvTask::run()
if (client->isDisconnect() && packet->getType() != MQTTSN_CONNECT) if (client->isDisconnect() && packet->getType() != MQTTSN_CONNECT)
{ {
WRITELOG( WRITELOG("%s MQTTSNGWClientRecvTask %s is not connecting.%s\n",
"%s MQTTSNGWClientRecvTask %s is not connecting.%s\n", ERRMSG_HEADER, client->getClientId(), ERRMSG_FOOTER);
ERRMSG_HEADER,
client->getClientId(), ERRMSG_FOOTER);
/* send DISCONNECT to the client, if it is not connected */ /* send DISCONNECT to the client, if it is not connected */
MQTTSNPacket* snPacket = new MQTTSNPacket(); MQTTSNPacket* snPacket = new MQTTSNPacket();
@@ -268,8 +266,8 @@ void ClientRecvTask::run()
{ {
WRITELOG( WRITELOG(
"%s MQTTSNGWClientRecvTask Client(%s) is not connecting. message has been discarded.%s\n", "%s MQTTSNGWClientRecvTask Client(%s) is not connecting. message has been discarded.%s\n",
ERRMSG_HEADER, ERRMSG_HEADER, senderAddr->sprint(buf),
senderAddr->sprint(buf), ERRMSG_FOOTER); ERRMSG_FOOTER);
} }
delete packet; delete packet;
} }