From 74d93589a9de6c6c5158f122a2f73f6877a6317f Mon Sep 17 00:00:00 2001
From: Guo Wenxue <guowenxue@gmail.com>
Date: Wed, 26 Jun 2019 00:50:03 +0800
Subject: [PATCH] update mqttd program, fix rpi build bug for strcasestr()
---
mqttd/main.c | 120 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 46 deletions(-)
diff --git a/mqttd/main.c b/mqttd/main.c
index f8868d2..c66d8c7 100644
--- a/mqttd/main.c
+++ b/mqttd/main.c
@@ -13,6 +13,9 @@
#include <stdio.h>
#include <time.h>
#include <unistd.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <string.h>
#include <mosquitto.h>
@@ -21,68 +24,90 @@
#include "proc.h"
#include "hal.h"
+#include "conf.h"
+
+#define PROG_VERSION "v1.0.0"
#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);
void *mqtt_sub_worker(void *args);
void *mqtt_pub_worker(void *args);
+
+static void program_usage(char *progname)
+{
+
+ printf("Usage: %s [OPTION]...\n", progname);
+ printf(" %s is LingYun studio MQTT daemon program running on RaspberryPi\n", progname);
+
+ printf("\nMandatory arguments to long options are mandatory for short options too:\n");
+ printf(" -d[debug ] Running in debug mode\n");
+ printf(" -c[conf ] Specify configure file\n");
+ printf(" -h[help ] Display this help information\n");
+ printf(" -v[version ] Display the program version\n");
+
+ printf("\n%s version %s\n", progname, PROG_VERSION);
+ return;
+}
int main (int argc, char **argv)
{
float temp;
float rh;
- int daemon = 0;
+ int daemon = 1;
pthread_t tid;
mqtt_ctx_t ctx;
+ char *conf_file=NULL;
+ int debug = 0;
+ int opt;
+ char *progname=NULL;
- strcpy(ctx.host, "127.0.0.1");
- ctx.port = 10883;
- ctx.keepalive = 60;
- strcpy(ctx.uid, "lingyun");
- strcpy(ctx.pwd, "lingyun-emb");
+ struct option long_options[] = {
+ {"conf", required_argument, NULL, 'c'},
+ {"debug", no_argument, NULL, 'd'},
+ {"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {NULL, 0, NULL, 0}
+ };
- ctx.pubQos = Qos0;
- ctx.interval = 300;
- ctx.subQos = Qos2;
+ progname = (char *)basename(argv[0]);
- //if( logger_init("mqttd.log", LOG_LEVEL_DEBUG, 1024) < 0 )
- if( logger_init(DBG_LOG_FILE, LOG_LEVEL_DEBUG, 1024) < 0 )
+ /* Parser the command line parameters */
+ while ((opt = getopt_long(argc, argv, "c:dvh", long_options, NULL)) != -1)
{
- fprintf(stderr, "Logger system initialise failure\n");
+ switch (opt)
+ {
+ case 'c': /* Set configure file */
+ conf_file = optarg;
+ break;
+
+ case 'd': /* Set debug running */
+ daemon = 0;
+ debug = 1;
+ break;
+
+ case 'v': /* Get software version */
+ printf("%s version %s\n", progname, PROG_VERSION);
+ return 0;
+
+ case 'h': /* Get help information */
+ program_usage(progname);
+ return 0;
+
+ default:
+ break;
+ }
+
+ }
+
+ if( !conf_file )
+ debug = 1;
+
+ if( mqttd_parser_conf(conf_file, &ctx, debug)<0 )
+ {
+ fprintf(stderr, "Parser mqtted configure file failure\n");
return -2;
}
- log_dbg("Logger system initialise ok\n");
#if 0
if( hal_init() < 0 )
@@ -97,6 +122,8 @@
if( check_set_program_running(daemon) < 0 )
goto OUT;
+
+ if( !debug )
mosquitto_lib_init();
@@ -167,6 +194,7 @@
float temp = 25.64;
float rh = 65.35;
char light[] = "on";
+ int retain = 0;
if( result )
{
@@ -179,7 +207,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 +220,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 +290,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