From 97cffe457365cfd166539d5de5d20b34cfe625d3 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Mon, 13 Aug 2018 21:28:51 +0900 Subject: [PATCH] Forwerders are declared by the ClientList file. Signed-off-by: tomoaki --- MQTTSNGateway/Makefile | 2 - MQTTSNGateway/README.md | 12 +-- MQTTSNGateway/clients.conf | 22 ++++-- MQTTSNGateway/forwarders.conf | 25 ------- MQTTSNGateway/src/MQTTSNGWAdapterManager.cpp | 66 ----------------- MQTTSNGateway/src/MQTTSNGWAdapterManager.h | 2 +- MQTTSNGateway/src/MQTTSNGWAggregater.cpp | 2 +- MQTTSNGateway/src/MQTTSNGWClientList.cpp | 31 +++++--- MQTTSNGateway/src/MQTTSNGWClientList.h | 8 +- MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp | 77 ++++++++++++++++++-- MQTTSNGateway/src/MQTTSNGWForwarder.cpp | 73 ++----------------- MQTTSNGateway/src/MQTTSNGWForwarder.h | 5 +- MQTTSNGateway/src/MQTTSNGWQoSm1Proxy.cpp | 2 +- MQTTSNGateway/src/MQTTSNGateway.cpp | 30 ++------ MQTTSNGateway/src/MQTTSNGateway.h | 1 - 15 files changed, 131 insertions(+), 227 deletions(-) delete mode 100644 MQTTSNGateway/forwarders.conf diff --git a/MQTTSNGateway/Makefile b/MQTTSNGateway/Makefile index fb4562b..4015b85 100644 --- a/MQTTSNGateway/Makefile +++ b/MQTTSNGateway/Makefile @@ -10,7 +10,6 @@ TESTAPPL := mainTestProcess CONFIG := gateway.conf CLIENTS := clients.conf PREDEFTOPIC := predefinedTopic.conf -FORWARDERS := forwarders.conf SRCDIR := src SUBDIR := ../MQTTSNPacket/src @@ -149,7 +148,6 @@ install: cp -pf $(CONFIG) ../../ cp -pf $(CLIENTS) ../../ cp -pf $(PREDEFTOPIC) ../../ - cp -pf $(FORWARDERS) ../../ exectest: diff --git a/MQTTSNGateway/README.md b/MQTTSNGateway/README.md index 5d1627a..8504eda 100644 --- a/MQTTSNGateway/README.md +++ b/MQTTSNGateway/README.md @@ -36,18 +36,16 @@ BrokerSecurePortNo=8883 # All clients must be specified by the ClientList File # -AggregateGateway=NO -ClientAuthentication=NO - #ClientsList=/path/to/your_clients.conf +ClientAuthentication=NO +AggregateGateway=NO +Forwarder=NO QoS-1=NO OoS-1ProxyName=Proxy007 #PredefinedTopicList=/path/to/your_predefinedTopic.conf -Forwarder=NO -#ForwardersList=/path/to/your_forwarers.conf #RootCAfile=/etc/ssl/certs/ca-certificates.crt #RootCApath=/etc/ssl/certs/ @@ -84,11 +82,9 @@ Client should know the MulticastIP and MulticastPortNo to send a SEARCHGW messag when **AggregateGateway** or **ClientAuthentication** is **YES**, All clients which connect to the gateway must be declared by a **ClientsList** file. Format of the file is ClientId and SensorNetwork Address. e.g. IP address and Port No etc, in CSV. more detail see clients.conf When **PredefinedTopic** is **YES**, **Pre-definedTopicId**s specified by **PredefinedTopicList** are effective. This file defines Pre-definedTopics of the clients. In this file, ClientID,TopicName and TopicID are declared in CSV format. -When **Forwarder** is **YE**S, Forwarder Encapsulation Message is available. Connectable Forwarders are specifed by **ForwardersList** file. In this file, ForwarderIds and those sensorNet addresses are declared in CSV format. +When **Forwarder** is **YE**S, Forwarder Encapsulation Message is available. Connectable Forwarders must be declared by a **ClientsList** file. - - ### ** How to monitor the gateway from remote. ** Uncomment line32 in MQTTSNGWDefined.h. diff --git a/MQTTSNGateway/clients.conf b/MQTTSNGateway/clients.conf index 28d2bab..ddb2310 100644 --- a/MQTTSNGateway/clients.conf +++ b/MQTTSNGateway/clients.conf @@ -15,25 +15,33 @@ # Lines bigning with # are comment line. # ClientId, SensorNetAddress, "unstableLine", "secureConnection" # in case of UDP, SensorNetAddress format is portNo@IPAddress. -# if the SensorNetwork is not stable, write unstableLine. -# if Broker's Connection is SSL, write secureConnection. -# if the client send PUBLISH QoS-1, QoS-1 is required. +# if the SensorNetwork is not stable, write "unstableLine". +# if Broker's Connection is SSL, write "secureConnection". +# if the client is a forwarder, "forwarder" is required. +# if the client send PUBLISH QoS-1, "QoS-1" is required. # # Ex: # #Client List # ClientId1,11200@192.168.10.10 # ClientID2,35000@192.168.50.200,unstableLine # ClientID3,40000@192.168.200.50,secureConnection -# ClientID4,41000@192.168.200.51,unstableLine,secureConnection -# ClientID5,41000@192.168.200.51,unstableLine,secureConnection,QoS-1 +# ClientID4,41000@192.168.200.52,unstableLine,secureConnection +# ClientID5,41000@192.168.200.53,unstableLine,secureConnection,QoS-1 +# ClientID6,41000@192.168.200.54,unstableLine,secureConnection,forwarder # # SensorNetwork address format is defined by SensorNetAddress::setAddress(string* data) function. # - +GatewayTester, 172.16.1.11:20020 +ClientPUB,172.16.1.11:2010 +Client01,172.16.1.11:12001 Client02,172.16.1.11:12002 Client03,172.16.1.11:13003 -Client01,172.16.1.11:12001 QoS-1_Client01,172.16.1.11:20001,QoS-1 QoS-1_Client02,172.16.1.11:20002,QoS-1 QoS-1_Client03,172.16.1.11:20003,QoS-1 + +Forwarder01,172.16.1.11:22002,forwarder +Forwarder02,172.16.1.11:22003,forwarder +Forwarder03,172.16.1.11:22004,forwarder + diff --git a/MQTTSNGateway/forwarders.conf b/MQTTSNGateway/forwarders.conf deleted file mode 100644 index cfb11dd..0000000 --- a/MQTTSNGateway/forwarders.conf +++ /dev/null @@ -1,25 +0,0 @@ -#*********************************************************************** -# Copyright (c) 2018, Tomoaki Yamaguchi -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# and Eclipse Distribution License v1.0 which accompany this distribution. -# -# The Eclipse Public License is available at -# http://www.eclipse.org/legal/epl-v10.html -# and the Eclipse Distribution License is available at -# http://www.eclipse.org/org/documents/edl-v10.php. -#*********************************************************************** -# -# This file declares valid MQTTSNForwarders. -# Forwarders are defined by ForwarderId same as ClientId and those SensorNetAddress -# in a CSV format as follow: -# -# ForwarderId, SensorNetAddress -# -# where SensorNetwork address format is defined by SensorNetAddress::setAddress(string* data) function. -# - -Forwarder01,172.16.1.7:12002 - - diff --git a/MQTTSNGateway/src/MQTTSNGWAdapterManager.cpp b/MQTTSNGateway/src/MQTTSNGWAdapterManager.cpp index 6cbef35..45be65a 100644 --- a/MQTTSNGateway/src/MQTTSNGWAdapterManager.cpp +++ b/MQTTSNGateway/src/MQTTSNGWAdapterManager.cpp @@ -91,72 +91,6 @@ bool AdapterManager::isAggregatedClient(Client* client) } } - -Client* AdapterManager::getClient(MQTTSNPacket* packet, ClientRecvTask* task) -{ - char buf[128]; - WirelessNodeId nodeId; - SensorNetAddress* senderAddr = _gateway->getSensorNetwork()->getSenderAddress(); - - Client* client = nullptr; - - if ( packet->getType() == MQTTSN_ENCAPSULATED ) - { - Forwarder* fwd = getForwarderList()->getForwarder(senderAddr); - - if ( fwd == nullptr ) - { - task->log(0, packet, 0); - WRITELOG("%s Forwarder %s is not authenticated.%s\n", ERRMSG_HEADER, senderAddr->sprint(buf), ERRMSG_FOOTER); - delete packet; - return client; - } - else - { - MQTTSNString fwdName = MQTTSNString_initializer; - fwdName.cstring = const_cast( fwd->getName() ); - task->log(0, packet, &fwdName); - - /* get the packet from the encapsulation message */ - MQTTSNGWEncapsulatedPacket encap; - encap.desirialize(packet->getPacketData(), packet->getPacketLength()); - nodeId.setId( encap.getWirelessNodeId() ); - client = fwd->getClient(&nodeId); - delete packet; - packet = encap.getMQTTSNPacket(); - } - } - else - { - /* Check the client belonging to QoS-1Proxy ? */ - - if ( _qosm1Proxy->isActive() ) - { - /* get ClientId not Client which can send QoS-1 PUBLISH */ - const char* clientName = _qosm1Proxy->getClientId(senderAddr); - - if ( clientName ) - { - if ( !packet->isQoSMinusPUBLISH() ) - { - client = _qosm1Proxy->getClient(); - task->log(clientName, packet); - WRITELOG("%s %s %s can send only PUBLISH with QoS-1.%s\n", ERRMSG_HEADER, clientName, senderAddr->sprint(buf), ERRMSG_FOOTER); - delete packet; - return client; - } - } - } - } - - if ( client == nullptr ) - { - /* get client from the ClientList of Gateway by sensorNetAddress. */ - client = _gateway->getClientList()->getClient(senderAddr); - } - return client; -} - Client* AdapterManager::getClient(Client& client) { bool secure = client.isSecureNetwork(); diff --git a/MQTTSNGateway/src/MQTTSNGWAdapterManager.h b/MQTTSNGateway/src/MQTTSNGWAdapterManager.h index 749f1a9..510d02f 100644 --- a/MQTTSNGateway/src/MQTTSNGWAdapterManager.h +++ b/MQTTSNGateway/src/MQTTSNGWAdapterManager.h @@ -26,6 +26,7 @@ class Client; class QoSm1Proxy; class Aggregater; class ForwarderList; +class Forwarder; class MQTTSNPacket; class MQTTSNGWPacket; class ClientRecvTask; @@ -46,7 +47,6 @@ public: void checkConnection(void); bool isAggregatedClient(Client* client); - Client* getClient(MQTTSNPacket* packet, ClientRecvTask* task); Client* getClient(Client& client); Client* convertClient(uint16_t msgId, uint16_t* clientMsgId); int unicastToClient(Client* client, MQTTSNPacket* packet, ClientSendTask* task); diff --git a/MQTTSNGateway/src/MQTTSNGWAggregater.cpp b/MQTTSNGateway/src/MQTTSNGWAggregater.cpp index a091625..e6765ca 100644 --- a/MQTTSNGateway/src/MQTTSNGWAggregater.cpp +++ b/MQTTSNGateway/src/MQTTSNGWAggregater.cpp @@ -45,7 +45,7 @@ void Aggregater::initialize(void) if (!strcasecmp(param, "YES") ) { /* Create Aggregated Clients */ - _gateway->getClientList()->setClientList(_gateway, AGGREGATER_TYPE); + _gateway->getClientList()->setClientList(AGGREGATER_TYPE); setup((const char*)(_gateway->getGWParams()->gatewayName), Atype_Aggregater); _isActive = true; } diff --git a/MQTTSNGateway/src/MQTTSNGWClientList.cpp b/MQTTSNGateway/src/MQTTSNGWClientList.cpp index 23bdcdd..c0ecf85 100644 --- a/MQTTSNGateway/src/MQTTSNGWClientList.cpp +++ b/MQTTSNGateway/src/MQTTSNGWClientList.cpp @@ -15,9 +15,12 @@ * Tieto Poland Sp. z o.o. - Gateway improvements **************************************************************************************/ #include "MQTTSNGWClientList.h" +#include "MQTTSNGateway.h" #include #include +using namespace MQTTSNGW; +extern Gateway* theGateway; /*===================================== Class ClientList =====================================*/ @@ -44,26 +47,26 @@ ClientList::~ClientList() _mutex.unlock(); } -void ClientList::initialize(Gateway* gw, bool aggregate) +void ClientList::initialize(bool aggregate) { - if (gw->getGWParams()->clientAuthentication ) + if (theGateway->getGWParams()->clientAuthentication ) { int type = TRANSPEARENT_TYPE; if ( aggregate ) { type = AGGREGATER_TYPE; } - setClientList(gw, type); + setClientList(type); _authorize = true; } } -void ClientList::setClientList(Gateway* gw, int type) +void ClientList::setClientList(int type) { char param[MQTTSNGW_PARAM_MAX]; string fileName; - GatewayParams* params = gw->getGWParams(); - if (gw->getParam("ClientsList", param) == 0) + GatewayParams* params = theGateway->getGWParams(); + if (theGateway->getParam("ClientsList", param) == 0) { fileName = string(param); } @@ -79,14 +82,14 @@ void ClientList::setClientList(Gateway* gw, int type) params->clientListName = strdup(fileName.c_str()); } -void ClientList::setPredefinedTopics(Gateway* gw, bool aggrecate) +void ClientList::setPredefinedTopics(bool aggrecate) { char param[MQTTSNGW_PARAM_MAX]; string fileName; - GatewayParams* params = gw->getGWParams(); + GatewayParams* params = theGateway->getGWParams(); - if (gw->getParam("PredefinedTopicList", param) == 0) + if (theGateway->getParam("PredefinedTopicList", param) == 0) { fileName = string(param); } @@ -131,6 +134,7 @@ bool ClientList::createList(const char* fileName, int type) bool secure; bool stable; bool qos_1; + bool forwarder; bool rc = true; SensorNetAddress netAddr; MQTTSNString clientId = MQTTSNString_initializer; @@ -160,15 +164,20 @@ bool ClientList::createList(const char* fileName, int type) if (netAddr.setAddress(&addr) == 0) { qos_1 = (data.find("QoS-1") != string::npos); + forwarder = (data.find("forwarder") != string::npos); secure = (data.find("secureConnection") != string::npos); stable = !(data.find("unstableLine") != string::npos); if ( (qos_1 && type == QOSM1PROXY_TYPE) || (!qos_1 && type == AGGREGATER_TYPE) ) { createClient(&netAddr, &clientId, stable, secure, type); } - else + else if ( forwarder && type == FORWARDER_TYPE) { - createClient(&netAddr, &clientId, stable, secure, TRANSPEARENT_TYPE); + theGateway->getAdapterManager()->getForwarderList()->addForwarder(&netAddr, &clientId); + } + else if (type == TRANSPEARENT_TYPE ) + { + createClient(&netAddr, &clientId, stable, secure, type); } } else diff --git a/MQTTSNGateway/src/MQTTSNGWClientList.h b/MQTTSNGateway/src/MQTTSNGWClientList.h index 4e0f81e..135f365 100644 --- a/MQTTSNGateway/src/MQTTSNGWClientList.h +++ b/MQTTSNGateway/src/MQTTSNGWClientList.h @@ -26,6 +26,7 @@ namespace MQTTSNGW #define TRANSPEARENT_TYPE 0 #define QOSM1PROXY_TYPE 1 #define AGGREGATER_TYPE 2 +#define FORWARDER_TYPE 3 class Client; @@ -38,9 +39,9 @@ public: ClientList(); ~ClientList(); - void initialize(Gateway* gw, bool aggregate); - void setClientList(Gateway* gw, int type); - void setPredefinedTopics(Gateway* gw, bool aggregate); + void initialize(bool aggregate); + void setClientList(int type); + void setPredefinedTopics(bool aggregate); void erase(Client*&); Client* createClient(SensorNetAddress* addr, MQTTSNString* clientId,int type); Client* createClient(SensorNetAddress* addr, MQTTSNString* clientId, bool unstableLine, bool secure, int type); @@ -54,6 +55,7 @@ public: private: bool readPredefinedList(const char* fileName, bool _aggregate); + Gateway* _gateway {nullptr}; Client* createPredefinedTopic( MQTTSNString* clientId, string topicName, uint16_t toipcId, bool _aggregate); Client* _firstClient; Client* _endClient; diff --git a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp index b1e805a..7e70a52 100644 --- a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp +++ b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp @@ -60,6 +60,7 @@ void ClientRecvTask::run() Event* ev = nullptr; Client* client = nullptr; AdapterManager* adpMgr = _gateway->getAdapterManager(); + QoSm1Proxy* qosm1Proxy = adpMgr->getQoSm1Proxy(); bool isAggrActive = adpMgr->isAggregaterActive(); ClientList* clientList = _gateway->getClientList(); EventQue* packetEventQue = _gateway->getPacketEventQue(); @@ -103,7 +104,60 @@ void ClientRecvTask::run() continue; } - client = adpMgr->getClient(packet, this); + + Client* client = nullptr; + SensorNetAddress* senderAddr = _gateway->getSensorNetwork()->getSenderAddress(); + + if ( packet->getType() == MQTTSN_ENCAPSULATED ) + { + fwd = _gateway->getAdapterManager()->getForwarderList()->getForwarder(senderAddr); + + if ( fwd != nullptr ) + { + MQTTSNString fwdName = MQTTSNString_initializer; + fwdName.cstring = const_cast( fwd->getName() ); + log(0, packet, &fwdName); + + /* get the packet from the encapsulation message */ + MQTTSNGWEncapsulatedPacket encap; + encap.desirialize(packet->getPacketData(), packet->getPacketLength()); + nodeId.setId( encap.getWirelessNodeId() ); + client = fwd->getClient(&nodeId); + packet = encap.getMQTTSNPacket(); + + if ( client == nullptr ) + { + /* get client of Forwarder or QoSm1Proxy */ + client = _gateway->getClientList()->getClient(senderAddr); + } + } + } + else + { + /* Check the client belonging to QoS-1Proxy ? */ + + if ( qosm1Proxy->isActive() ) + { + /* get ClientId not Client which can send QoS-1 PUBLISH */ + const char* clientName = qosm1Proxy->getClientId(senderAddr); + + if ( clientName ) + { + if ( !packet->isQoSMinusPUBLISH() ) + { + client = qosm1Proxy->getClient(); + log(clientName, packet); + WRITELOG("%s %s %s can send only PUBLISH with QoS-1.%s\n", ERRMSG_HEADER, clientName, senderAddr->sprint(buf), ERRMSG_FOOTER); + delete packet; + continue; + } + } + else + { + client = _gateway->getClientList()->getClient(senderAddr); + } + } + } if ( client ) { @@ -123,7 +177,7 @@ void ClientRecvTask::run() if ( !packet->getCONNECT(&data) ) { log(0, packet, &data.clientID); - WRITELOG("%s CONNECT message form %s is incorrect.%s\n", ERRMSG_HEADER, _sensorNetwork->getSenderAddress()->sprint(buf), ERRMSG_FOOTER); + WRITELOG("%s CONNECT message form %s is incorrect.%s\n", ERRMSG_HEADER, senderAddr->sprint(buf), ERRMSG_FOOTER); delete packet; continue; } @@ -145,12 +199,12 @@ void ClientRecvTask::run() if ( client ) { /* Client exists. Set SensorNet Address of it. */ - client->setClientAddress(_sensorNetwork->getSenderAddress()); + client->setClientAddress(senderAddr); } else { /* create a new client */ - client = clientList->createClient(_sensorNetwork->getSenderAddress(), &data.clientID, isAggrActive); + client = clientList->createClient(senderAddr, &data.clientID, isAggrActive); } } @@ -158,7 +212,7 @@ void ClientRecvTask::run() if (!client) { - WRITELOG("%s Client(%s) was rejected. CONNECT message has been discarded.%s\n", ERRMSG_HEADER, _sensorNetwork->getSenderAddress()->sprint(buf), ERRMSG_FOOTER); + WRITELOG("%s Client(%s) was rejected. CONNECT message has been discarded.%s\n", ERRMSG_HEADER, senderAddr->sprint(buf), ERRMSG_FOOTER); delete packet; continue; } @@ -168,11 +222,18 @@ void ClientRecvTask::run() ev->setClientRecvEvent(client, packet); packetEventQue->post(ev); } - else + else { log(client, packet, 0); - WRITELOG("%s Client(%s) is not connecting. message has been discarded.%s\n", ERRMSG_HEADER, _sensorNetwork->getSenderAddress()->sprint(buf), ERRMSG_FOOTER); - delete packet; + if ( packet->getType() == MQTTSN_ENCAPSULATED ) + { + WRITELOG("%s Forwarder(%s) is not declared by ClientList file. message has been discarded.%s\n", ERRMSG_HEADER, _sensorNetwork->getSenderAddress()->sprint(buf), ERRMSG_FOOTER); + } + else + { + WRITELOG("%s Client(%s) is not connecting. message has been discarded.%s\n", ERRMSG_HEADER, senderAddr->sprint(buf), ERRMSG_FOOTER); + } + delete packet; } } } diff --git a/MQTTSNGateway/src/MQTTSNGWForwarder.cpp b/MQTTSNGateway/src/MQTTSNGWForwarder.cpp index 20a05e9..5fa2a49 100644 --- a/MQTTSNGateway/src/MQTTSNGWForwarder.cpp +++ b/MQTTSNGateway/src/MQTTSNGWForwarder.cpp @@ -14,6 +14,7 @@ * Tomoaki Yamaguchi - initial API and implementation and/or initial documentation **************************************************************************************/ #include "MQTTSNGWForwarder.h" +#include "SensorNetwork.h" #include @@ -48,25 +49,12 @@ void ForwarderList::initialize(Gateway* gw) { char param[MQTTSNGW_PARAM_MAX]; string fileName; - GatewayParams* params = gw->getGWParams(); if (gw->getParam("Forwarder", param) == 0 ) { if (!strcasecmp(param, "YES") ) { - if (gw->getParam("ForwardersList", param) == 0) - { - fileName = string(param); - } - else - { - fileName = params->configDir + string(FORWARDER_LIST); - } - if ( !setFowerder(fileName.c_str()) ) - { - throw Exception("ForwarderList::initialize: No ForwardersList file defined by the configuration.."); - } - params->forwarderListName = strdup(fileName.c_str()); + gw->getClientList()->setClientList(FORWARDER_TYPE); } } } @@ -86,58 +74,7 @@ Forwarder* ForwarderList::getForwarder(SensorNetAddress* addr) return p; } -bool ForwarderList::setFowerder(const char* fileName) -{ - FILE* fp; - char buf[MAX_CLIENTID_LENGTH + 256]; - size_t pos; - - SensorNetAddress netAddr; - - if ((fp = fopen(fileName, "r")) != 0) - { - while (fgets(buf, MAX_CLIENTID_LENGTH + 254, fp) != 0) - { - if (*buf == '#') - { - continue; - } - string data = string(buf); - while ((pos = data.find_first_of(" 　\t\n")) != string::npos) - { - data.erase(pos, 1); - } - if (data.empty()) - { - continue; - } - - pos = data.find_first_of(","); - string id = data.substr(0, pos); - string addr = data.substr(pos + 1); - - if (netAddr.setAddress(&addr) == 0) - { - addForwarder(&netAddr, &id); - } - else - { - WRITELOG("Invalid address %s\n", data.c_str()); - return false; - } - } - fclose(fp); - } - else - { - WRITELOG("Can not open the forwarders List. %s\n", fileName); - return false; - } - return true; -} - - -Forwarder* ForwarderList::addForwarder(SensorNetAddress* addr, string* forwarderId) +Forwarder* ForwarderList::addForwarder(SensorNetAddress* addr, MQTTSNString* forwarderId) { Forwarder* fdr = new Forwarder(addr, forwarderId); if ( _head == nullptr ) @@ -173,9 +110,9 @@ Forwarder::Forwarder() Class ForwarderList =====================================*/ -Forwarder::Forwarder(SensorNetAddress* addr, string* forwarderId) +Forwarder::Forwarder(SensorNetAddress* addr, MQTTSNString* forwarderId) { - _forwarderName = *forwarderId; + _forwarderName = string(forwarderId->cstring); _sensorNetAddr = *addr; _headClient = nullptr; _next = nullptr; diff --git a/MQTTSNGateway/src/MQTTSNGWForwarder.h b/MQTTSNGateway/src/MQTTSNGWForwarder.h index 354067f..a7279d2 100644 --- a/MQTTSNGateway/src/MQTTSNGWForwarder.h +++ b/MQTTSNGateway/src/MQTTSNGWForwarder.h @@ -55,7 +55,7 @@ class Forwarder friend class ForwarderList; public: Forwarder(void); - Forwarder(SensorNetAddress* addr, string* forwarderId); + Forwarder(SensorNetAddress* addr, MQTTSNString* forwarderId); ~Forwarder(); void initialize(void); @@ -86,8 +86,7 @@ public: void initialize(Gateway* gw); Forwarder* getForwarder(SensorNetAddress* addr); - bool setFowerder(const char* fileName); - Forwarder* addForwarder(SensorNetAddress* addr, string* forwarderId); + Forwarder* addForwarder(SensorNetAddress* addr, MQTTSNString* forwarderId); private: Forwarder* _head; diff --git a/MQTTSNGateway/src/MQTTSNGWQoSm1Proxy.cpp b/MQTTSNGateway/src/MQTTSNGWQoSm1Proxy.cpp index 2021e17..591043e 100644 --- a/MQTTSNGateway/src/MQTTSNGWQoSm1Proxy.cpp +++ b/MQTTSNGateway/src/MQTTSNGWQoSm1Proxy.cpp @@ -52,7 +52,7 @@ void QoSm1Proxy::initialize(void) if (strcasecmp(param, "YES") == 0 ) { /* Create QoS-1 Clients */ - _gateway->getClientList()->setClientList(_gateway, QOSM1PROXY_TYPE); + _gateway->getClientList()->setClientList(QOSM1PROXY_TYPE); /* set ClientId of this Proxy */ const char* name = CLIENTPROXY; diff --git a/MQTTSNGateway/src/MQTTSNGateway.cpp b/MQTTSNGateway/src/MQTTSNGateway.cpp index 2192850..25ab87f 100644 --- a/MQTTSNGateway/src/MQTTSNGateway.cpp +++ b/MQTTSNGateway/src/MQTTSNGateway.cpp @@ -28,6 +28,8 @@ char* currentDateTime(void); /*===================================== Class Gateway =====================================*/ +MQTTSNGW::Gateway* theGateway = nullptr; + Gateway::Gateway(void) { theMultiTaskProcess = this; @@ -87,14 +89,7 @@ Gateway::~Gateway() { free(_params.configName); } - if ( _params.predefinedTopicFileName ) - { - free(_params.predefinedTopicFileName); - } - if ( _params.forwarderListName ) - { - free(_params.forwarderListName); - } + if ( _params.qosMinusClientListName ) { free(_params.qosMinusClientListName); @@ -119,6 +114,7 @@ void Gateway::initialize(int argc, char** argv) { char param[MQTTSNGW_PARAM_MAX]; string fileName; + theGateway = this; MultiTaskProcess::initialize(argc, argv); resetRingBuffer(); @@ -222,10 +218,10 @@ void Gateway::initialize(int argc, char** argv) _adapterManager->initialize(); bool aggregate = _adapterManager->isAggregaterActive(); - _clientList->initialize(this, aggregate); + _clientList->initialize(aggregate); /* Setup predefined topics */ - _clientList->setPredefinedTopics(this, aggregate); + _clientList->setPredefinedTopics(aggregate); } void Gateway::run(void) @@ -242,9 +238,9 @@ void Gateway::run(void) WRITELOG("\n%s %s has been started.\n\n", currentDateTime(), _params.gatewayName); WRITELOG(" ConfigFile: %s\n", _params.configName); - if ( getClientList()->isAuthorized() ) + if ( _params.clientListName ) { - WRITELOG(" ClientList: %s\n", _params.clientListName); + WRITELOG(" ClientList: %s\n", _params.clientListName); } if ( _params.predefinedTopicFileName ) @@ -252,16 +248,6 @@ void Gateway::run(void) WRITELOG(" PreDefFile: %s\n", _params.predefinedTopicFileName); } - if ( _params.forwarderListName ) - { - WRITELOG(" Forwarders: %s\n", _params.forwarderListName); - } - - if ( _params.qosMinusClientListName ) - { - WRITELOG(" QoS-1File: %s\n", _params.qosMinusClientListName); - } - WRITELOG(" SensorN/W: %s\n", _sensorNetwork.getDescription()); WRITELOG(" Broker: %s : %s, %s\n", _params.brokerName, _params.port, _params.portSecure); WRITELOG(" RootCApath: %s\n", _params.rootCApath); diff --git a/MQTTSNGateway/src/MQTTSNGateway.h b/MQTTSNGateway/src/MQTTSNGateway.h index 2507de5..3344cfa 100644 --- a/MQTTSNGateway/src/MQTTSNGateway.h +++ b/MQTTSNGateway/src/MQTTSNGateway.h @@ -164,7 +164,6 @@ public: char* certKey {nullptr}; char* privateKey {nullptr}; char* predefinedTopicFileName {nullptr}; - char* forwarderListName {nullptr}; char* qosMinusClientListName {nullptr}; bool clientAuthentication {false}; };