From 4de24b43bfc373f46f0510703cde7562fb8cb703 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Tue, 18 Nov 2025 16:11:32 +0800
Subject: [PATCH] update iniparser to remove warnning
---
project/4.mqttd/config.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 211 insertions(+), 0 deletions(-)
diff --git a/project/4.mqttd/config.c b/project/4.mqttd/config.c
new file mode 100644
index 0000000..9561acd
--- /dev/null
+++ b/project/4.mqttd/config.c
@@ -0,0 +1,211 @@
+/*********************************************************************************
+ * Copyright: (C) 2019 LingYun IoT System Studio
+ * All rights reserved.
+ *
+ * Filename: config.c
+ * Description: This file is iotd 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 "config.h"
+#include "logger.h"
+#include "iniparser.h"
+
+int parser_conf(const char *conf_file, iotd_ctx_t *ctx, int debug)
+{
+ dictionary *ini;
+ const char *str;
+ int val;
+ int rv = 0;
+ logger_t *logger;
+ hwinfo_t *hwinfo;
+ mqtt_ctx_t *mqtt;
+
+ if( !conf_file || !ctx )
+ {
+ fprintf(stderr, "%s() Invalid input arguments\n", __func__);
+ return -1;
+ }
+
+ memset(ctx, 0, sizeof(*ctx));
+ logger = &ctx->logger;
+ hwinfo = &ctx->hwinfo;
+ mqtt = &ctx->mqtt;
+
+ ini = iniparser_load(conf_file);
+ if( !ini )
+ {
+ fprintf(stderr, "ERROR: Configure file '%s' load failed\n", conf_file);
+ return -2;
+ }
+
+ /*+------------------------------------------------------+
+ *| parser logger settings and start logger system |
+ *+------------------------------------------------------+*/
+ if( !debug )
+ {
+ str = iniparser_getstring(ini, "logger:file", "/tmp/iotd.log");
+ strncpy(logger->logfile, str, sizeof(logger->logfile));
+ logger->logsize = iniparser_getint(ini, "logger:size", 1024);
+ logger->loglevel = iniparser_getint(ini, "logger:level", LOG_LEVEL_INFO);
+ }
+ else
+ {
+ strncpy(logger->logfile, "console", sizeof(logger->logfile));
+ logger->loglevel = LOG_LEVEL_DEBUG;
+ logger->logsize = 0;
+ }
+
+ if( log_open(logger->logfile, logger->loglevel, logger->logsize, LOG_LOCK_DISABLE) < 0 )
+ {
+ fprintf(stderr, "Logger system initialise failure\n");
+ return -2;
+ }
+
+ log_info("Logger system initialise ok\n");
+
+
+ /*+------------------------------------------------------+
+ *| parser production ID |
+ *+------------------------------------------------------+*/
+
+ if( !(str=iniparser_getstring(ini, "common:devid", NULL)) )
+ {
+ log_error("ERROR: Parser device ID failure\n");
+ rv = -3;
+ goto cleanup;
+ }
+ /* cJSON parser ID will get "" */
+ strncpy(mqtt->devid, str, sizeof(mqtt->devid));
+ log_info("Parser device ID [%s]\n", mqtt->devid);
+
+
+ /*+------------------------------------------------------+
+ *| parser hardware module configuration |
+ *+------------------------------------------------------+*/
+
+ /* relay */
+ hwinfo->relay=iniparser_getint(ini, "hardware:relay", 0);
+ if( !hwinfo->relay )
+ log_warn("Parser relay module disabled\n");
+ else
+ log_info("Parser relay module enabled\n");
+
+ /* RGB 3-colors LED */
+ hwinfo->led=iniparser_getint(ini, "hardware:rgbled", 0);
+ if( !hwinfo->led )
+ log_warn("Parser RGB 3-colors Led module disabled\n");
+ else
+ log_info("Parser RGB 3-colors Led module enabled\n");
+
+ /* beeper */
+ hwinfo->beeper=iniparser_getint(ini, "hardware:beep", 0);
+ if( !hwinfo->beeper )
+ log_warn("Parser beeper module disabled\n");
+ else
+ log_info("Parser beeper module enabled\n");
+
+ /* DS18B20 temperature module */
+ hwinfo->ds18b20=iniparser_getint(ini, "hardware:ds18b20", 0);
+ if( !hwinfo->ds18b20 )
+ log_warn("Parser DS18B20 temperature module disabled\n");
+ else
+ log_info("Parser DS18B20 temperature module enabled\n");
+
+ /* SHT20 temperature and hummidity module */
+ hwinfo->sht2x=iniparser_getint(ini, "hardware:sht2x", 0);
+ if( !hwinfo->sht2x )
+ log_warn("Parser SHT2X temperature and hummidity module disabled\n");
+ else
+ log_info("Parser SHT2X temperature and hummidity module enabled\n");
+
+ /* TSL2561 light intensity sensor module */
+ hwinfo->tsl2561=iniparser_getint(ini, "hardware:tsl2561", 0);
+ if( !hwinfo->tsl2561 )
+ log_warn("Parser TSL2561 light intensity sensor module disabled\n");
+ else
+ log_info("Parser TSL2561 light intensity sensor module enabled\n");
+
+ /*+------------------------------------------------------+
+ *| parser broker settings |
+ *+------------------------------------------------------+*/
+
+ if( !(str=iniparser_getstring(ini, "broker:hostname", NULL)) )
+ {
+ log_error("ERROR: Parser MQTT broker server hostname failure\n");
+ rv = -4;
+ goto cleanup;
+ }
+ strncpy(mqtt->host, str, sizeof(mqtt->host) );
+
+ if( (val=iniparser_getint(ini, "broker:port", -1)) < 0 )
+ {
+ log_error("ERROR: Parser MQTT broker server port failure\n");
+ rv = -5;
+ goto cleanup;
+ }
+ mqtt->port = val;
+ log_info("Parser MQTT broker server [%s:%d]\n", mqtt->host, mqtt->port);
+
+ if( (str=iniparser_getstring(ini, "broker:token", NULL)) )
+ {
+ strncpy(mqtt->token, str, sizeof(mqtt->uid) );
+ log_info("Parser broker token [%s]\n", mqtt->token);
+ }
+
+ if( (str=iniparser_getstring(ini, "broker:username", NULL)) )
+ strncpy(mqtt->uid, str, sizeof(mqtt->uid) );
+
+ if( (str=iniparser_getstring(ini, "broker:password", NULL)) )
+ strncpy(mqtt->pwd, str, sizeof(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);
+
+ /*+------------------------------------------------------+
+ *| parser publisher settings |
+ *+------------------------------------------------------+*/
+
+ if( !(str=iniparser_getstring(ini, "publisher:pubTopic", NULL)) )
+ {
+ log_error("ERROR: Parser MQTT broker publisher topic failure\n");
+ rv = -6;
+ goto cleanup;
+ }
+ snprintf(mqtt->pubTopic, sizeof(mqtt->pubTopic), "%s/%s", str, mqtt->devid);
+
+ mqtt->pubQos = iniparser_getint(ini, "publisher:pubQos", DEF_QOS);
+ mqtt->interval = iniparser_getint(ini, "publisher:interval", DEF_PUBINTERVAL);
+ log_info("Parser publisher topic \"%s\" with Qos[%d] interval[%d]\n", mqtt->pubTopic, mqtt->pubQos, mqtt->interval);
+
+ /*+------------------------------------------------------+
+ *| parser subscriber settings |
+ *+------------------------------------------------------+*/
+
+ if( !(str=iniparser_getstring(ini, "subsciber:subTopic", NULL)) )
+ {
+ log_error("ERROR: Parser MQTT broker publisher topic failure\n");
+ rv = -7;
+ goto cleanup;
+ }
+ snprintf(mqtt->subTopic, sizeof(mqtt->subTopic), "%s/%s", str, mqtt->devid);
+
+ mqtt->subQos = iniparser_getint(ini, "subsciber:subQos", DEF_QOS);
+ log_info("Parser subscriber topic \"%s\" with Qos[%d]\n", mqtt->subTopic, mqtt->subQos);
+
+cleanup:
+ if( ini )
+ iniparser_freedict(ini);
+
+ if( rv )
+ log_close();
+
+ return rv;
+}
+
--
Gitblit v1.9.1