From 4bb23da006f050c6014156c9aab675f37dda906a Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 15 Nov 2025 01:48:22 +0800
Subject: [PATCH] update thingsboard and test okay
---
/dev/null | 69 --------
project/thingsboard/thingsboard.c | 244 ++++++++++++------------------
project/thingsboard/etc/thingsboard.conf | 62 +++++++
.gitignore | 4
project/modules/sht20.c | 4
project/thingsboard/config.c | 26 +-
project/thingsboard/config.h | 11
project/thingsboard/makefile | 2
project/thingsboard/.gitignore | 0
9 files changed, 188 insertions(+), 234 deletions(-)
diff --git a/.gitignore b/.gitignore
index bf25ebe..005a0ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,7 @@
project/*/booster
project/*/modules
project/*/openlibs
+
+# binary file
+project/gpsd/gpsd
+project/thingsboard/thingsboard
diff --git a/project/modules/sht20.c b/project/modules/sht20.c
index 22a2ac6..8250d03 100644
--- a/project/modules/sht20.c
+++ b/project/modules/sht20.c
@@ -90,7 +90,7 @@
memset(buf, 0, sizeof(buf));
i2c_read(fd, SHT20_I2CADDR, buf, 3);
- log_dump(LOG_LEVEL_DEBUG, "Temperature sample data: ", buf, 3);
+ log_dump(LOG_LEVEL_TRACE, "Temperature sample data: ", buf, 3);
if( !sht20_checksum(buf, 2, buf[2]) )
{
@@ -113,7 +113,7 @@
memset(buf, 0, sizeof(buf));
i2c_read(fd, SHT20_I2CADDR, buf, 3);
- log_dump(LOG_LEVEL_DEBUG, "Relative humidity sample data: ", buf, 3);
+ log_dump(LOG_LEVEL_TRACE, "Relative humidity sample data: ", buf, 3);
if( !sht20_checksum(buf, 2, buf[2]) )
{
diff --git a/project/mosquitto/etc/mqttd.conf b/project/mosquitto/etc/mqttd.conf
deleted file mode 100644
index 50fcffa..0000000
--- a/project/mosquitto/etc/mqttd.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-[common]
-devid="RPi3B#01"
-
-# 树莓派连接的外设信息，0:禁用或未连接 其他: 使能或相关硬件连接的Pin管脚(wPI模式)
-[hardware]
-
-# 是否使能继电器模块，0:禁用 1:使能
-relay=1
-
-# 是否使能 PWM 蜂鸣器模块，0:禁用 N:Beep 次数
-beep=3
-
-# 是否使能 RGB 三色灯模块，0:禁用 1:使能
-rgbled=1
-
-# 是否使能 DS18b20 温度传感器模块，0:禁用 1:使能
-ds18b20=1
-
-# 是否使能 SHT2X 温湿度传感器模块，0:禁用 1:使能
-sht2x=1
-
-# 是否使能 TSL2561 光强传感器模块，0:禁用 1:使能
-lux=1
-
-[logger]
-
-# 日志记录文件
-file=/tmp/mqttd.log
-
-# 日志级别: 0:ERROR 1:WARN 2:INFO 3:DEBUG 4:TRACE
-level=2
-
-# 日志回滚大小
-size=1024
-
-
-[broker]
-
-# broker 服务器地址和端口号
-hostname="main.iot-yun.club"
-port=10883
-
-# broker 认证连接的用户名和密码
-username="lingyun"
-password="lingyun"
-
-# broker给subsciber和publisher发送PING报文保持 keepalive 的时间周期，单位是秒
-keepalive=30
-
-# Qos0: 发送者只发送一次消息，不进行重试，Broker不会返回确认消息。在Qos0情况下，Broker可能没有接受到消息
-# Qos1: 发送者最少发送一次消息，确保消息到达Broker，Broker需要返回确认消息PUBACK。在Qos1情况下，Broker可能接受到重复消息
-# Qos2: Qos2使用两阶段确认来保证消息的不丢失和不重复。在Qos2情况下，Broker肯定会收到消息，且只收到一次
-
-[publisher]
-
-# mosquitto_sub -h main.iot-yun.club -p 10883 -u lingyun -P lingyun -t \$Sys/Studio/Uplink
-pubTopic="$Sys/Studio/Uplink"
-pubQos=0
-
-# Publisher上报传感器数据的周期，单位是秒
-interval=60
-
-[subsciber]
-
-# mosquitto_pub -h main.iot-yun.club -p 10883 -u lingyun -P lingyun -t \$Sys/Studio/Downlink -m '{"id":"RPi3B#01", "light":"on", "buzzer":"on"}'
-# mosquitto_pub -h main.iot-yun.club -p 10883 -u lingyun -P lingyun -t \$Sys/Studio/Downlink -m '{"id":"RPi3B#01", "leds":[{"red":"on","green":"off","blue":"on"}]}'
-subTopic="$Sys/Studio/Downlink"
-subQos=0
-
diff --git a/project/mosquitto/.gitignore b/project/thingsboard/.gitignore
similarity index 100%
rename from project/mosquitto/.gitignore
rename to project/thingsboard/.gitignore
diff --git a/project/mosquitto/conf.c b/project/thingsboard/config.c
similarity index 93%
rename from project/mosquitto/conf.c
rename to project/thingsboard/config.c
index 4c0ee20..8471e81 100644
--- a/project/mosquitto/conf.c
+++ b/project/thingsboard/config.c
@@ -2,28 +2,27 @@
* Copyright: (C) 2019 LingYun IoT System Studio
* All rights reserved.
*
- * Filename: conf.c
+ * Filename: config.c
* Description: This file is mqttd configure file parser function
- *
+ *
* Version: 1.0.0(2019年06月25日)
* Author: Guo Wenxue <guowenxue@gmail.com>
* ChangeLog: 1, Release initial version on "2019年06月25日 22时23分55秒"
- *
+ *
********************************************************************************/
-#include "conf.h"
+#include "config.h"
#include "logger.h"
#include "iniparser.h"
-
int mqttd_parser_conf(const char *conf_file, mqtt_ctx_t *ctx, int debug)
{
dictionary *ini;
const char *str;
- int val;
- int rv = 0;
+ int val;
+ int rv = 0;
if( !conf_file || !ctx )
- {
+ {
fprintf(stderr, "%s() Invalid input arguments\n", __func__);
return -1;
}
@@ -40,9 +39,9 @@
/*+------------------------------------------------------+
*| parser logger settings and start logger system |
*+------------------------------------------------------+*/
- if( !debug )
+ if( !debug )
{
- str = iniparser_getstring(ini, "logger:file", "/tmp/mqttd.log");
+ str = iniparser_getstring(ini, "logger:file", "/tmp/thingsboard.log");
strncpy(ctx->logfile, str, sizeof(ctx->logfile));
ctx->logsize = iniparser_getint(ini, "logger:size", 1024);
ctx->loglevel = iniparser_getint(ini, "logger:level", LOG_LEVEL_INFO);
@@ -54,7 +53,7 @@
ctx->logsize = 0;
}
- if( log_open(ctx->logfile, ctx->loglevel, ctx->logsize, LOG_LOCK_DISABLE) < 0 )
+ if( log_open(ctx->logfile, ctx->loglevel, ctx->logsize, LOG_LOCK_DISABLE) < 0 )
{
fprintf(stderr, "Logger system initialise failure\n");
return -2;
@@ -136,7 +135,7 @@
}
strncpy(ctx->host, str, sizeof(ctx->host) );
- if( (val=iniparser_getint(ini, "broker:port", -1)) < 0 )
+ if( (val=iniparser_getint(ini, "broker:port", -1)) < 0 )
{
log_error("ERROR: Parser MQTT broker server port failure\n");
rv = -5;
@@ -145,6 +144,9 @@
ctx->port = val;
log_info("Parser MQTT broker server [%s:%d]\n", ctx->host, ctx->port);
+ str=iniparser_getstring(ini, "broker:token", NULL);
+ strncpy(ctx->token, str, sizeof(ctx->uid) );
+
str=iniparser_getstring(ini, "broker:username", NULL);
strncpy(ctx->uid, str, sizeof(ctx->uid) );
diff --git a/project/mosquitto/conf.h b/project/thingsboard/config.h
similarity index 95%
rename from project/mosquitto/conf.h
rename to project/thingsboard/config.h
index 89d3a66..8cf4e2e 100644
--- a/project/mosquitto/conf.h
+++ b/project/thingsboard/config.h
@@ -2,13 +2,13 @@
* Copyright: (C) 2019 LingYun IoT System Studio
* All rights reserved.
*
- * Filename: conf.h
+ * Filename: config.h
* Description: This file is mqttd configure file parser function
- *
+ *
* Version: 1.0.0(2019年06月25日)
* Author: Guo Wenxue <guowenxue@gmail.com>
* ChangeLog: 1, Release initial version on "2019年06月25日 22时23分55秒"
- *
+ *
********************************************************************************/
#ifndef __CONF_H_
#define __CONF_H_
@@ -24,7 +24,7 @@
#define DEF_PUBINTERVAL 120
#define DEF_QOS Qos2
-typedef struct hwconf_s
+typedef struct hwconf_s
{
int relay; /* relay aviable or not. 0:Disable 1: Enable */
int led; /* RGB led aviable or not. 0:Disable 1: Enable */
@@ -32,7 +32,7 @@
int ds18b20; /* DS1B820 aviable or not. 0:Disable 1: Enable */
int sht2x; /* SHT20 aviable or not. 0:Disable 1: Enable */
int tsl2561; /* TSL2561 aviable or not. 0:Disable 1: Enable */
-} hwconf_t;
+} hwconf_t;
typedef struct mqtt_ctx_s
@@ -52,6 +52,7 @@
int port; /* MQTT broker listen port */
char uid[64]; /* username */
char pwd[64]; /* password */
+ char token[64]; /* token */
int keepalive; /* MQTT broker send PING message to subsciber/publisher keepalive timeout<seconds> */
/* Publisher settings */
diff --git a/project/thingsboard/etc/thingsboard.conf b/project/thingsboard/etc/thingsboard.conf
new file mode 100644
index 0000000..26339d6
--- /dev/null
+++ b/project/thingsboard/etc/thingsboard.conf
@@ -0,0 +1,62 @@
+[common]
+devid="raspberrypi4b"
+
+# 树莓派连接的外设信息，0:禁用或未连接 其他: 使能或相关硬件连接的Pin管脚(wPI模式)
+[hardware]
+
+# 是否使能 RGB 三色灯模块，0:禁用 1:使能
+rgbled=1
+
+# 是否使能 SHT2X 温湿度传感器模块，0:禁用 1:使能
+sht2x=1
+
+[logger]
+
+# 日志记录文件
+file=/tmp/thingsboard.log
+
+# 日志级别: 0:ERROR 1:WARN 2:INFO 3:DEBUG 4:TRACE
+level=2
+
+# 日志回滚大小
+size=1024
+
+
+[broker]
+
+# broker 服务器地址和端口号
+hostname="weike-iot.com"
+port=2262
+
+# broker 认证连接的 token
+token="l3ie6juxf0t9wn8kjsk4"
+
+# broker 认证连接的用户名和密码
+username="lingyun"
+password="lingyun"
+
+
+
+# broker给subsciber和publisher发送PING报文保持 keepalive 的时间周期，单位是秒
+keepalive=30
+
+# Qos0: 发送者只发送一次消息，不进行重试，Broker不会返回确认消息。在Qos0情况下，Broker可能没有接受到消息
+# Qos1: 发送者最少发送一次消息，确保消息到达Broker，Broker需要返回确认消息PUBACK。在Qos1情况下，Broker可能接受到重复消息
+# Qos2: Qos2使用两阶段确认来保证消息的不丢失和不重复。在Qos2情况下，Broker肯定会收到消息，且只收到一次
+
+[publisher]
+
+# mosquitto_pub -h weike-iot.com -p 2262 -t v1/devices/me/telemetry -i "raspberrypi4b" -u "l3ie6juxf0t9wn8kjsk4" -m '{"temperature":28.55, "humidity":70.65}'
+pubTopic="v1/devices/me/telemetry"
+pubQos=0
+
+# Publisher上报传感器数据的周期，单位是秒
+interval=60
+
+[subsciber]
+
+# mosquitto_sub -h weike-iot.com -p 2262 -u "l3ie6juxf0t9wn8kjsk4" -t "v1/devices/me/rpc/request/+"
+# {"method":"setValue","params":{"device":"RedLed","status":true}}
+subTopic="v1/devices/me/rpc/request/+"
+subQos=0
+
diff --git a/project/mosquitto/makefile b/project/thingsboard/makefile
similarity index 98%
rename from project/mosquitto/makefile
rename to project/thingsboard/makefile
index c716ebb..796bb6c 100644
--- a/project/mosquitto/makefile
+++ b/project/thingsboard/makefile
@@ -12,7 +12,7 @@
#*******************************************************************************
PRJ_PATH=$(shell pwd)
-APP_NAME = mqttd
+APP_NAME = thingsboard
BUILD_ARCH=$(shell uname -m)
ifneq ($(findstring $(BUILD_ARCH), "x86_64" "i386"),)
diff --git a/project/mosquitto/main.c b/project/thingsboard/thingsboard.c
similarity index 62%
rename from project/mosquitto/main.c
rename to project/thingsboard/thingsboard.c
index 31d8fd7..bfba740 100644
--- a/project/mosquitto/main.c
+++ b/project/thingsboard/thingsboard.c
@@ -24,11 +24,12 @@
#include "logger.h"
#include "util_proc.h"
-#include "modules.h"
-#include "conf.h"
+#include "config.h"
+#include "sht20.h"
+#include "leds.h"
#define PROG_VERSION "v1.0.0"
-#define DAEMON_PIDFILE "/tmp/.mqtt.pid"
+#define DAEMON_PIDFILE "/tmp/.thingsboard.pid"
void *mqtt_sub_worker(void *args);
void *mqtt_pub_worker(void *args);
@@ -54,7 +55,7 @@
int daemon = 1;
pthread_t tid;
mqtt_ctx_t ctx;
- char *conf_file=NULL;
+ char *conf_file="/etc/mqttd.conf";
int debug = 0;
int opt;
char *progname=NULL;
@@ -69,7 +70,7 @@
progname = (char *)basename(argv[0]);
- /* Parser the command line parameters */
+ /* parser the command line parameters */
while ((opt = getopt_long(argc, argv, "c:dvh", long_options, NULL)) != -1)
{
switch (opt)
@@ -100,19 +101,24 @@
if( !conf_file )
debug = 1;
+ /* parser configure file */
if( mqttd_parser_conf(conf_file, &ctx, debug)<0 )
{
fprintf(stderr, "Parser mqtted configure file failure\n");
return -2;
}
+ /* install signal proc handler */
install_default_signal();
+ /* check program already running or not, if already running then exit, or set running as daemon */
if( check_set_program_running(daemon, DAEMON_PIDFILE) < 0 )
goto cleanup;
+ /* initial mosquitto library */
mosquitto_lib_init();
+ /* create MQTT subsciber thread */
if( thread_start(&tid, mqtt_sub_worker, &ctx ) < 0 )
{
log_error("Start MQTT subsciber worker thread failure\n");
@@ -120,6 +126,7 @@
}
log_info("Start MQTT subsciber worker thread ok\n");
+ /* create MQTT publisher thread */
if( thread_start(&tid, mqtt_pub_worker, &ctx) < 0 )
{
log_error("Start MQTT publisher worker thread failure\n");
@@ -157,38 +164,14 @@
log_info("Publisher connect to broker server[%s:%d] successfully\n", ctx->host, ctx->port);
log_debug("Publish topic '%s'\n", ctx->pubTopic);
- if( ctx->hwconf.ds18b20 )
- {
- memset(msg, 0, sizeof(msg));
-
- log_debug("DS18B20 temperature sensor enabled, start broadcast it\n");
-
- if( ds18b20_get_temperature(&temp) < 0 )
- snprintf(msg, sizeof(msg), "{ \"id\":%s, \"temp\":\"error\" }", ctx->devid);
- else
- snprintf(msg, sizeof(msg), "{ \"id\":%s, \"temp\":\"%.2f\" }", ctx->devid, temp);
-
- rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg), msg, ctx->pubQos, retain);
- if( rv )
- {
- log_error("Publisher broadcast message '%s' failure: %d\n", msg, rv);
- }
- else
- {
- log_info("Publisher broadcast message '%s' ok\n", msg);
- }
- }
-
if( ctx->hwconf.sht2x )
{
memset(msg, 0, sizeof(msg));
log_debug("SHT2X temperature and humidity sensor enabled, start broadcast it\n");
- if( sht2x_get_temp_humidity(&temp, &rh) < 0 )
- snprintf(msg, sizeof(msg), "{ \"id\":%s, \"temp\":\"error\", \"RH\":\"error\" }", ctx->devid);
- else
- snprintf(msg, sizeof(msg), "{ \"id\":%s, \"temp\":\"%.2f\", \"RH\":\"%.2f\" }", ctx->devid, temp, rh);
+ if( 0 == sht2x_get_temp_humidity(&temp, &rh) )
+ snprintf(msg, sizeof(msg), "{\"temperature\":%.2f, \"humidity\":%.2f}", temp, rh);
rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg), msg, ctx->pubQos, retain);
if( rv )
@@ -201,6 +184,7 @@
}
}
+ msleep(500);
log_info("Publisher broadcast over and disconnect broker now\n", ctx->host, ctx->port);
mosquitto_disconnect(mosq);
@@ -214,17 +198,24 @@
struct mosquitto *mosq;
bool session = true;
-
- mosq = mosquitto_new(NULL, session, ctx);
+ mosq = mosquitto_new(ctx->devid, session, ctx);
if( !mosq )
{
log_error("mosquitto_new failure\n");
return NULL;
}
- /* set connnect to broker username and password */
- if( strlen(ctx->uid)> 0 && strlen(ctx->pwd)> 0 )
+ /* connnect to broker by token or uid/pwd */
+ if( strlen(ctx->token ) > 0)
+ {
+ log_info("Using token authentication\n");
+ mosquitto_username_pw_set(mosq, ctx->token, NULL);
+ }
+ else if( strlen(ctx->uid)> 0 && strlen(ctx->pwd)> 0 )
+ {
+ log_info("Using username/password authentication\n");
mosquitto_username_pw_set(mosq, ctx->uid, ctx->pwd);
+ }
/* set callback functions */
mosquitto_connect_callback_set(mosq, pub_connect_callback);
@@ -271,101 +262,74 @@
log_warn("Subscriber disconnect to broker server[%s:%d], reason=%d\n", ctx->host, ctx->port, result);
}
-static inline void mqtt_turn_led(int which, char *cmd)
-{
- if( strcasestr(cmd, "on") )
- turn_led(which, ON);
- else if( strcasestr(cmd, "off") )
- turn_led(which, OFF);
-}
-
void proc_json_items(cJSON *root, mqtt_ctx_t *ctx)
{
- int i;
- char *value;
- cJSON *item;
- cJSON *array;
- hwconf_t *hwconf = &ctx->hwconf;
+ cJSON *item_method;
+ cJSON *item_params;
+ cJSON *item_device;
+ cJSON *item_status;
- if( !root )
+ char *method;
+ char *device;
+ int status;
+
+ /* 获取 method 字段 */
+ item_method = cJSON_GetObjectItem(root, "method");
+ if (item_method == NULL || !cJSON_IsString(item_method))
{
- log_error("Invalid input arguments $root\n");
- return ;
+ printf("JSON missing method\n");
+ return;
+ }
+ method = item_method->valuestring;
+
+ /* 只处理 setValue 命令 */
+ if (strcmp(method, "setValue") != 0)
+ {
+ printf("Ignore method: %s\n", method);
+ return;
}
- for( i=0; i<cJSON_GetArraySize(root); i++ )
+ /* 获取 params 对象 */
+ item_params = cJSON_GetObjectItem(root, "params");
+ if (item_params == NULL || !cJSON_IsObject(item_params))
{
- item = cJSON_GetArrayItem(root, i);
- if( !item )
- break;
-
- /* if item is cJSON_Object, then recursive call proc_json */
- if( cJSON_Object == item->type )
- {
- proc_json_items(item, ctx);
- }
- else if( cJSON_Array == item->type )
- {
- /* RGB colors led control: {"id":"RPi3B#01", "leds":[{"red":"on","green":"off","blue":"on"}]} */
- if( hwconf->led && !strcasecmp(item->string, "leds") )
- {
- array = cJSON_GetArrayItem(item, 0);
- if( NULL != array )
- {
- cJSON *led_item;
-
- if( NULL != (led_item=cJSON_GetObjectItem(array , "red")) )
- {
- log_info("turn red led '%s'\n", led_item->valuestring);
- mqtt_turn_led(LED_R, led_item->valuestring);
- }
-
- if( NULL != (led_item=cJSON_GetObjectItem(array , "green")) )
- {
- log_info("turn green led '%s'\n", led_item->valuestring);
- mqtt_turn_led(LED_G, led_item->valuestring);
- }
-
- if( NULL != (led_item=cJSON_GetObjectItem(array , "blue")) )
- {
- log_info("turn blue led '%s'\n", led_item->valuestring);
- mqtt_turn_led(LED_B, led_item->valuestring);
- }
- }
- }
- }
- else
- {
- value = cJSON_Print(item);
-
- /* light controled by relay: {"id":"RPi3B#01", "light":"on"} */
- if( hwconf->relay && !strcasecmp(item->string, "light") )
- {
- if( strcasestr(value, "on") )
- {
- log_info("Turn light on\n");
- turn_relay(RELAY1, ON);
- }
- else if( strcasestr(value, "off") )
- {
- log_info("Turn light off\n");
- turn_relay(RELAY1, OFF);
- }
- }
-
- /* buzzer controled : {"id":"RPi3B#01", "buzzer":"on"} */
- if( hwconf->beeper && !strcasecmp(item->string, "buzzer") )
- {
- if( strcasestr(value, "on") )
- {
- turn_beep(3);
- }
- }
-
- free(value); /* must free it, or it will result memory leak */
- }
+ printf("JSON missing params\n");
+ return;
}
+ /* 获取 params.device */
+ item_device = cJSON_GetObjectItem(item_params, "device");
+ if (item_device == NULL || !cJSON_IsString(item_device))
+ {
+ printf("JSON missing params.device\n");
+ return;
+ }
+ device = item_device->valuestring;
+
+ /* 获取 params.status (布尔值) */
+ item_status = cJSON_GetObjectItem(item_params, "status");
+ if (item_status == NULL || !(cJSON_IsBool(item_status)))
+ {
+ printf("JSON missing params.status\n");
+ return;
+ }
+ status = cJSON_IsTrue(item_status) ? ON : OFF;
+
+ /* 映射 LED 名称并调用控制函数 */
+ if (strcmp(device, "RedLed") == 0)
+ {
+ turn_led(LED_R, status);
+ }
+ else if (strcmp(device, "GreenLed") == 0)
+ {
+ turn_led(LED_G, status);
+ }
+ else if (strcmp(device, "BlueLed") == 0)
+ {
+ turn_led(LED_B, status);
+ }
+
+ return;
}
void sub_message_callback(struct mosquitto *mosq, void *userdata, const struct mosquitto_message *message)
@@ -373,8 +337,6 @@
mqtt_ctx_t *ctx = (mqtt_ctx_t *)userdata;
cJSON *root = NULL;
- cJSON *item;
- char *value;
if ( !message->payloadlen )
{
@@ -391,27 +353,11 @@
return ;
}
- item = cJSON_GetObjectItem(root, "id");
- if( !item )
- {
- log_error("cJSON_Parse get ID failure: %s\n", cJSON_GetErrorPtr());
- goto cleanup;
- }
-
- value = cJSON_PrintUnformatted(item);
- if( strcasecmp(value, ctx->devid) )
- {
- free(value);
- goto cleanup;
- }
-
- free(value);
- log_info("Subscriber receive message: '%s'\n", message->payload);
-
proc_json_items(root, ctx);
-cleanup:
- cJSON_Delete(root); /* must delete it, or it will result memory leak */
+ /* must delete it, or it will result memory leak */
+ cJSON_Delete(root);
+
return ;
}
@@ -422,16 +368,24 @@
struct mosquitto *mosq;
bool session = true;
- mosq = mosquitto_new(NULL, session, ctx);
+ mosq = mosquitto_new(ctx->devid, session, ctx);
if( !mosq )
{
log_error("mosquitto_new failure\n");
return NULL;
}
- /* set connnect to broker username and password */
- if( strlen(ctx->uid)> 0 && strlen(ctx->pwd)> 0 )
+ /* connnect to broker by token or uid/pwd */
+ if( strlen(ctx->token ) > 0)
+ {
+ log_info("Using token authentication\n");
+ mosquitto_username_pw_set(mosq, ctx->token, NULL);
+ }
+ else if( strlen(ctx->uid)> 0 && strlen(ctx->pwd)> 0 )
+ {
+ log_info("Using username/password authentication\n");
mosquitto_username_pw_set(mosq, ctx->uid, ctx->pwd);
+ }
/* set callback functions */
mosquitto_connect_callback_set(mosq, sub_connect_callback);
--
Gitblit v1.9.1