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

Subscribe to all topics with '#'

Browse Source 
Signed-off-by: Mariusz <mariusz.suchora@tieto.com>
This commit is contained in:
Mariusz
2018-03-06 10:55:40 +01:00
parent 9414410cce
commit e6a9fdca01
2 changed files with 153 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MQTTSNGateway/src/MQTTSNGWClient.cpp
View File

@@ -736,11 +736,6 @@ bool Topic::isMatch(string* topicName)
{
string::size_type tlen = _topicName->size();
if (topicName->size() < tlen - 2)
{
return false;
}
string::size_type tpos = 0;
string::size_type tloc = 0;
string::size_type pos = 0;
@@ -809,17 +804,22 @@ bool Topic::isMatch(string* topicName)
return false;
}
}
else if ( loc != string::npos && tloc == string::npos )
else if ( loc == string::npos && tloc != string::npos )
{
tloc = _topicName->find('#', --tpos);
if ( tloc == string::npos )
string subtopic = topicName->substr(pos);
string subtopict = _topicName->substr(tpos, tloc - tpos);
if ( subtopic != subtopict)
{
return false;
}
else
{
return true;
}
tpos = tloc + 1;
return _topicName->substr(tpos) == wildcard;
}
else if ( loc != string::npos && tloc == string::npos )
{
return _topicName->substr(tpos) == wildcard;
}
}
}
@@ -854,7 +854,8 @@ uint16_t Topics::getTopicId(const MQTTSN_topicid* topicid)
Topic* p = _first;
while (p)
{
if (strncmp(p->_topicName->c_str(), topicid->data.long_.name, topicid->data.long_.len) == 0)
if ( (int)strlen(p->_topicName->c_str()) == topicid->data.long_.len &&
strncmp(p->_topicName->c_str(), topicid->data.long_.name, topicid->data.long_.len) == 0)
{
return p->_topicId;
}
@@ -882,7 +883,8 @@ Topic* Topics::getTopic(const MQTTSN_topicid* topicid)
Topic* p = _first;
while (p)
{
if (strncmp(p->_topicName->c_str(), topicid->data.long_.name, topicid->data.long_.len) == 0 )
if ( (int)strlen(p->_topicName->c_str()) == topicid->data.long_.len &&
strncmp(p->_topicName->c_str(), topicid->data.long_.name, topicid->data.long_.len) == 0 )
{
return p;
}