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-13 07:26:52 +01:00
Code Issues Projects Releases Wiki Activity

BugFix: stop Process mechanism of ProcessFramework.

Browse Source 
Update: DISCONNECT procedure for NonActive clients.

Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
This commit is contained in:
tomoaki
2016-10-04 11:17:46 +09:00
parent 93df7db12e
commit 63d2824444
21 changed files with 338 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MQTTSNGateway/src/MQTTGWConnectionHandler.cpp
View File

@@ -95,4 +95,12 @@ void MQTTGWConnectionHandler::handlePingresp(Client* client, MQTTGWPacket* packe
_gateway->getClientSendQue()->post(ev1); _gateway->getClientSendQue()->post(ev1);
} }
void MQTTGWConnectionHandler::handleDisconnect(Client* client, MQTTGWPacket* packet)
{
MQTTSNPacket* snPacket = new MQTTSNPacket();
snPacket->setDISCONNECT(0);
client->disconnected();
client->getNetwork()->close();
Event* ev1 = new Event();
ev1->setClientSendEvent(client, snPacket);
}

1
MQTTSNGateway/src/MQTTGWConnectionHandler.h
View File

@@ -30,6 +30,7 @@ public:
~MQTTGWConnectionHandler(); ~MQTTGWConnectionHandler();
void handleConnack(Client* client, MQTTGWPacket* packet); void handleConnack(Client* client, MQTTGWPacket* packet);
void handlePingresp(Client* client, MQTTGWPacket* packet); void handlePingresp(Client* client, MQTTGWPacket* packet);
void handleDisconnect(Client* client, MQTTGWPacket* packet);
private: private:
Gateway* _gateway; Gateway* _gateway;
}; };

23
MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
View File

@@ -59,6 +59,10 @@ void BrokerRecvTask::run(void)
while (true) while (true)
{ {
if (CHK_SIGINT)
{
return;
}
timeout.tv_sec = 0; timeout.tv_sec = 0;
timeout.tv_usec = 500000; // 500 msec timeout.tv_usec = 500000; // 500 msec
FD_ZERO(&rset); FD_ZERO(&rset);
@@ -117,10 +121,7 @@ void BrokerRecvTask::run(void)
/* post a BrokerRecvEvent */ /* post a BrokerRecvEvent */
ev = new Event(); ev = new Event();
ev->setBrokerRecvEvent(client, packet); ev->setBrokerRecvEvent(client, packet);
if ( _gateway->getPacketEventQue()->post(ev) == 0 ) _gateway->getPacketEventQue()->post(ev);
{
delete ev;
}
} }
else else
{ {
@@ -143,11 +144,17 @@ void BrokerRecvTask::run(void)
WRITELOG("%s BrokerRecvTask can't create the packet %s%s\n", ERRMSG_HEADER, client->getClientId(), ERRMSG_FOOTER); WRITELOG("%s BrokerRecvTask can't create the packet %s%s\n", ERRMSG_HEADER, client->getClientId(), ERRMSG_FOOTER);
} }
/* disconnect the client */
client->disconnected();
client->getNetwork()->disconnect();
rc = 0;
delete packet; delete packet;
/* disconnect the client */
if ( rc == -1 || rc == -2 )
{
packet = new MQTTGWPacket();
packet->setHeader(DISCONNECT);
ev = new Event();
ev->setBrokerRecvEvent(client, packet);
_gateway->getPacketEventQue()->post(ev);
}
} }
} }
} }

142
MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp
View File

@@ -60,83 +60,90 @@ void BrokerSendTask::run()
Event* ev = 0; Event* ev = 0;
MQTTGWPacket* packet = 0; MQTTGWPacket* packet = 0;
Client* client = 0; Client* client = 0;
int rc = 0;
while (true) while (true)
{ {
int rc = 0;
ev = _gateway->getBrokerSendQue()->wait(); ev = _gateway->getBrokerSendQue()->wait();
client = ev->getClient();
packet = ev->getMQTTGWPacket();
/*
if ( client->getNetwork()->isValid() && !client->getNetwork()->isSecure() && packet->getType() == CONNECT )
{
client->getNetwork()->close();
}
*/
if ( !client->getNetwork()->isValid() )
{
/* connect to the broker and send a packet */
char* portNo = _gwparams->port;
const char* cert = 0;
const char* keyFile = 0;
string certFile;
string privateKeyFile;
if (client->isSecureNetwork()) if ( ev->getEventType() == EtStop )
{
delete ev;
return;
}
if ( ev->getEventType() == EtBrokerSend)
{
client = ev->getClient();
packet = ev->getMQTTGWPacket();
if ( !client->getNetwork()->isValid() )
{ {
portNo = _gwparams->portSecure; /* connect to the broker and send a packet */
if ( _gwparams->certDirectory ) char* portNo = _gwparams->port;
const char* cert = 0;
const char* keyFile = 0;
string certFile;
string privateKeyFile;
if (client->isSecureNetwork())
{ {
certFile = _gwparams->certDirectory; portNo = _gwparams->portSecure;
certFile += client->getClientId(); if ( _gwparams->certDirectory )
certFile += ".crt"; {
cert = certFile.c_str(); certFile = _gwparams->certDirectory;
privateKeyFile = _gwparams->certDirectory; certFile += client->getClientId();
privateKeyFile += client->getClientId(); certFile += ".crt";
privateKeyFile += ".key"; cert = certFile.c_str();
keyFile = privateKeyFile.c_str(); privateKeyFile = _gwparams->certDirectory;
privateKeyFile += client->getClientId();
privateKeyFile += ".key";
keyFile = privateKeyFile.c_str();
}
rc = client->getNetwork()->connect(_gwparams->brokerName, _gwparams->portSecure, _gwparams->rootCApath, _gwparams->rootCAfile, cert, keyFile);
} }
rc = client->getNetwork()->connect(_gwparams->brokerName, _gwparams->portSecure, _gwparams->rootCApath, _gwparams->rootCAfile, cert, keyFile); else
{
rc = client->getNetwork()->connect(_gwparams->brokerName, portNo);
}
if ( !rc )
{
/* disconnect the broker and the client */
WRITELOG("%s BrokerSendTask can't connect to the broker. %s%s\n",
ERRMSG_HEADER, client->getClientId(), ERRMSG_FOOTER);
delete ev;
client->getNetwork()->close();
continue;
}
}
/* send a packet */
_light->blueLight(true);
if ( (rc = packet->send(client->getNetwork())) > 0 )
{
if ( packet->getType() == CONNECT )
{
client->setWaitWillMsgFlg(false);
client->connectSended();
}
log(client, packet);
} }
else else
{ {
rc = client->getNetwork()->connect(_gwparams->brokerName, portNo);
}
if ( !rc )
{
/* disconnect the broker and the client */
WRITELOG("%s BrokerSendTask can't connect to the broker. errno=%d %s%s\n",
ERRMSG_HEADER, rc == -1 ? errno : 0, client->getClientId(), ERRMSG_FOOTER);
delete ev;
disconnect(client);
client->getNetwork()->disconnect();
continue;
}
}
/* send a packet */
_light->blueLight(true);
if ( (rc = packet->send(client->getNetwork())) > 0 )
{
if ( packet->getType() == CONNECT )
{
client->setWaitWillMsgFlg(false);
client->connectSended();
}
log(client, packet);
}
else
{
WRITELOG("%s BrokerSendTask can't send a packet. errno=%d %s%s\n",
ERRMSG_HEADER, rc == -1 ? errno : 0, client->getClientId(), ERRMSG_FOOTER);
WRITELOG("%s BrokerSendTask can't send a packet to the broker errno=%d %s%s\n", WRITELOG("%s BrokerSendTask can't send a packet to the broker errno=%d %s%s\n",
ERRMSG_HEADER, rc == -1 ? errno : 0, client->getClientId(), ERRMSG_FOOTER); ERRMSG_HEADER, rc == -1 ? errno : 0, client->getClientId(), ERRMSG_FOOTER);
client->disconnected();
client->getNetwork()->disconnect();
}
_light->blueLight(false); /* Disconnect the client */
packet = new MQTTGWPacket();
packet->setHeader(DISCONNECT);
ev = new Event();
ev->setBrokerRecvEvent(client, packet);
_gateway->getPacketEventQue()->post(ev);
}
_light->blueLight(false);
}
delete ev; delete ev;
} }
} }
@@ -177,12 +184,3 @@ void BrokerSendTask::log(Client* client, MQTTGWPacket* packet)
} }
} }
void BrokerSendTask::disconnect(Client* client)
{
MQTTSNPacket* snMsg = new MQTTSNPacket();
snMsg->setDISCONNECT(0);
Event* ev1 = new Event();
ev1->setClientSendEvent(client, snMsg);
_gateway->getClientSendQue()->post(ev1);
client->disconnected();
}

1
MQTTSNGateway/src/MQTTSNGWBrokerSendTask.h
View File

@@ -35,7 +35,6 @@ public:
void run(); void run();
private: private:
void log(Client*, MQTTGWPacket*); void log(Client*, MQTTGWPacket*);
void disconnect(Client*);
Gateway* _gateway; Gateway* _gateway;
GatewayParams* _gwparams; GatewayParams* _gwparams;
LightIndicator* _light; LightIndicator* _light;

3
MQTTSNGateway/src/MQTTSNGWClient.cpp
View File

@@ -102,9 +102,7 @@ bool ClientList::authorize(const char* fileName)
} }
pos = data.find_first_of(","); pos = data.find_first_of(",");
string id = data.substr(0, pos); string id = data.substr(0, pos);
clientId.cstring = strdup(id.c_str()); clientId.cstring = strdup(id.c_str());
string addr = data.substr(pos + 1); string addr = data.substr(pos + 1);
if (netAddr.setAddress(&addr) == 0) if (netAddr.setAddress(&addr) == 0)
@@ -117,6 +115,7 @@ bool ClientList::authorize(const char* fileName)
{ {
WRITELOG("Invalid address %s\n", data.c_str()); WRITELOG("Invalid address %s\n", data.c_str());
} }
free(clientId.cstring);
} }
fclose(fp); fclose(fp);
_authorize = true; _authorize = true;

33
MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
View File

@@ -59,6 +59,12 @@ void ClientRecvTask::run()
MQTTSNPacket* packet = new MQTTSNPacket(); MQTTSNPacket* packet = new MQTTSNPacket();
int packetLen = packet->recv(_sensorNetwork); int packetLen = packet->recv(_sensorNetwork);
if (CHK_SIGINT)
{
delete packet;
return;
}
if (packetLen < 2 ) if (packetLen < 2 )
{ {
delete packet; delete packet;
@@ -77,10 +83,7 @@ void ClientRecvTask::run()
log(0, packet); log(0, packet);
ev = new Event(); ev = new Event();
ev->setBrodcastEvent(packet); ev->setBrodcastEvent(packet);
if ( _gateway->getPacketEventQue()->post(ev) == 0 ) _gateway->getPacketEventQue()->post(ev);
{
delete ev;
}
continue; continue;
} }
@@ -93,10 +96,7 @@ void ClientRecvTask::run()
log(client, packet); log(client, packet);
ev = new Event(); ev = new Event();
ev->setClientRecvEvent(client,packet); ev->setClientRecvEvent(client,packet);
if ( _gateway->getPacketEventQue()->post(ev) == 0 ) _gateway->getPacketEventQue()->post(ev);
{
delete ev;
}
} }
else else
{ {
@@ -112,7 +112,7 @@ void ClientRecvTask::run()
if (!client) if (!client)
{ {
WRITELOG("%s Can't create a Client. CONNECT message has been discarded.%s\n", ERRMSG_HEADER, ERRMSG_FOOTER); WRITELOG("%s Client was rejected. CONNECT message has been discarded.%s\n", ERRMSG_HEADER, ERRMSG_FOOTER);
delete packet; delete packet;
continue; continue;
} }
@@ -123,15 +123,20 @@ void ClientRecvTask::run()
client->setClientAddress(_sensorNetwork->getSenderAddress()); client->setClientAddress(_sensorNetwork->getSenderAddress());
ev = new Event(); ev = new Event();
ev->setClientRecvEvent(client, packet); ev->setClientRecvEvent(client, packet);
if ( _gateway->getPacketEventQue()->post(ev) == 0 ) _gateway->getPacketEventQue()->post(ev);
{
delete ev;
}
} }
else else
{ {
log(client, packet); log(client, packet);
delete packet; delete packet;
/* Send DISCONNECT */
SensorNetAddress* addr = new SensorNetAddress();
addr = _sensorNetwork->getSenderAddress();
packet = new MQTTSNPacket();
packet->setDISCONNECT(0);
ev = new Event();
ev->setClientSendEvent(addr, packet);
_gateway->getClientSendQue()->post(ev);
continue; continue;
} }
} }
@@ -142,7 +147,7 @@ void ClientRecvTask::log(Client* client, MQTTSNPacket* packet)
{ {
char pbuf[SIZE_OF_LOG_PACKET * 3]; char pbuf[SIZE_OF_LOG_PACKET * 3];
char msgId[6]; char msgId[6];
const char* clientId = client ? (const char*)client->getClientId() :"Non Active Client !" ; const char* clientId = client ? (const char*)client->getClientId() : NONACTCLT ;
switch (packet->getType()) switch (packet->getType())
{ {

19
MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp
View File

@@ -45,6 +45,11 @@ void ClientSendTask::run()
{ {
Event* ev = _gateway->getClientSendQue()->wait(); Event* ev = _gateway->getClientSendQue()->wait();
if (ev->getEventType() == EtStop)
{
delete ev;
break;
}
if (ev->getEventType() == EtClientSend) if (ev->getEventType() == EtClientSend)
{ {
client = ev->getClient(); client = ev->getClient();
@@ -56,6 +61,11 @@ void ClientSendTask::run()
packet = ev->getMQTTSNPacket(); packet = ev->getMQTTSNPacket();
packet->broadcast(_sensorNetwork); packet->broadcast(_sensorNetwork);
} }
else if (ev->getEventType() == EtSensornetSend)
{
packet = ev->getMQTTSNPacket();
packet->unicast(_sensorNetwork, ev->getSensorNetAddress());
}
log(client, packet); log(client, packet);
delete ev; delete ev;
@@ -66,6 +76,7 @@ void ClientSendTask::log(Client* client, MQTTSNPacket* packet)
{ {
char pbuf[SIZE_OF_LOG_PACKET * 3]; char pbuf[SIZE_OF_LOG_PACKET * 3];
char msgId[6]; char msgId[6];
const char* clientId = client ? (const char*)client->getClientId() : NONACTCLT ;
switch (packet->getType()) switch (packet->getType())
{ {
@@ -78,15 +89,13 @@ void ClientSendTask::log(Client* client, MQTTSNPacket* packet)
case MQTTSN_DISCONNECT: case MQTTSN_DISCONNECT:
case MQTTSN_WILLTOPICREQ: case MQTTSN_WILLTOPICREQ:
case MQTTSN_WILLMSGREQ: case MQTTSN_WILLMSGREQ:
WRITELOG(FORMAT_Y_W_G, currentDateTime(), packet->getName(), RIGHTARROW, client->getClientId(), packet->print(pbuf));
break;
case MQTTSN_WILLTOPICRESP: case MQTTSN_WILLTOPICRESP:
case MQTTSN_WILLMSGRESP: case MQTTSN_WILLMSGRESP:
WRITELOG(FORMAT_Y_W_G, currentDateTime(), packet->getName(), RIGHTARROW, client->getClientId(), packet->print(pbuf)); WRITELOG(FORMAT_Y_W_G, currentDateTime(), packet->getName(), RIGHTARROW, clientId, packet->print(pbuf));
break; break;
case MQTTSN_REGISTER: case MQTTSN_REGISTER:
case MQTTSN_PUBLISH: case MQTTSN_PUBLISH:
WRITELOG(FORMAT_W_MSGID_W_G, currentDateTime(), packet->getName(), packet->getMsgId(msgId), RIGHTARROW, client->getClientId(), packet->print(pbuf)); WRITELOG(FORMAT_W_MSGID_W_G, currentDateTime(), packet->getName(), packet->getMsgId(msgId), RIGHTARROW, clientId, packet->print(pbuf));
break; break;
case MQTTSN_REGACK: case MQTTSN_REGACK:
case MQTTSN_PUBACK: case MQTTSN_PUBACK:
@@ -95,7 +104,7 @@ void ClientSendTask::log(Client* client, MQTTSNPacket* packet)
case MQTTSN_PUBCOMP: case MQTTSN_PUBCOMP:
case MQTTSN_SUBACK: case MQTTSN_SUBACK:
case MQTTSN_UNSUBACK: case MQTTSN_UNSUBACK:
WRITELOG(FORMAT_W_MSGID_W_G, currentDateTime(), packet->getName(), packet->getMsgId(msgId), RIGHTARROW, client->getClientId(), packet->print(pbuf)); WRITELOG(FORMAT_W_MSGID_W_G, currentDateTime(), packet->getName(), packet->getMsgId(msgId), RIGHTARROW, clientId, packet->print(pbuf));
break; break;
default: default:
break; break;

23
MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp
View File

@@ -209,19 +209,22 @@ void MQTTSNConnectionHandler::handleWillmsg(Client* client, MQTTSNPacket* packet
*/ */
void MQTTSNConnectionHandler::handleDisconnect(Client* client, MQTTSNPacket* packet) void MQTTSNConnectionHandler::handleDisconnect(Client* client, MQTTSNPacket* packet)
{ {
MQTTGWPacket* mqMsg = new MQTTGWPacket(); Event* ev = new Event();
MQTTSNPacket* snMsg = new MQTTSNPacket(); MQTTSNPacket* snMsg = new MQTTSNPacket();
mqMsg->setHeader(DISCONNECT);
snMsg->setDISCONNECT(0); snMsg->setDISCONNECT(0);
ev->setClientSendEvent(client, snMsg);
_gateway->getClientSendQue()->post(ev);
Event* ev1 = new Event(); uint16_t duration = 0;
ev1->setClientSendEvent(client, snMsg); packet->getDISCONNECT(&duration);
_gateway->getClientSendQue()->post(ev1); if ( duration == 0 )
{
ev1 = new Event(); MQTTGWPacket* mqMsg = new MQTTGWPacket();
ev1->setBrokerSendEvent(client, mqMsg); mqMsg->setHeader(DISCONNECT);
_gateway->getBrokerSendQue()->post(ev1); ev = new Event();
ev->setBrokerSendEvent(client, mqMsg);
_gateway->getBrokerSendQue()->post(ev);
}
} }
/* /*

17
MQTTSNGateway/src/MQTTSNGWPacketHandleTask.cpp
View File

@@ -84,7 +84,6 @@ void PacketHandleTask::run()
{ {
Event* ev = 0; Event* ev = 0;
EventQue* eventQue = _gateway->getPacketEventQue(); EventQue* eventQue = _gateway->getPacketEventQue();
ClientList* clist = _gateway->getClientList();
Client* client = 0; Client* client = 0;
MQTTSNPacket* snPacket = 0; MQTTSNPacket* snPacket = 0;
MQTTGWPacket* brPacket = 0; MQTTGWPacket* brPacket = 0;
@@ -95,27 +94,29 @@ void PacketHandleTask::run()
while (true) while (true)
{ {
if (theProcess->checkSignal() == SIGINT)
{
throw Exception("Terminated by CTL-C");
}
/* wait Event */ /* wait Event */
ev = eventQue->timedwait(EVENT_QUE_TIME_OUT); ev = eventQue->timedwait(EVENT_QUE_TIME_OUT);
if (ev->getEventType() == EtStop)
{
delete ev;
return;
}
if (ev->getEventType() == EtTimeout) if (ev->getEventType() == EtTimeout)
{ {
/*------ Is Client Lost ? ---------*/ /*------ Is Client Lost ? ---------*/
client = clist->getClient(); /*
client = _gateway->getClientList()->getClient();
while (client > 0) while (client > 0)
{ {
if ( client->checkTimeover() ) if ( client->checkTimeover() )
{ {
_mqttsnConnection->handleDisconnect(client, 0);
client->disconnected(); client->disconnected();
} }
client = client->getNextClient(); client = client->getNextClient();
} }
*/
/*------ Check Keep Alive Timer & send Advertise ------*/ /*------ Check Keep Alive Timer & send Advertise ------*/
if (_advertiseTimer.isTimeup()) if (_advertiseTimer.isTimeup())
{ {

81
MQTTSNGateway/src/MQTTSNGWProcess.cpp
View File

@@ -22,6 +22,7 @@
#include <Timer.h> #include <Timer.h>
#include <exception> #include <exception>
#include <getopt.h> #include <getopt.h>
#include <unistd.h>
#include "MQTTSNGWProcess.h" #include "MQTTSNGWProcess.h"
#include "Threading.h" #include "Threading.h"
@@ -118,6 +119,28 @@ void Process::initialize(int argc, char** argv)
} }
} }
void Process::putLog(const char* format, ...)
{
_mt.lock();
va_list arg;
va_start(arg, format);
vsprintf(_rbdata, format, arg);
va_end(arg);
if (strlen(_rbdata))
{
if ( _log > 0 )
{
_rb->put(_rbdata);
_rbsem->post();
}
else
{
printf("%s", _rbdata);
}
}
_mt.unlock();
}
int Process::getArgc() int Process::getArgc()
{ {
return _argc; return _argc;
@@ -183,28 +206,6 @@ int Process::getParam(const char* parameter, char* value)
return -2; return -2;
} }
void Process::putLog(const char* format, ...)
{
_mt.lock();
va_list arg;
va_start(arg, format);
vsprintf(_rbdata, format, arg);
va_end(arg);
if (strlen(_rbdata))
{
if ( _log > 0 )
{
_rb->put(_rbdata);
_rbsem->post();
}
else
{
printf("%s", _rbdata);
}
}
_mt.unlock();
}
const char* Process::getLog() const char* Process::getLog()
{ {
int len = 0; int len = 0;
@@ -249,6 +250,7 @@ MultiTaskProcess::MultiTaskProcess()
{ {
theMultiTaskProcess = this; theMultiTaskProcess = this;
_threadCount = 0; _threadCount = 0;
_stopCount = 0;
} }
MultiTaskProcess::~MultiTaskProcess() MultiTaskProcess::~MultiTaskProcess()
@@ -275,28 +277,43 @@ void MultiTaskProcess::run(void)
try try
{ {
_stopProcessEvent.wait(); while(true)
}
catch (Exception* ex)
{
for (int i = 0; i < _threadCount; i++)
{ {
if ( _threadList[i] ) if (theProcess->checkSignal() == SIGINT)
{ {
_threadList[i]->cancel();; return;
} }
sleep(1);
} }
}
catch(Exception* ex)
{
ex->writeMessage(); ex->writeMessage();
} }
catch(...)
{
throw;
}
} }
Semaphore* MultiTaskProcess::getStopProcessEvent(void) void MultiTaskProcess::waitStop(void)
{ {
return &_stopProcessEvent; while (_stopCount < _threadCount)
{
sleep(1);
}
}
void MultiTaskProcess::threadStoped(void)
{
_mutex.lock();
_stopCount++;
_mutex.unlock();
} }
void MultiTaskProcess::attach(Thread* thread) void MultiTaskProcess::attach(Thread* thread)
{ {
_mutex.lock();
if (_threadCount < MQTTSNGW_MAX_TASK) if (_threadCount < MQTTSNGW_MAX_TASK)
{ {
_threadList[_threadCount] = thread; _threadList[_threadCount] = thread;
@@ -304,8 +321,10 @@ void MultiTaskProcess::attach(Thread* thread)
} }
else else
{ {
_mutex.unlock();
throw Exception("Full of Threads"); throw Exception("Full of Threads");
} }
_mutex.unlock();
} }
int MultiTaskProcess::getParam(const char* parameter, char* value) int MultiTaskProcess::getParam(const char* parameter, char* value)

11
MQTTSNGateway/src/MQTTSNGWProcess.h
View File

@@ -39,7 +39,7 @@ namespace MQTTSNGW
* Macros * Macros
==================================*/ ==================================*/
#define WRITELOG theProcess->putLog #define WRITELOG theProcess->putLog
#define CHK_SIGINT (theProcess->checkSignal() == SIGINT)
/*================================= /*=================================
Class Process Class Process
==================================*/ ==================================*/
@@ -79,17 +79,18 @@ class MultiTaskProcess: public Process
public: public:
MultiTaskProcess(void); MultiTaskProcess(void);
~MultiTaskProcess(); ~MultiTaskProcess();
virtual void initialize(int argc, char** argv); void initialize(int argc, char** argv);
virtual int getParam(const char* parameter, char* value); int getParam(const char* parameter, char* value);
void run(void); void run(void);
void waitStop(void);
void threadStoped(void);
void attach(Thread* thread); void attach(Thread* thread);
Semaphore* getStopProcessEvent(void);
private: private:
Thread* _threadList[MQTTSNGW_MAX_TASK]; Thread* _threadList[MQTTSNGW_MAX_TASK];
Semaphore _stopProcessEvent;
Mutex _mutex; Mutex _mutex;
int _threadCount; int _threadCount;
int _stopCount;
}; };
/*===================================== /*=====================================

81
MQTTSNGateway/src/MQTTSNGateway.cpp
View File

@@ -42,6 +42,8 @@ Gateway::Gateway()
_params.rootCApath = 0; _params.rootCApath = 0;
_params.rootCAfile = 0; _params.rootCAfile = 0;
_params.certDirectory = 0; _params.certDirectory = 0;
_params.clientListName = 0;
_params.configName = 0;
_packetEventQue.setMaxSize(MAX_INFLIGHTMESSAGES * MAX_CLIENTS); _packetEventQue.setMaxSize(MAX_INFLIGHTMESSAGES * MAX_CLIENTS);
} }
@@ -71,11 +73,18 @@ Gateway::~Gateway()
{ {
free(_params.portSecure); free(_params.portSecure);
} }
if ( _params.certDirectory )
{
free(_params.certDirectory);
}
if ( _params.rootCApath ) if ( _params.rootCApath )
{ {
free(_params.rootCApath); free(_params.rootCApath);
} }
if ( _params.rootCAfile )
{
free(_params.rootCAfile);
}
if ( _params.clientListName ) if ( _params.clientListName )
{ {
free(_params.clientListName); free(_params.clientListName);
@@ -93,7 +102,6 @@ void Gateway::initialize(int argc, char** argv)
MultiTaskProcess::initialize(argc, argv); MultiTaskProcess::initialize(argc, argv);
resetRingBuffer(); resetRingBuffer();
if (getParam("BrokerName", param) == 0) if (getParam("BrokerName", param) == 0)
{ {
_params.brokerName = strdup(param); _params.brokerName = strdup(param);
@@ -215,8 +223,22 @@ void Gateway::run(void)
WRITELOG(" RootCAfile: %s\n", _params.rootCAfile); WRITELOG(" RootCAfile: %s\n", _params.rootCAfile);
WRITELOG(" ClientCerts: %s\n", _params.certDirectory); WRITELOG(" ClientCerts: %s\n", _params.certDirectory);
/* Execute threads and wait StopProcessEvent from MQTTSNGWPacketHandleTask */
MultiTaskProcess::run(); MultiTaskProcess::run();
/* stop threads */
Event* ev = new Event();
ev->setStop();
_packetEventQue.post(ev);
ev = new Event();
ev->setStop();
_brokerSendQue.post(ev);
ev = new Event();
ev->setStop();
_clientSendQue.post(ev);
/* wait until all threads stop */
MultiTaskProcess::waitStop();
WRITELOG("%s MQTT-SN Gateway stoped\n", currentDateTime()); WRITELOG("%s MQTT-SN Gateway stoped\n", currentDateTime());
_lightIndicator.allLightOff(); _lightIndicator.allLightOff();
} }
@@ -266,7 +288,13 @@ EventQue::EventQue()
EventQue::~EventQue() EventQue::~EventQue()
{ {
_mutex.lock();
while (_que.size() > 0)
{
delete _que.front();
_que.pop();
}
_mutex.unlock();
} }
void EventQue::setMaxSize(uint16_t maxSize) void EventQue::setMaxSize(uint16_t maxSize)
@@ -316,14 +344,18 @@ Event* EventQue::timedwait(uint16_t millsec)
return ev; return ev;
} }
int EventQue::post(Event* ev) void EventQue::post(Event* ev)
{ {
int rc = 0;
_mutex.lock(); _mutex.lock();
rc = _que.post(ev); if ( _que.post(ev) )
_sem.post(); {
_sem.post();
}
else
{
delete ev;
}
_mutex.unlock(); _mutex.unlock();
return rc;
} }
int EventQue::size() int EventQue::size()
@@ -342,20 +374,18 @@ Event::Event()
{ {
_eventType = Et_NA; _eventType = Et_NA;
_client = 0; _client = 0;
_mqttSNPacket = 0; _sensorNetAddr = 0;
_mqttGWPacket = 0;
}
Event::Event(EventType type)
{
_eventType = type;
_client = 0;
_mqttSNPacket = 0; _mqttSNPacket = 0;
_mqttGWPacket = 0; _mqttGWPacket = 0;
} }
Event::~Event() Event::~Event()
{ {
if (_sensorNetAddr)
{
delete _sensorNetAddr;
}
if (_mqttSNPacket) if (_mqttSNPacket)
{ {
delete _mqttSNPacket; delete _mqttSNPacket;
@@ -405,17 +435,34 @@ void Event::setTimeout(void)
_eventType = EtTimeout; _eventType = EtTimeout;
} }
void Event::setStop(void)
{
_eventType = EtStop;
}
void Event::setBrodcastEvent(MQTTSNPacket* msg) void Event::setBrodcastEvent(MQTTSNPacket* msg)
{ {
_mqttSNPacket = msg; _mqttSNPacket = msg;
_eventType = EtBroadcast; _eventType = EtBroadcast;
} }
void Event::setClientSendEvent(SensorNetAddress* addr, MQTTSNPacket* msg)
{
_eventType = EtSensornetSend;
_sensorNetAddr = addr;
_mqttSNPacket = msg;
}
Client* Event::getClient(void) Client* Event::getClient(void)
{ {
return _client; return _client;
} }
SensorNetAddress* Event::getSensorNetAddress(void)
{
return _sensorNetAddr;
}
MQTTSNPacket* Event::getMQTTSNPacket() MQTTSNPacket* Event::getMQTTSNPacket()
{ {
return _mqttSNPacket; return _mqttSNPacket;

15
MQTTSNGateway/src/MQTTSNGateway.h
View File

@@ -31,7 +31,7 @@ namespace MQTTSNGW
/*================================= /*=================================
* Starting prompt * Starting prompt
==================================*/ ==================================*/
#define GATEWAY_VERSION " * Version: 0.8.0" #define GATEWAY_VERSION " * Version: 0.9.0"
#define PAHO_COPYRIGHT0 " * MQTT-SN Transparent Gateway" #define PAHO_COPYRIGHT0 " * MQTT-SN Transparent Gateway"
#define PAHO_COPYRIGHT1 " * Part of Project Paho in Eclipse" #define PAHO_COPYRIGHT1 " * Part of Project Paho in Eclipse"
@@ -49,6 +49,7 @@ namespace MQTTSNGW
===========================================================*/ ===========================================================*/
#define CLIENT "Client" #define CLIENT "Client"
#define CLIENTS "Clients" #define CLIENTS "Clients"
#define NONACTCLT "Non Active Client !"
#define LEFTARROW "<---" #define LEFTARROW "<---"
#define RIGHTARROW "--->" #define RIGHTARROW "--->"
@@ -87,20 +88,20 @@ namespace MQTTSNGW
====================================*/ ====================================*/
enum EventType{ enum EventType{
Et_NA = 0, Et_NA = 0,
EtStop,
EtTimeout, EtTimeout,
EtBrokerRecv, EtBrokerRecv,
EtBrokerSend, EtBrokerSend,
EtClientRecv, EtClientRecv,
EtClientSend, EtClientSend,
EtBroadcast, EtBroadcast,
EtSocketAlive EtSensornetSend
}; };
class Event{ class Event{
public: public:
Event(); Event();
Event(EventType);
~Event(); ~Event();
EventType getEventType(void); EventType getEventType(void);
void setClientRecvEvent(Client*, MQTTSNPacket*); void setClientRecvEvent(Client*, MQTTSNPacket*);
@@ -109,13 +110,17 @@ public:
void setBrokerSendEvent(Client*, MQTTGWPacket*); void setBrokerSendEvent(Client*, MQTTGWPacket*);
void setBrodcastEvent(MQTTSNPacket*); // ADVERTISE and GWINFO void setBrodcastEvent(MQTTSNPacket*); // ADVERTISE and GWINFO
void setTimeout(void); // Required by EventQue<Event>.timedwait() void setTimeout(void); // Required by EventQue<Event>.timedwait()
void setStop(void);
void setClientSendEvent(SensorNetAddress*, MQTTSNPacket*);
Client* getClient(void); Client* getClient(void);
SensorNetAddress* getSensorNetAddress(void);
MQTTSNPacket* getMQTTSNPacket(void); MQTTSNPacket* getMQTTSNPacket(void);
MQTTGWPacket* getMQTTGWPacket(void); MQTTGWPacket* getMQTTGWPacket(void);
private: private:
EventType _eventType; EventType _eventType;
Client* _client; Client* _client;
SensorNetAddress* _sensorNetAddr;
MQTTSNPacket* _mqttSNPacket; MQTTSNPacket* _mqttSNPacket;
MQTTGWPacket* _mqttGWPacket; MQTTGWPacket* _mqttGWPacket;
}; };
@@ -131,8 +136,8 @@ public:
Event* wait(void); Event* wait(void);
Event* timedwait(uint16_t millsec); Event* timedwait(uint16_t millsec);
void setMaxSize(uint16_t maxSize); void setMaxSize(uint16_t maxSize);
int post(Event*); void post(Event*);
int size(); int size();
private: private:
Que<Event> _que; Que<Event> _que;

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

@@ -345,6 +345,11 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
return false; return false;
} }
if (_session)
{
rc = SSL_set_session(_ssl, _session);
}
if (!SSL_set_fd(_ssl, getSock())) if (!SSL_set_fd(_ssl, getSock()))
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
@@ -352,11 +357,9 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
SSL_free(_ssl); SSL_free(_ssl);
} }
//SSL_set_options(_ssl, SSL_OP_NO_TICKET);
if ( cert ) if ( cert )
{ {
if ( SSL_use_certificate_file(_ssl, cert, SSL_FILETYPE_PEM) <= 0 ) if ( SSL_use_certificate_file(_ssl, cert, SSL_FILETYPE_PEM) != 1 )
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
WRITELOG("SSL_use_certificate_file() %s %s\n", cert, errmsg); WRITELOG("SSL_use_certificate_file() %s %s\n", cert, errmsg);
@@ -367,7 +370,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
} }
if ( prvkey ) if ( prvkey )
{ {
if ( SSL_use_PrivateKey_file(_ssl, prvkey, SSL_FILETYPE_PEM) <= 0 ) if ( SSL_use_PrivateKey_file(_ssl, prvkey, SSL_FILETYPE_PEM) != 1 )
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
WRITELOG("SSL_use_PrivateKey_file() %s %s\n", prvkey, errmsg); WRITELOG("SSL_use_PrivateKey_file() %s %s\n", prvkey, errmsg);
@@ -386,11 +389,6 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
return false; return false;
} }
if (_session)
{
rc = SSL_set_session(_ssl, _session);
}
if (SSL_connect(_ssl) != 1) if (SSL_connect(_ssl) != 1)
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
@@ -426,7 +424,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
if (_session == 0) if (_session == 0)
{ {
_session = SSL_get1_session(_ssl); //_session = SSL_get1_session(_ssl);
} }
_numOfInstance++; _numOfInstance++;
_sslValid = true; _sslValid = true;

37
MQTTSNGateway/src/linux/Threading.cpp
View File

@@ -160,12 +160,11 @@ Semaphore::Semaphore(const char* name, unsigned int val)
{ {
throw Exception( -1, "Semaphore can't be created."); throw Exception( -1, "Semaphore can't be created.");
} }
_name = (char*) calloc(strlen(name + 1), 1); _name = strdup(name);
if (_name == NULL) if (_name == NULL)
{ {
throw Exception( -1, "Semaphore can't allocate memories."); throw Exception( -1, "Semaphore can't allocate memories.");
} }
_name = strdup(name);
} }
Semaphore::~Semaphore() Semaphore::~Semaphore()
@@ -174,7 +173,7 @@ Semaphore::~Semaphore()
{ {
sem_close(_psem); sem_close(_psem);
sem_unlink(_name); sem_unlink(_name);
free((void*) _name); free(_name);
} }
else else
{ {
@@ -243,12 +242,18 @@ RingBuffer::RingBuffer(const char* keyDirectory)
{ {
int fp = 0; int fp = 0;
string fileName = keyDirectory + string(MQTTSNGW_RINGBUFFER_KEY); string fileName = keyDirectory + string(MQTTSNGW_RINGBUFFER_KEY);
fp = open(fileName.c_str(), O_CREAT, 0); fp = open(fileName.c_str(), O_CREAT, S_IRGRP);
close(fp); if ( fp > 0 )
{
close(fp);
}
fileName = keyDirectory + string(MQTTSNGW_RB_MUTEX_KEY); fileName = keyDirectory + string(MQTTSNGW_RB_MUTEX_KEY);
fp = open(fileName.c_str(), O_CREAT, 0); fp = open(fileName.c_str(), O_CREAT, S_IRGRP);
close(fp); if ( fp > 0 )
{
close(fp);
}
key_t key = ftok(MQTTSNGW_RINGBUFFER_KEY, 1); key_t key = ftok(MQTTSNGW_RINGBUFFER_KEY, 1);
@@ -302,10 +307,6 @@ RingBuffer::~RingBuffer()
{ {
shmctl(_shmid, IPC_RMID, NULL); shmctl(_shmid, IPC_RMID, NULL);
} }
if (_pmx > 0)
{
delete _pmx;
}
} }
else else
{ {
@@ -314,6 +315,11 @@ RingBuffer::~RingBuffer()
shmdt(_shmaddr); shmdt(_shmaddr);
} }
} }
if (_pmx > 0)
{
delete _pmx;
}
} }
void RingBuffer::put(char* data) void RingBuffer::put(char* data)
@@ -469,14 +475,11 @@ void RingBuffer::reset()
=====================================*/ =====================================*/
Thread::Thread() Thread::Thread()
{ {
_stopProcessEvent = theMultiTaskProcess->getStopProcessEvent();
_threadID = 0; _threadID = 0;
} }
Thread::~Thread() Thread::~Thread()
{ {
pthread_cancel(_threadID);
pthread_join(_threadID, 0);
} }
void* Thread::_run(void* runnable) void* Thread::_run(void* runnable)
@@ -508,10 +511,6 @@ int Thread::start(void)
void Thread::stopProcess(void) void Thread::stopProcess(void)
{ {
_stopProcessEvent->post(); theMultiTaskProcess->threadStoped();
} }
void Thread::cancel(void)
{
pthread_cancel(_threadID);
}

12
MQTTSNGateway/src/linux/Threading.h
View File

@@ -101,17 +101,12 @@ public:
virtual void EXECRUN(){} virtual void EXECRUN(){}
}; };
#define MAGIC_WORD_FOR_THREAD \ #define MAGIC_WORD_FOR_THREAD \
public: void EXECRUN() \ public: void EXECRUN() \
{ \ { \
try \ try \
{ \ { \
run(); \ run(); \
} \
catch(Exception& ex) \
{ \
ex.writeMessage();\
stopProcess(); \ stopProcess(); \
} \ } \
catch(...) \ catch(...) \
@@ -132,13 +127,10 @@ public:
static bool equals(pthread_t*, pthread_t*); static bool equals(pthread_t*, pthread_t*);
virtual void initialize(int argc, char** argv); virtual void initialize(int argc, char** argv);
void stopProcess(void); void stopProcess(void);
void cancel(void); void waitStop(void);
private: private:
pthread_t _threadID;
Semaphore* _stopProcessEvent;
static void* _run(void*); static void* _run(void*);
pthread_t _threadID;
}; };
} }

34
MQTTSNGateway/src/linux/udp/SensorNetwork.cpp
View File

@@ -45,6 +45,16 @@ SensorNetAddress::~SensorNetAddress()
} }
uint32_t SensorNetAddress::getIpAddress(void)
{
return _IpAddr;
}
uint16_t SensorNetAddress::getPortNo(void)
{
return _portNo;
}
void SensorNetAddress::setAddress(uint32_t IpAddr, uint16_t port) void SensorNetAddress::setAddress(uint32_t IpAddr, uint16_t port)
{ {
_IpAddr = IpAddr; _IpAddr = IpAddr;
@@ -96,12 +106,10 @@ SensorNetAddress& SensorNetAddress::operator =(SensorNetAddress& addr)
============================================*/ ============================================*/
SensorNetwork::SensorNetwork() SensorNetwork::SensorNetwork()
{ {
} }
SensorNetwork::~SensorNetwork() SensorNetwork::~SensorNetwork()
{ {
} }
int SensorNetwork::unicast(const uint8_t* payload, uint16_t payloadLength, SensorNetAddress* sendToAddr) int SensorNetwork::unicast(const uint8_t* payload, uint16_t payloadLength, SensorNetAddress* sendToAddr)
@@ -302,10 +310,12 @@ int UDPPort::broadcast(const uint8_t* buf, uint32_t length)
int UDPPort::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr) int UDPPort::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr)
{ {
struct timeval timeout;
fd_set recvfds; fd_set recvfds;
int maxSock = 0; int maxSock = 0;
int rc = 0;
timeout.tv_sec = 0;
timeout.tv_usec = 1000000; // 1 sec
FD_ZERO(&recvfds); FD_ZERO(&recvfds);
FD_SET(_sockfdUnicast, &recvfds); FD_SET(_sockfdUnicast, &recvfds);
FD_SET(_sockfdMulticast, &recvfds); FD_SET(_sockfdMulticast, &recvfds);
@@ -319,15 +329,17 @@ int UDPPort::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr)
maxSock = _sockfdUnicast; maxSock = _sockfdUnicast;
} }
select(maxSock + 1, &recvfds, 0, 0, 0); int rc = 0;
if ( select(maxSock + 1, &recvfds, 0, 0, &timeout) > 0 )
if (FD_ISSET(_sockfdUnicast, &recvfds))
{ {
rc = recvfrom(_sockfdUnicast, buf, len, 0, addr); if (FD_ISSET(_sockfdUnicast, &recvfds))
} {
else if (FD_ISSET(_sockfdMulticast, &recvfds)) rc = recvfrom(_sockfdUnicast, buf, len, 0, addr);
{ }
rc = recvfrom(_sockfdMulticast, buf, len, 0, &_grpAddr); else if (FD_ISSET(_sockfdMulticast, &recvfds))
{
rc = recvfrom(_sockfdMulticast, buf, len, 0, &_grpAddr);
}
} }
return rc; return rc;
} }

10
MQTTSNGateway/src/linux/udp/SensorNetwork.h
View File

@@ -41,14 +41,8 @@ public:
~SensorNetAddress(); ~SensorNetAddress();
void setAddress(uint32_t IpAddr, uint16_t port); void setAddress(uint32_t IpAddr, uint16_t port);
int setAddress(string* data); int setAddress(string* data);
uint32_t getIpAddress(void) uint16_t getPortNo(void);
{ uint32_t getIpAddress(void);
return _IpAddr;
}
uint16_t getPortNo(void)
{
return _portNo;
}
bool isMatch(SensorNetAddress* addr); bool isMatch(SensorNetAddress* addr);
SensorNetAddress& operator =(SensorNetAddress& addr); SensorNetAddress& operator =(SensorNetAddress& addr);

1
MQTTSNGateway/src/tests/TestProcessFramework.cpp
View File

@@ -115,6 +115,7 @@ void TestProcessFramework::run(void)
printf("%s Timer 1sec\n", currentDateTime()); printf("%s Timer 1sec\n", currentDateTime());
MultiTaskProcess::run(); MultiTaskProcess::run();
printf("ProcessFramework test complited.\n"); printf("ProcessFramework test complited.\n");
} }

5
MQTTSNGateway/src/tests/TestTask.cpp
View File

@@ -39,9 +39,10 @@ void TestTask::run(void)
{ {
while(true) while(true)
{ {
if (theProcess->checkSignal() == SIGINT) if ( CHK_SIGINT)
{ {
throw Exception("Terminated by CTL-C"); printf("Task stopped.\n");
return;
} }
printf("Task is running. Enter CTRL+C\n"); printf("Task is running. Enter CTRL+C\n");
sleep(1); sleep(1);