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-12 23:16:51 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix 0f #234

Browse Source 
Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
This commit is contained in:
tomoaki
2021-08-02 07:25:28 +09:00
parent 5fb4312aad
commit 4fc0e2f52b
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MQTTSNGateway/src/MQTTSNGWClientList.cpp
View File

@@ -404,38 +404,37 @@ Client* ClientList::createClient(SensorNetAddress* addr, MQTTSNString* clientId,
Client* ClientList::createPredefinedTopic(MQTTSNString* clientId, string topicName, uint16_t topicId, bool aggregate)
{
Client *client = nullptr;
if (topicId == 0)
{
WRITELOG("Invalid TopicId. Predefined Topic %s, TopicId is 0. \n", topicName.c_str());
goto exit;
return nullptr;
}
if (strcmp(clientId->cstring, common_topic) == 0)
{
_gateway->getTopics()->add((const char*) topicName.c_str(), topicId);
goto exit;
return nullptr;
}
else
{
Client* client = getClient(clientId);
Client *client = getClient(clientId);
if (_authorize && client == nullptr)
{
goto exit;
return nullptr;
}
client = createClient(NULL, clientId, aggregate);
if (client)
client = createClient(NULL, clientId, aggregate); // <=== BUGFIX
if (client == nullptr)
{
// create Topic & Add it
client->getTopics()->add((const char*) topicName.c_str(), topicId);
client->_hasPredefTopic = true;
return nullptr;
}
// create Topic & Add it
client->getTopics()->add((const char*) topicName.c_str(), topicId);
client->_hasPredefTopic = true;
return client;
}
exit:
return client;
}
uint16_t ClientList::getClientCount()