From 776099ebb30f0773ae3fc107335534d0b39129f2 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Fri, 11 Jun 2021 10:54:20 +0900 Subject: [PATCH] Bugfix Set a secure flag to a Client instance. Signed-off-by: tomoaki --- .cproject | 527 ++++++++--------------- .settings/language.settings.xml | 69 +-- MQTTSNGateway/src/MQTTSNGWClientList.cpp | 1 + MQTTSNGateway/src/linux/Network.cpp | 4 + MQTTSNGateway/src/linux/Network.h | 1 + 5 files changed, 204 insertions(+), 398 deletions(-) diff --git a/.cproject b/.cproject index fcd0270..6a07b71 100644 --- a/.cproject +++ b/.cproject @@ -1,354 +1,177 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 659286b..6ac55d6 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -1,48 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MQTTSNGateway/src/MQTTSNGWClientList.cpp b/MQTTSNGateway/src/MQTTSNGWClientList.cpp index 9f6b0ea..2a4dfe6 100644 --- a/MQTTSNGateway/src/MQTTSNGWClientList.cpp +++ b/MQTTSNGateway/src/MQTTSNGWClientList.cpp @@ -380,6 +380,7 @@ Client* ClientList::createClient(SensorNetAddress* addr, MQTTSNString* clientId, { client->setQoSm1(); } + client->getNetwork()->setSecure(secure); _mutex.lock(); diff --git a/MQTTSNGateway/src/linux/Network.cpp b/MQTTSNGateway/src/linux/Network.cpp index 4951f8d..bd5039a 100644 --- a/MQTTSNGateway/src/linux/Network.cpp +++ b/MQTTSNGateway/src/linux/Network.cpp @@ -656,3 +656,7 @@ bool Network::isSecure() return _secureFlg; } +void Network::setSecure(bool secureFlg) +{ + _secureFlg = secureFlg; +} diff --git a/MQTTSNGateway/src/linux/Network.h b/MQTTSNGateway/src/linux/Network.h index f5e15bd..57ed2ce 100644 --- a/MQTTSNGateway/src/linux/Network.h +++ b/MQTTSNGateway/src/linux/Network.h @@ -80,6 +80,7 @@ public: bool isValid(void); bool isSecure(void); int getSock(void); + void setSecure(bool secureFlg); private: static SSL_CTX* _ctx;