From 6a924a29cefbea27a101790343137db819b361be Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Wed, 26 Jun 2019 00:08:35 +0800
Subject: [PATCH] update mqttd to add configure file parser support
---
mqttd/main.c | 56 ++++++++++----------------------------------------------
1 files changed, 10 insertions(+), 46 deletions(-)
diff --git a/mqttd/main.c b/mqttd/main.c
index f8868d2..982b34a 100644
--- a/mqttd/main.c
+++ b/mqttd/main.c
@@ -21,36 +21,9 @@
#include "proc.h"
#include "hal.h"
+#include "conf.h"
+
#define DAEMON_PIDFILE "/tmp/.mqtt.pid"
-
-#define MQTT_SYS_TOPIC "$Sys/Studio/"
-#define MQTT_SYS_DLINK_TOPIC MQTT_SYS_TOPIC"Downlink"
-#define MQTT_SYS_ULINK_TOPIC MQTT_SYS_TOPIC"Uplink"
-
-enum
-{
- Qos0, /* 发送者只发送一次消息，不进行重试，Broker不会返回确认消息。在Qos0情况下，Broker可能没有接受到消息 */
- Qos1, /* 发送者最少发送一次消息，确保消息到达Broker，Broker需要返回确认消息PUBACK。在Qos1情况下，Broker可能接受到重复消息 */
- Qos2, /* Qos2使用两阶段确认来保证消息的不丢失和不重复。在Qos2情况下，Broker肯定会收到消息，且只收到一次 */
-};
-
-typedef struct mqtt_ctx_s
-{
- /* Broker settings */
- char host[128]; /* MQTT broker server name */
- int port; /* MQTT broker listen port */
- int keepalive; /* MQTT broker send PING message to subsciber/publisher keepalive timeout<seconds> */
- char uid[64]; /* username */
- char pwd[64]; /* password */
-
- /* Publisher settings */
- int pubQos; /* Publisher Qos */
- int interval; /* Publish sensor data interval time, unit seconds */
-
- /* Subscriber settings */
- int subQos; /* Subscriber Qos */
-
-} mqtt_ctx_t;
int check_set_program_running(int daemon);
@@ -65,24 +38,14 @@
int daemon = 0;
pthread_t tid;
mqtt_ctx_t ctx;
+ char *conf="./etc/mqttd.conf";
+ int debug = 1;
- strcpy(ctx.host, "127.0.0.1");
- ctx.port = 10883;
- ctx.keepalive = 60;
- strcpy(ctx.uid, "lingyun");
- strcpy(ctx.pwd, "lingyun-emb");
-
- ctx.pubQos = Qos0;
- ctx.interval = 300;
- ctx.subQos = Qos2;
-
- //if( logger_init("mqttd.log", LOG_LEVEL_DEBUG, 1024) < 0 )
- if( logger_init(DBG_LOG_FILE, LOG_LEVEL_DEBUG, 1024) < 0 )
+ if( mqttd_parser_conf(conf, &ctx, debug)<0 )
{
- fprintf(stderr, "Logger system initialise failure\n");
+ fprintf(stderr, "Parser mqtted configure file failure\n");
return -2;
}
- log_dbg("Logger system initialise ok\n");
#if 0
if( hal_init() < 0 )
@@ -167,6 +130,7 @@
float temp = 25.64;
float rh = 65.35;
char light[] = "on";
+ int retain = 0;
if( result )
{
@@ -179,7 +143,7 @@
memset(msg, 0, sizeof(msg));
snprintf(msg, sizeof(msg), "{ \"temp\":\"%.2f\", \"R&H\":\"%.2f%%\" }", temp, rh);
- rv = mosquitto_publish(mosq, NULL, MQTT_SYS_ULINK_TOPIC, strlen(msg)+1, msg, ctx->pubQos, 0);
+ rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg)+1, msg, ctx->pubQos, retain);
if( rv )
{
log_err("Publisher broadcast message '%s' failure: %d\n", msg, rv);
@@ -192,7 +156,7 @@
memset(msg, 0, sizeof(msg));
snprintf(msg, sizeof(msg), "{ \"light\":\"%s\" }", light);
- rv = mosquitto_publish(mosq, NULL, MQTT_SYS_ULINK_TOPIC, strlen(msg)+1, msg, ctx->pubQos, 0);
+ rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg)+1, msg, ctx->pubQos, retain);
if( rv )
{
log_err("Publisher broadcast message failure: %d\n", rv);
@@ -262,7 +226,7 @@
}
log_nrml("Subscriber connect to broker server[%s:%d] successfully\n", ctx->host, ctx->port);
- mosquitto_subscribe(mosq, NULL, MQTT_SYS_DLINK_TOPIC, 2);
+ mosquitto_subscribe(mosq, NULL, ctx->subTopic, ctx->subQos);
}
void sub_disconnect_callback(struct mosquitto *mosq, void *userdata, int result)
--
Gitblit v1.9.1