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 15:36:51 +01:00
Code Issues Projects Releases Wiki Activity

BugFix of #86

Browse Source 
Fix of warning: comparison between signed and unsigned integer
expressions 


Set a null string to the client ID when it of CONNECT is empty.

Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
This commit is contained in:
tomoaki
2017-09-21 15:59:40 +09:00
committed by tomoaki
parent 98c1ebae50
commit 4935d2aa86
8 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MQTTSNGateway/GatewayTester/src/LGwProxy.h
View File

@@ -19,6 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h>
#include "LMqttsnClientApp.h" #include "LMqttsnClientApp.h"
#include "LNetworkUdp.h" #include "LNetworkUdp.h"
@@ -92,11 +93,11 @@ private:
uint8_t _gwId; uint8_t _gwId;
uint16_t _tkeepAlive; uint16_t _tkeepAlive;
uint32_t _tAdv; uint32_t _tAdv;
uint32_t _sendUTC; time_t _sendUTC;
int _retryCount; int _retryCount;
int _connectRetry; int _connectRetry;
uint8_t _status; uint8_t _status;
uint32_t _pingSendUTC; time_t _pingSendUTC;
uint8_t _pingRetryCount; uint8_t _pingRetryCount;
uint8_t _pingStatus; uint8_t _pingStatus;
LRegisterManager _regMgr; LRegisterManager _regMgr;

3
MQTTSNGateway/GatewayTester/src/LPublishManager.h
View File

@@ -16,6 +16,7 @@
#ifndef PUBLISHMANAGER_H_ #ifndef PUBLISHMANAGER_H_
#define PUBLISHMANAGER_H_ #define PUBLISHMANAGER_H_
#include <time.h>
#include "LMqttsnClientApp.h" #include "LMqttsnClientApp.h"
#include "LTimer.h" #include "LTimer.h"
#include "LTopicTable.h" #include "LTopicTable.h"
@@ -42,7 +43,7 @@ typedef struct PubElement{
const char* topicName; const char* topicName;
uint8_t* payload; uint8_t* payload;
uint16_t payloadlen; uint16_t payloadlen;
uint32_t sendUTC; time_t sendUTC;
int (*callback)(void); int (*callback)(void);
int retryCount; int retryCount;
int taskIndex; int taskIndex;

3
MQTTSNGateway/GatewayTester/src/LRegisterManager.h
View File

@@ -17,6 +17,7 @@
#ifndef REGISTERQUE_H_ #ifndef REGISTERQUE_H_
#define REGISTERQUE_H_ #define REGISTERQUE_H_
#include <time.h>
#include "LMqttsnClientApp.h" #include "LMqttsnClientApp.h"
namespace linuxAsyncClient { namespace linuxAsyncClient {
@@ -27,7 +28,7 @@ typedef struct RegQueElement{
const char* topicName; const char* topicName;
uint16_t msgId; uint16_t msgId;
int retryCount; int retryCount;
uint32_t sendUTC; time_t sendUTC;
RegQueElement* prev; RegQueElement* prev;
RegQueElement* next; RegQueElement* next;
}RegQueElement; }RegQueElement;

3
MQTTSNGateway/GatewayTester/src/LSubscribeManager.h
View File

@@ -19,6 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h>
#include "LMqttsnClientApp.h" #include "LMqttsnClientApp.h"
#include "LRegisterManager.h" #include "LRegisterManager.h"
@@ -33,7 +34,7 @@ typedef struct SubElement{
TopicCallback callback; TopicCallback callback;
const char* topicName; const char* topicName;
uint16_t msgId; uint16_t msgId;
uint32_t sendUTC; time_t sendUTC;
uint16_t topicId; uint16_t topicId;
uint8_t msgType; uint8_t msgType;
uint8_t topicType; uint8_t topicType;

5
MQTTSNGateway/GatewayTester/src/LTaskManager.h
View File

@@ -19,6 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h>
#include "LMqttsnClientApp.h" #include "LMqttsnClientApp.h"
#include "LTimer.h" #include "LTimer.h"
@@ -29,8 +30,8 @@ namespace linuxAsyncClient {
struct TaskList{ struct TaskList{
void (*callback)(void); void (*callback)(void);
uint32_t interval; time_t interval;
uint32_t prevTime; time_t prevTime;
uint8_t count; uint8_t count;
}; };

4
MQTTSNGateway/GatewayTester/src/LTimer.cpp
View File

@@ -16,10 +16,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include "LMqttsnClientApp.h" #include "LMqttsnClientApp.h"
#include "LTimer.h" #include "LTimer.h"
using namespace std; //using namespace std;
using namespace linuxAsyncClient; using namespace linuxAsyncClient;
/*===================================== /*=====================================

2
MQTTSNGateway/GatewayTester/src/LTimer.h
View File

@@ -17,7 +17,7 @@
#ifndef TIMER_H_ #ifndef TIMER_H_
#define TIMER_H_ #define TIMER_H_
#include <sys/time.h> #include <time.h>
#include "LMqttsnClientApp.h" #include "LMqttsnClientApp.h"

10
MQTTSNGateway/src/MQTTSNGWClient.cpp
View File

@@ -227,6 +227,16 @@ Client* ClientList::createClient(SensorNetAddress* addr, MQTTSNString* clientId,
{ {
client->setClientId(*clientId); client->setClientId(*clientId);
} }
else
{
MQTTSNString dummyId;
char* id = (char*)malloc(1);
*id = 0;
dummyId.cstring = id;
dummyId.lenstring.len = 0;
client->setClientId(dummyId);
free(id);
}
/* add the list */ /* add the list */
if ( _firstClient == 0 ) if ( _firstClient == 0 )