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

Merge pull request #46 from ty4tw/gateway

Browse Source 
BugFix of #45
This commit is contained in:
Ian Craggs
2017-02-24 15:38:45 +00:00
committed by GitHub
parent 1af3e8695a 8d93f0a96e
commit 5e08fb5e78
6 changed files with 87 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MQTTSNGateway/src/MQTTGWPublishHandler.cpp
View File

@@ -49,6 +49,7 @@ void MQTTGWPublishHandler::handlePublish(Client* client, MQTTGWPacket* packet)
/* create MQTTSN_topicid */ /* create MQTTSN_topicid */
MQTTSN_topicid topicId; MQTTSN_topicid topicId;
uint16_t id = 0;
if (pub.topiclen == 2) if (pub.topiclen == 2)
{ {
@@ -61,11 +62,13 @@ void MQTTGWPublishHandler::handlePublish(Client* client, MQTTGWPacket* packet)
topicId.type = MQTTSN_TOPIC_TYPE_NORMAL; topicId.type = MQTTSN_TOPIC_TYPE_NORMAL;
topicId.data.long_.len = pub.topiclen; topicId.data.long_.len = pub.topiclen;
topicId.data.long_.name = pub.topic; topicId.data.long_.name = pub.topic;
unsigned short id = client->getTopics()->getTopicId(&topicId); id = client->getTopics()->getTopicId(&topicId);
if ( id > 0 )
{
topicId.data.id = id; topicId.data.id = id;
} }
else
if (topicId.data.id == 0)
{ {
/* This message might be subscribed with wild card. */ /* This message might be subscribed with wild card. */
Topic* topic = client->getTopics()->match(&topicId); Topic* topic = client->getTopics()->match(&topicId);
@@ -85,7 +88,7 @@ void MQTTGWPublishHandler::handlePublish(Client* client, MQTTGWPacket* packet)
/* add the Topic and get a TopicId */ /* add the Topic and get a TopicId */
topic = client->getTopics()->add(&topicId); topic = client->getTopics()->add(&topicId);
uint16_t id = topic->getTopicId(); id = topic->getTopicId();
if (id > 0) if (id > 0)
{ {
@@ -123,11 +126,13 @@ void MQTTGWPublishHandler::handlePublish(Client* client, MQTTGWPacket* packet)
else else
{ {
WRITELOG("\x1b[0m\x1b[31mMQTTGWPublishHandler Can't create a Topic.\n"); WRITELOG("\x1b[0m\x1b[31mMQTTGWPublishHandler Can't create a Topic.\n");
delete snPacket;
return; return;
} }
} }
}
/* TopicId was aquired. */ /* TopicId was acquired. */
if (client->isSleep()) if (client->isSleep())
{ {
/* client is sleeping. save PUBLISH */ /* client is sleeping. save PUBLISH */

2
MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
View File

@@ -136,7 +136,7 @@ void BrokerRecvTask::run(void)
client->getNetwork()->close(); client->getNetwork()->close();
delete packet; delete packet;
/* delete client when the client is not authorized on & session is clean */ /* delete client when the client is not authorized & session is clean */
_gateway->getClientList()->erase(client); _gateway->getClientList()->erase(client);
if ( client ) if ( client )

10
MQTTSNGateway/src/MQTTSNGWClient.cpp
View File

@@ -830,7 +830,7 @@ Topics::~Topics()
} }
} }
uint16_t Topics::getTopicId(MQTTSN_topicid* topicid) uint16_t Topics::getTopicId(const MQTTSN_topicid* topicid)
{ {
if (topicid->type != MQTTSN_TOPIC_TYPE_NORMAL) if (topicid->type != MQTTSN_TOPIC_TYPE_NORMAL)
{ {
@@ -863,7 +863,7 @@ Topic* Topics::getTopic(uint16_t id)
return 0; return 0;
} }
Topic* Topics::getTopic(MQTTSN_topicid* topicid) Topic* Topics::getTopic(const MQTTSN_topicid* topicid)
{ {
Topic* p = _first; Topic* p = _first;
while (p) while (p)
@@ -877,7 +877,7 @@ Topic* Topics::getTopic(MQTTSN_topicid* topicid)
return 0; return 0;
} }
Topic* Topics::add(MQTTSN_topicid* topicid) Topic* Topics::add(const MQTTSN_topicid* topicid)
{ {
Topic* topic; Topic* topic;
uint16_t id = 0; uint16_t id = 0;
@@ -901,7 +901,7 @@ Topic* Topics::add(MQTTSN_topicid* topicid)
} }
Topic* Topics::add(string* topicName) Topic* Topics::add(const string* topicName)
{ {
Topic* topic = 0; Topic* topic = 0;
@@ -942,7 +942,7 @@ uint16_t Topics::getNextTopicId()
return ++_nextTopicId == 0xffff ? _nextTopicId += 2 : _nextTopicId; return ++_nextTopicId == 0xffff ? _nextTopicId += 2 : _nextTopicId;
} }
Topic* Topics::match(MQTTSN_topicid* topicid) Topic* Topics::match(const MQTTSN_topicid* topicid)
{ {
if (topicid->type != MQTTSN_TOPIC_TYPE_NORMAL) if (topicid->type != MQTTSN_TOPIC_TYPE_NORMAL)
{ {

10
MQTTSNGateway/src/MQTTSNGWClient.h
View File

@@ -127,13 +127,13 @@ class Topics
public: public:
Topics(); Topics();
~Topics(); ~Topics();
Topic* add(MQTTSN_topicid* topicid); Topic* add(const MQTTSN_topicid* topicid);
Topic* add(string* topic); Topic* add(const string* topic);
uint16_t getTopicId(MQTTSN_topicid* topic); uint16_t getTopicId(const MQTTSN_topicid* topic);
uint16_t getNextTopicId(); uint16_t getNextTopicId();
Topic* getTopic(uint16_t topicId); Topic* getTopic(uint16_t topicId);
Topic* getTopic(MQTTSN_topicid* topicid); Topic* getTopic(const MQTTSN_topicid* topicid);
Topic* match(MQTTSN_topicid* topicid); Topic* match(const MQTTSN_topicid* topicid);
private: private:
uint16_t _nextTopicId; uint16_t _nextTopicId;

3
MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp
View File

@@ -55,14 +55,11 @@ void MQTTSNConnectionHandler::handleSearchgw(MQTTSNPacket* packet)
{ {
if (packet->getType() == MQTTSN_SEARCHGW) if (packet->getType() == MQTTSN_SEARCHGW)
{ {
//if (_gateway->getClientList()->getClientCount() < MAX_CLIENTS)
//{
MQTTSNPacket* gwinfo = new MQTTSNPacket(); MQTTSNPacket* gwinfo = new MQTTSNPacket();
gwinfo->setGWINFO(_gateway->getGWParams()->gatewayId); gwinfo->setGWINFO(_gateway->getGWParams()->gatewayId);
Event* ev1 = new Event(); Event* ev1 = new Event();
ev1->setBrodcastEvent(gwinfo); ev1->setBrodcastEvent(gwinfo);
_gateway->getClientSendQue()->post(ev1); _gateway->getClientSendQue()->post(ev1);
//}
} }
} }

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

@@ -290,7 +290,15 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
{ {
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();
#if ( OPENSSL_VERSION_NUMBER >= 0x10100000L )
_ctx = SSL_CTX_new(TLS_client_method()); _ctx = SSL_CTX_new(TLS_client_method());
#elif ( OPENSSL_VERSION_NUMBER >= 0x10001000L )
_ctx = SSL_CTX_new(TLSv1_client_method());
#else
_ctx = SSL_CTX_new(SSLv23_client_method());
#endif
if (_ctx == 0) if (_ctx == 0)
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));