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

Merge pull request #252 from fgrandel/bugfix/secure-flag

Browse Source 
fix: secure client networks no longer work with pre-allocated client list
This commit is contained in:
Tomoaki Yamaguchi
2021-12-26 16:20:21 +09:00
committed by GitHub
parent 4508461fc1 135e79e4da
commit 27b5c7623e
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MQTTSNGateway/src/MQTTSNGWClient.cpp
View File

@@ -34,7 +34,7 @@ char* currentDateTime(void);
static const char* theClientStatus[] = { "InPool", "Disconnected", "TryConnecting", "Connecting", "Active", "Asleep", "Awake", static const char* theClientStatus[] = { "InPool", "Disconnected", "TryConnecting", "Connecting", "Active", "Asleep", "Awake",
"Lost" }; "Lost" };
Client::Client(bool secure) Client::Client()
{ {
_packetId = 0; _packetId = 0;
_snMsgId = 0; _snMsgId = 0;
@@ -45,8 +45,7 @@ Client::Client(bool secure)
_willTopic = nullptr; _willTopic = nullptr;
_willMsg = nullptr; _willMsg = nullptr;
_connectData = MQTTPacket_Connect_Initializer; _connectData = MQTTPacket_Connect_Initializer;
_network = new Network(secure); _network = new Network();
_secureNetwork = secure;
_sensorNetype = true; _sensorNetype = true;
_connAck = nullptr; _connAck = nullptr;
_waitWillMsgFlg = false; _waitWillMsgFlg = false;
@@ -426,7 +425,7 @@ bool Client::isConnecting(void)
bool Client::isSecureNetwork(void) bool Client::isSecureNetwork(void)
{ {
return _secureNetwork; return _network->isSecure();
} }
bool Client::isSensorNetStable(void) bool Client::isSensorNetStable(void)

3
MQTTSNGateway/src/MQTTSNGWClient.h
View File

@@ -179,8 +179,7 @@ class Client
friend class ClientList; friend class ClientList;
friend class ClientsPool; friend class ClientsPool;
public: public:
Client(bool secure = false); Client();
Client(uint8_t maxInflightMessages, bool secure);
~Client(); ~Client();
Connect* getConnectData(void); Connect* getConnectData(void);

4
MQTTSNGateway/src/linux/Network.cpp
View File

@@ -238,11 +238,11 @@ int Network::_numOfInstance = 0;
SSL_CTX* Network::_ctx = 0; SSL_CTX* Network::_ctx = 0;
SSL_SESSION* Network::_session = 0; SSL_SESSION* Network::_session = 0;
Network::Network(bool secure) : Network::Network() :
TCPStack() TCPStack()
{ {
_ssl = 0; _ssl = 0;
_secureFlg = secure; _secureFlg = false;
_busy = false; _busy = false;
_sslValid = false; _sslValid = false;
} }

2
MQTTSNGateway/src/linux/Network.h
View File

@@ -68,7 +68,7 @@ private:
class Network: public TCPStack class Network: public TCPStack
{ {
public: public:
Network(bool secure); Network();
virtual ~Network(); virtual ~Network();
bool connect(const char* host, const char* port, const char* caPath, const char* caFile, const char* cert, const char* prvkey); bool connect(const char* host, const char* port, const char* caPath, const char* caFile, const char* cert, const char* prvkey);