From 9b7c25b28c2f65e38dbad0c03703f4df309c196d Mon Sep 17 00:00:00 2001 From: tomoaki Date: Mon, 17 Oct 2016 10:07:59 +0900 Subject: [PATCH] Update: Set WaitWillMsgFlg before posting Event. to protect repeated WILLMSG before seending CONNECT. Signed-off-by: tomoaki --- MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp | 1 - MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp | 1 + MQTTSNGateway/src/MQTTSNGateway.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp b/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp index 50bab94..df827d2 100644 --- a/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp +++ b/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp @@ -114,7 +114,6 @@ void BrokerSendTask::run() { if ( packet->getType() == CONNECT ) { - client->setWaitWillMsgFlg(false); client->connectSended(); } log(client, packet); diff --git a/MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp b/MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp index 5783646..946a98d 100644 --- a/MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp +++ b/MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp @@ -200,6 +200,7 @@ void MQTTSNConnectionHandler::handleWillmsg(Client* client, MQTTSNPacket* packet /* Send CONNECT to the broker */ Event* evt = new Event(); evt->setBrokerSendEvent(client, mqttPacket); + client->setWaitWillMsgFlg(false); _gateway->getBrokerSendQue()->post(evt); } } diff --git a/MQTTSNGateway/src/MQTTSNGateway.h b/MQTTSNGateway/src/MQTTSNGateway.h index 04b6dcf..210c11a 100644 --- a/MQTTSNGateway/src/MQTTSNGateway.h +++ b/MQTTSNGateway/src/MQTTSNGateway.h @@ -25,7 +25,7 @@ namespace MQTTSNGW /*================================= * Starting prompt ==================================*/ -#define GATEWAY_VERSION " * Version: 0.9.1" +#define GATEWAY_VERSION " * Version: 0.9.2" #define PAHO_COPYRIGHT0 " * MQTT-SN Transparent Gateway" #define PAHO_COPYRIGHT1 " * Part of Project Paho in Eclipse"