mirror of
https://github.com/eclipse/paho.mqtt-sn.embedded-c.git
synced 2025-12-15 16:36:52 +01:00
Update: Add Aggregate Gateway functions. #127
Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
This commit is contained in:
tomoaki
@@ -21,12 +21,16 @@
|
||||
#include "MQTTGWPacket.h"
|
||||
#include "MQTTSNGWClient.h"
|
||||
#include "MQTTSNGWProcess.h"
|
||||
#include "MQTTSNGWAdapterManager.h"
|
||||
#include "MQTTGWConnectionHandler.h"
|
||||
#include "MQTTGWPublishHandler.h"
|
||||
#include "MQTTGWSubscribeHandler.h"
|
||||
#include "MQTTSNGWConnectionHandler.h"
|
||||
#include "MQTTSNGWPublishHandler.h"
|
||||
#include "MQTTSNGWSubscribeHandler.h"
|
||||
#include "Timer.h"
|
||||
#include "MQTTSNAggregateConnectionHandler.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace std;
|
||||
@@ -48,6 +52,8 @@ PacketHandleTask::PacketHandleTask(Gateway* gateway)
|
||||
_mqttsnConnection = new MQTTSNConnectionHandler(_gateway);
|
||||
_mqttsnPublish = new MQTTSNPublishHandler(_gateway);
|
||||
_mqttsnSubscribe = new MQTTSNSubscribeHandler(_gateway);
|
||||
|
||||
_mqttsnAggrConnection = new MQTTSNAggregateConnectionHandler(_gateway);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -79,15 +85,22 @@ PacketHandleTask::~PacketHandleTask()
|
||||
{
|
||||
delete _mqttsnSubscribe;
|
||||
}
|
||||
|
||||
if ( _mqttsnAggrConnection )
|
||||
{
|
||||
delete _mqttsnAggrConnection;
|
||||
}
|
||||
}
|
||||
|
||||
void PacketHandleTask::run()
|
||||
{
|
||||
Event* ev = 0;
|
||||
Event* ev = nullptr;
|
||||
EventQue* eventQue = _gateway->getPacketEventQue();
|
||||
Client* client = 0;
|
||||
MQTTSNPacket* snPacket = 0;
|
||||
MQTTGWPacket* brPacket = 0;
|
||||
AdapterManager* adpMgr = _gateway->getAdapterManager();
|
||||
|
||||
Client* client = nullptr;
|
||||
MQTTSNPacket* snPacket = nullptr;
|
||||
MQTTGWPacket* brPacket = nullptr;
|
||||
char msgId[6];
|
||||
memset(msgId, 0, 6);
|
||||
|
||||
@@ -114,12 +127,8 @@ void PacketHandleTask::run()
|
||||
_advertiseTimer.start(_gateway->getGWParams()->keepAlive * 1000UL);
|
||||
}
|
||||
|
||||
/*------ Check QoS-1 Proxy Connect or PINGREQ ------*/
|
||||
QoSm1Proxy* pxy = _gateway->getQoSm1Proxy();
|
||||
if ( pxy )
|
||||
{
|
||||
pxy->checkConnection();
|
||||
}
|
||||
/*------ Check Adapters Connect or PINGREQ ------*/
|
||||
adpMgr->checkConnection();
|
||||
}
|
||||
|
||||
/*------ Handle SEARCHGW Message ---------*/
|
||||
@@ -137,101 +146,221 @@ void PacketHandleTask::run()
|
||||
|
||||
DEBUGLOG(" PacketHandleTask gets %s %s from the client.\n", snPacket->getName(), snPacket->getMsgId(msgId));
|
||||
|
||||
switch (snPacket->getType())
|
||||
if ( adpMgr->isAggregatedClient(client) )
|
||||
{
|
||||
case MQTTSN_CONNECT:
|
||||
_mqttsnConnection->handleConnect(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_WILLTOPIC:
|
||||
_mqttsnConnection->handleWilltopic(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_WILLMSG:
|
||||
_mqttsnConnection->handleWillmsg(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_DISCONNECT:
|
||||
_mqttsnConnection->handleDisconnect(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_WILLMSGUPD:
|
||||
_mqttsnConnection->handleWillmsgupd(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_PINGREQ:
|
||||
_mqttsnConnection->handlePingreq(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_PUBLISH:
|
||||
_mqttsnPublish->handlePublish(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_PUBACK:
|
||||
_mqttsnPublish->handlePuback(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_PUBREC:
|
||||
_mqttsnPublish->handleAck(client, snPacket, PUBREC);
|
||||
break;
|
||||
case MQTTSN_PUBREL:
|
||||
_mqttsnPublish->handleAck(client, snPacket, PUBREL);
|
||||
break;
|
||||
case MQTTSN_PUBCOMP:
|
||||
_mqttsnPublish->handleAck(client, snPacket, PUBCOMP);
|
||||
break;
|
||||
case MQTTSN_REGISTER:
|
||||
_mqttsnPublish->handleRegister(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_REGACK:
|
||||
_mqttsnPublish->handleRegAck(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_SUBSCRIBE:
|
||||
_mqttsnSubscribe->handleSubscribe(client, snPacket);
|
||||
break;
|
||||
case MQTTSN_UNSUBSCRIBE:
|
||||
_mqttsnSubscribe->handleUnsubscribe(client, snPacket);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
aggregatePacketHandler(client, snPacket);
|
||||
}
|
||||
else
|
||||
{
|
||||
transparentPacketHandler(client, snPacket);
|
||||
}
|
||||
|
||||
|
||||
/* Reset the Timer for PINGREQ. */
|
||||
client->updateStatus(snPacket);
|
||||
}
|
||||
|
||||
/*------ Handle Messages form Broker ---------*/
|
||||
else if (ev->getEventType() == EtBrokerRecv)
|
||||
else if ( ev->getEventType() == EtBrokerRecv )
|
||||
{
|
||||
client = ev->getClient();
|
||||
brPacket = ev->getMQTTGWPacket();
|
||||
DEBUGLOG(" PacketHandleTask gets %s %s from the broker.\n", brPacket->getName(), brPacket->getMsgId(msgId));
|
||||
switch (brPacket->getType())
|
||||
|
||||
|
||||
if ( client->isAggregater() )
|
||||
{
|
||||
case CONNACK:
|
||||
_mqttConnection->handleConnack(client, brPacket);
|
||||
break;
|
||||
case PINGRESP:
|
||||
_mqttConnection->handlePingresp(client, brPacket);
|
||||
break;
|
||||
case PUBLISH:
|
||||
_mqttPublish->handlePublish(client, brPacket);
|
||||
break;
|
||||
case PUBACK:
|
||||
_mqttPublish->handlePuback(client, brPacket);
|
||||
break;
|
||||
case PUBREC:
|
||||
_mqttPublish->handleAck(client, brPacket, PUBREC);
|
||||
break;
|
||||
case PUBREL:
|
||||
_mqttPublish->handleAck(client, brPacket, PUBREL);
|
||||
break;
|
||||
case PUBCOMP:
|
||||
_mqttPublish->handleAck(client, brPacket, PUBCOMP);
|
||||
break;
|
||||
case SUBACK:
|
||||
_mqttSubscribe->handleSuback(client, brPacket);
|
||||
break;
|
||||
case UNSUBACK:
|
||||
_mqttSubscribe->handleUnsuback(client, brPacket);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
aggregatePacketHandler(client, brPacket);
|
||||
}
|
||||
else
|
||||
{
|
||||
transparentPacketHandler(client, brPacket);
|
||||
}
|
||||
}
|
||||
delete ev;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void PacketHandleTask::aggregatePacketHandler(Client*client, MQTTSNPacket* packet)
|
||||
{
|
||||
switch (packet->getType())
|
||||
{
|
||||
case MQTTSN_CONNECT:
|
||||
_mqttsnAggrConnection->handleConnect(client, packet);
|
||||
break;
|
||||
case MQTTSN_WILLTOPIC:
|
||||
_mqttsnConnection->handleWilltopic(client, packet);
|
||||
break;
|
||||
case MQTTSN_WILLMSG:
|
||||
_mqttsnAggrConnection->handleWillmsg(client, packet);
|
||||
break;
|
||||
case MQTTSN_DISCONNECT:
|
||||
_mqttsnAggrConnection->handleDisconnect(client, packet);
|
||||
break;
|
||||
case MQTTSN_WILLMSGUPD:
|
||||
_mqttsnConnection->handleWillmsgupd(client, packet);
|
||||
break;
|
||||
case MQTTSN_PINGREQ:
|
||||
_mqttsnAggrConnection->handlePingreq(client, packet);
|
||||
break;
|
||||
case MQTTSN_PUBLISH:
|
||||
_mqttsnPublish->handleAggregatePublish(client, packet);
|
||||
break;
|
||||
case MQTTSN_PUBACK:
|
||||
_mqttsnPublish->handleAggregateAck(client, packet, MQTTSN_PUBACK);
|
||||
break;
|
||||
case MQTTSN_PUBREC:
|
||||
_mqttsnPublish->handleAggregateAck(client, packet, MQTTSN_PUBREC);
|
||||
break;
|
||||
case MQTTSN_PUBREL:
|
||||
_mqttsnPublish->handleAggregateAck(client, packet, MQTTSN_PUBREL);
|
||||
break;
|
||||
case MQTTSN_PUBCOMP:
|
||||
_mqttsnPublish->handleAggregateAck(client, packet, MQTTSN_PUBCOMP);
|
||||
break;
|
||||
case MQTTSN_REGISTER:
|
||||
_mqttsnPublish->handleRegister(client, packet);
|
||||
break;
|
||||
case MQTTSN_REGACK:
|
||||
_mqttsnPublish->handleRegAck(client, packet);
|
||||
break;
|
||||
case MQTTSN_SUBSCRIBE:
|
||||
_mqttsnSubscribe->handleAggregateSubscribe(client, packet);
|
||||
break;
|
||||
case MQTTSN_UNSUBSCRIBE:
|
||||
_mqttsnSubscribe->handleAggregateUnsubscribe(client, packet);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void PacketHandleTask::aggregatePacketHandler(Client*client, MQTTGWPacket* packet)
|
||||
{
|
||||
switch (packet->getType())
|
||||
{
|
||||
case CONNACK:
|
||||
_mqttConnection->handleConnack(client, packet);
|
||||
break;
|
||||
case PINGRESP:
|
||||
_mqttConnection->handlePingresp(client, packet);
|
||||
break;
|
||||
case PUBLISH:
|
||||
_mqttPublish->handleAggregatePublish(client, packet);
|
||||
break;
|
||||
case PUBACK:
|
||||
_mqttPublish->handleAggregatePuback(client, packet);
|
||||
break;
|
||||
case PUBREC:
|
||||
_mqttPublish->handleAggregateAck(client, packet, PUBREC);
|
||||
break;
|
||||
case PUBREL:
|
||||
_mqttPublish->handleAggregatePubrel(client, packet);
|
||||
break;
|
||||
case PUBCOMP:
|
||||
_mqttPublish->handleAggregateAck(client, packet, PUBCOMP);
|
||||
break;
|
||||
case SUBACK:
|
||||
_mqttSubscribe->handleAggregateSuback(client, packet);
|
||||
break;
|
||||
case UNSUBACK:
|
||||
_mqttSubscribe->handleAggregateUnsuback(client, packet);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void PacketHandleTask::transparentPacketHandler(Client*client, MQTTSNPacket* packet)
|
||||
{
|
||||
switch (packet->getType())
|
||||
{
|
||||
case MQTTSN_CONNECT:
|
||||
_mqttsnConnection->handleConnect(client, packet);
|
||||
break;
|
||||
case MQTTSN_WILLTOPIC:
|
||||
_mqttsnConnection->handleWilltopic(client, packet);
|
||||
break;
|
||||
case MQTTSN_WILLMSG:
|
||||
_mqttsnConnection->handleWillmsg(client, packet);
|
||||
break;
|
||||
case MQTTSN_DISCONNECT:
|
||||
_mqttsnConnection->handleDisconnect(client, packet);
|
||||
break;
|
||||
case MQTTSN_WILLMSGUPD:
|
||||
_mqttsnConnection->handleWillmsgupd(client, packet);
|
||||
break;
|
||||
case MQTTSN_PINGREQ:
|
||||
_mqttsnConnection->handlePingreq(client, packet);
|
||||
break;
|
||||
case MQTTSN_PUBLISH:
|
||||
_mqttsnPublish->handlePublish(client, packet);
|
||||
break;
|
||||
case MQTTSN_PUBACK:
|
||||
_mqttsnPublish->handlePuback(client, packet);
|
||||
break;
|
||||
case MQTTSN_PUBREC:
|
||||
_mqttsnPublish->handleAck(client, packet, PUBREC);
|
||||
break;
|
||||
case MQTTSN_PUBREL:
|
||||
_mqttsnPublish->handleAck(client, packet, PUBREL);
|
||||
break;
|
||||
case MQTTSN_PUBCOMP:
|
||||
_mqttsnPublish->handleAck(client, packet, PUBCOMP);
|
||||
break;
|
||||
case MQTTSN_REGISTER:
|
||||
_mqttsnPublish->handleRegister(client, packet);
|
||||
break;
|
||||
case MQTTSN_REGACK:
|
||||
_mqttsnPublish->handleRegAck(client, packet);
|
||||
break;
|
||||
case MQTTSN_SUBSCRIBE:
|
||||
_mqttsnSubscribe->handleSubscribe(client, packet);
|
||||
break;
|
||||
case MQTTSN_UNSUBSCRIBE:
|
||||
_mqttsnSubscribe->handleUnsubscribe(client, packet);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void PacketHandleTask::transparentPacketHandler(Client*client, MQTTGWPacket* packet)
|
||||
{
|
||||
switch (packet->getType())
|
||||
{
|
||||
case CONNACK:
|
||||
_mqttConnection->handleConnack(client, packet);
|
||||
break;
|
||||
case PINGRESP:
|
||||
_mqttConnection->handlePingresp(client, packet);
|
||||
break;
|
||||
case PUBLISH:
|
||||
_mqttPublish->handlePublish(client, packet);
|
||||
break;
|
||||
case PUBACK:
|
||||
_mqttPublish->handlePuback(client, packet);
|
||||
break;
|
||||
case PUBREC:
|
||||
_mqttPublish->handleAck(client, packet, PUBREC);
|
||||
break;
|
||||
case PUBREL:
|
||||
_mqttPublish->handleAck(client, packet, PUBREL);
|
||||
break;
|
||||
case PUBCOMP:
|
||||
_mqttPublish->handleAck(client, packet, PUBCOMP);
|
||||
break;
|
||||
case SUBACK:
|
||||
_mqttSubscribe->handleSuback(client, packet);
|
||||
break;
|
||||
case UNSUBACK:
|
||||
_mqttSubscribe->handleUnsuback(client, packet);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user