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

Merge pull request #21 from ty4tw/gateway

Browse Source 
BugFix:   can't receive and send PINGREQ
This commit is contained in:
Ian Craggs
2016-08-09 21:31:43 +01:00
committed by GitHub
parent e05a48e9a9 428d5e8003
commit 50f91233d4
10 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MQTTSNGateway/param.conf
View File

@@ -13,7 +13,7 @@ KeepAlive=900
#Password=
# UDP
GatewayPortNo=2000
GatewayPortNo=10000
MulticastIP=225.1.1.1
MulticastPortNo=1883

4
MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
View File

@@ -187,10 +187,10 @@ int BrokerRecvTask::log(Client* client, MQTTGWPacket* packet)
break;
case SUBACK:
case UNSUBACK:
WRITELOG(FORMAT_YE_GR_MSGID, currentDateTime(), packet->getName(), packet->getMsgId(msgId), LEFTARROW, client->getClientId(), packet->print(pbuf));
WRITELOG(FORMAT_GR_MSGID, currentDateTime(), packet->getName(), packet->getMsgId(msgId), LEFTARROW, client->getClientId(), packet->print(pbuf));
break;
case PINGRESP:
WRITELOG(FORMAT_GR_NL, currentDateTime(), packet->getName(), LEFTARROW, client->getClientId(), packet->print(pbuf));
WRITELOG(FORMAT_YE_GR, currentDateTime(), packet->getName(), LEFTARROW, client->getClientId(), packet->print(pbuf));
break;
default:
rc = -1;

4
MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp
View File

@@ -151,10 +151,10 @@ void BrokerSendTask::log(Client* client, MQTTGWPacket* packet)
WRITELOG(FORMAT_WH_GR_MSGID, currentDateTime(), packet->getName(), packet->getMsgId(msgId), RIGHTARROW, client->getClientId(), packet->print(pbuf));
break;
case PINGREQ:
WRITELOG(FORMAT_YE, currentDateTime(), packet->getName(), RIGHTARROW, client->getClientId(), packet->print(pbuf));
WRITELOG(FORMAT_YE_GR, currentDateTime(), packet->getName(), RIGHTARROW, client->getClientId(), packet->print(pbuf));
break;
case DISCONNECT:
WRITELOG(FORMAT_YE, currentDateTime(), packet->getName(), RIGHTARROW, client->getClientId(), packet->print(pbuf));
WRITELOG(FORMAT_YE_GR, currentDateTime(), packet->getName(), RIGHTARROW, client->getClientId(), packet->print(pbuf));
break;
default:
break;

4
MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
View File

@@ -58,7 +58,7 @@ void ClientRecvTask::run()
MQTTSNPacket* packet = new MQTTSNPacket();
int packetLen = packet->recv(_sensorNetwork);
if (packetLen < 3 )
if (packetLen < 2 )
{
delete packet;
continue;
@@ -163,7 +163,7 @@ void ClientRecvTask::log(Client* client, MQTTSNPacket* packet)
WRITELOG(FORMAT_WH_MSGID, currentDateTime(), packet->getName(), packet->getMsgId(msgId), LEFTARROW, clientId, packet->print(pbuf));
break;
case MQTTSN_PINGREQ:
WRITELOG(FORMAT_WH_NL, currentDateTime(), packet->getName(), LEFTARROW, clientId, packet->print(pbuf));
WRITELOG(FORMAT_YE_WH_NL, currentDateTime(), packet->getName(), LEFTARROW, clientId, packet->print(pbuf));
break;
default:
WRITELOG(FORMAT_WH_NL, currentDateTime(), packet->getName(), LEFTARROW, clientId, packet->print(pbuf));

2
MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp
View File

@@ -97,7 +97,7 @@ void ClientSendTask::log(Client* client, MQTTSNPacket* packet)
WRITELOG(FORMAT_GR_WH_MSGID, currentDateTime(), packet->getName(), packet->getMsgId(msgId), RIGHTARROW, client->getClientId(), packet->print(pbuf));
break;
case MQTTSN_PINGRESP:
WRITELOG(FORMAT_CY, currentDateTime(), packet->getName(), RIGHTARROW, client->getClientId(), packet->print(pbuf));
WRITELOG(FORMAT_YE_WH, currentDateTime(), packet->getName(), RIGHTARROW, client->getClientId(), packet->print(pbuf));
break;
default:
break;

5
MQTTSNGateway/src/MQTTSNGWConnectionHandler.cpp
View File

@@ -246,6 +246,7 @@ void MQTTSNConnectionHandler::handlePingreq(Client* client, MQTTSNPacket* packet
/* send PINGREQ to the broker */
MQTTGWPacket* pingreq = new MQTTGWPacket();
pingreq->setHeader(PINGREQ);
Event* ev1 = new Event();
ev1->setBrokerSendEvent(client, pingreq);
Event* evt = new Event();
evt->setBrokerSendEvent(client, pingreq);
_gateway->getBrokerSendQue()->post(evt);
}

4
MQTTSNGateway/src/MQTTSNGWDefines.h
View File

@@ -23,14 +23,14 @@ namespace MQTTSNGW
/*=================================
* Starting prompt
==================================*/
#define GATEWAY_VERSION "(Ver 0.2.0)"
#define GATEWAY_VERSION "(Ver 0.2.1)"
/*=================================
* Log controls
==================================*/
//#define DEBUG // print out log for debug
//#define RINGBUFFER // print out Packets log into shared memory
//#define DEBUG_NWSTACK // print out SensorNetwork log
/*=================================
* Parametrs
==================================*/

2
MQTTSNGateway/src/MQTTSNGWPacket.cpp
View File

@@ -78,7 +78,7 @@ int MQTTSNPacket::recv(SensorNetwork* network)
{
uint8_t buf[MQTTSNGW_MAX_PACKET_SIZE];
int len = network->read((uint8_t*) buf, MQTTSNGW_MAX_PACKET_SIZE);
if (len >= 3)
if (len > 1)
{
len = desirialize(buf, len);
}

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

@@ -276,7 +276,7 @@ int UDPPort::unicast(const uint8_t* buf, uint32_t length, SensorNetAddress* addr
{
D_NWSTACK("errno == %d in UDPPort::sendto\n", errno);
}
D_NWSTACK("sendto %s:%u length = %d\n", inet_ntoa(dest.sin_addr), htons(addr->getPortNo()), status);
D_NWSTACK("sendto %s:%u length = %d\n", inet_ntoa(dest.sin_addr), ntohs(dest.sin_port), status);
return status;
}
@@ -289,6 +289,7 @@ int UDPPort::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr)
{
fd_set recvfds;
int maxSock = 0;
int rc = 0;
FD_ZERO(&recvfds);
FD_SET(_sockfdUnicast, &recvfds);
@@ -307,13 +308,13 @@ int UDPPort::recv(uint8_t* buf, uint16_t len, SensorNetAddress* addr)
if (FD_ISSET(_sockfdUnicast, &recvfds))
{
return recvfrom(_sockfdUnicast, buf, len, 0, addr);
rc = recvfrom(_sockfdUnicast, buf, len, 0, addr);
}
else if (FD_ISSET(_sockfdMulticast, &recvfds))
{
return recvfrom(_sockfdMulticast, buf, len, 0, &_grpAddr);
rc = recvfrom(_sockfdMulticast, buf, len, 0, &_grpAddr);
}
return 0;
return rc;
}
int UDPPort::recvfrom(int sockfd, uint8_t* buf, uint16_t len, uint8_t flags, SensorNetAddress* addr)
@@ -330,7 +331,7 @@ int UDPPort::recvfrom(int sockfd, uint8_t* buf, uint16_t len, uint8_t flags, Sen
return -1;
}
addr->setAddress(sender.sin_addr.s_addr, sender.sin_port);
D_NWSTACK("recved from %s:%d length = %d\n", inet_ntoa(sender.sin_addr), htons(addr->getPortNo()), status);
D_NWSTACK("recved from %s:%d length = %d\n", inet_ntoa(sender.sin_addr),ntohs(sender.sin_port), status);
return status;
}

4
MQTTSNPacket/src/MQTTSNPacket.c
View File

@@ -64,9 +64,9 @@ int MQTTSNPacket_encode(unsigned char* buf, int length)
FUNC_ENTRY;
if (length > 255)
{
buf[rc++] = 0x01;
writeChar(&buf, 0x01);
writeInt(&buf, length);
rc += 2;
rc += 3;
}
else
buf[rc++] = length;