From a574ce7edf7f31847be882f9f08dcd1ab8e5ebe0 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Tue, 18 Nov 2025 16:00:47 +0800
Subject: [PATCH] update lightd and thingsboard
---
project/lightd/config.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/project/lightd/config.c b/project/lightd/config.c
index a763d2e..c33dd7e 100644
--- a/project/lightd/config.c
+++ b/project/lightd/config.c
@@ -3,7 +3,7 @@
* All rights reserved.
*
* Filename: config.c
- * Description: This file is mqttd configure file parser function
+ * Description: This file is lightd configure file parser function
*
* Version: 1.0.0(2019年06月25日)
* Author: Guo Wenxue <guowenxue@gmail.com>
@@ -86,7 +86,7 @@
goto cleanup;
}
/* cJSON parser ID will get "" */
- snprintf(mqtt->devid, sizeof(mqtt->devid), "\"%s\"", str);
+ strncpy(mqtt->devid, str, sizeof(mqtt->devid));
log_info("Parser device ID [%s]\n", mqtt->devid);
@@ -158,17 +158,20 @@
mqtt->port = val;
log_info("Parser MQTT broker server [%s:%d]\n", mqtt->host, mqtt->port);
- str=iniparser_getstring(ini, "broker:token", NULL);
- strncpy(mqtt->token, str, sizeof(mqtt->uid) );
+ if( (str=iniparser_getstring(ini, "broker:token", NULL)) )
+ {
+ strncpy(mqtt->token, str, sizeof(mqtt->uid) );
+ log_info("Parser broker token [%s]\n", mqtt->token);
+ }
- str=iniparser_getstring(ini, "broker:username", NULL);
- strncpy(mqtt->uid, str, sizeof(mqtt->uid) );
+ if( (str=iniparser_getstring(ini, "broker:username", NULL)) )
+ strncpy(mqtt->uid, str, sizeof(mqtt->uid) );
- str=iniparser_getstring(ini, "broker:password", NULL);
- strncpy(mqtt->pwd, str, sizeof(mqtt->pwd) );
+ if( (str=iniparser_getstring(ini, "broker:password", NULL)) )
+ strncpy(mqtt->pwd, str, sizeof(mqtt->pwd) );
- if( mqtt->uid && mqtt->pwd )
- log_info("Parser broker author by [%s:%s]\n", mqtt->uid, mqtt->pwd);
+ if( mqtt->uid )
+ log_info("Parser broker account [%s:%s]\n", mqtt->uid, mqtt->pwd);
mqtt->keepalive = iniparser_getint(ini, "broker:keepalive", DEF_KEEPALIVE);
log_info("Parser broker keepalive timeout [%d] seconds\n", mqtt->keepalive);
--
Gitblit v1.9.1