Add usage and version

2 files changed, 83 insertions, 5 deletions

diff --git a/mfi-mqtt/Makefile b/mfi-mqtt/Makefile
index a30dfbd..96b1016 100644
--- a/mfi-mqtt/Makefile
+++ b/mfi-mqtt/Makefile
@@ -1,12 +1,18 @@
 BUILDROOT := $(HOME)/tmp/buildroot-2019.02.7
 MIPS_GCC := $(BUILDROOT)/output/host/bin/mips-buildroot-linux-uclibc-gcc
+MIPS_STRIP := $(BUILDROOT)/output/host/mips-buildroot-linux-uclibc/bin/strip
+VERSION := $(shell git describe --tags --dirty --long)
+
+mfi-mqtt-mips-stripped: mfi-mqtt-mips
+        cp $< $@
+        $(MIPS_STRIP) $@
 
 mfi-mqtt-mips: reporting.o mosquitto.o mfi-mqtt.o
         $(MIPS_GCC) -o $@ $^ -lpthread -lmosquitto -ljson-c -static
 
 %.o: %.c
-        $(MIPS_GCC) -Wall -c -o $@ $<
+        $(MIPS_GCC) -DVERSION=$(VERSION) -Wall -c -o $@ $<
 
 .PHONY: clean
 clean:
-        rm -f *.o mfi-mqtt-mips
+        rm -f *.o mfi-mqtt-mips mfi-mqtt-mips-stripped
diff --git a/mfi-mqtt/mfi-mqtt.c b/mfi-mqtt/mfi-mqtt.c
index 25527bc..535fcb3 100644
--- a/mfi-mqtt/mfi-mqtt.c
+++ b/mfi-mqtt/mfi-mqtt.c
@@ -5,7 +5,9 @@
 #include <time.h>
 #include <unistd.h>
 #include <signal.h>
+#include <getopt.h>
 #include <pthread.h>
+#include <libgen.h>
 
 #include <json-c/json.h>
 #include <mosquitto.h>
@@ -13,6 +15,10 @@
 #include "mosquitto.h"
 #include "reporting.h"
 
+#define XSTR(s) STR(s)
+#define STR(s) #s
+
+static char *APP_VERSION = XSTR(VERSION);
 static volatile sig_atomic_t closing_time = 0;
 
 typedef struct control_message {
@@ -229,8 +235,7 @@ void cleanup_crap_processes() {
     system("pkill avahi-daemon");
 }
 
-int main(int argc, char *argv[])
-{
+int real_main(char *broker, int broker_port) {
     struct mosquitto *mosq;
     pthread_t pinger_thread_h, control_thread_h, light_management_thread_h;
 
@@ -238,7 +243,7 @@ int main(int argc, char *argv[])
 
     set_signal_handler();
 
-    mosq = connect_to_broker("172.16.0.191", 1883);
+    mosq = connect_to_broker(broker, broker_port);
     if (!mosq) {
         return 1;
     }
@@ -267,3 +272,70 @@ int main(int argc, char *argv[])
 
         return 0;
 }
+
+void print_usage(char *name) {
+    printf("usage: %s [--help|-h] [--version|-V] [--broker|-b] [--port|-p]\n", name);
+    printf("Control mFi Power Strip via MQTT messages\n\n");
+
+    printf("    -b, --broker    Broker hostname or IP address [REQUIRED]\n");
+    printf("    -p, --port      Broker port, default: 1883\n");
+    printf("    -h, --help      Show this message\n");
+    printf("    -V, --version   Show application version info\n");
+
+    free(name);
+}
+
+int main(int argc, char *argv[])
+{
+    int c;
+    int rc;
+    char *broker;
+    int port = 1883;
+    int option_index = 0;
+
+    while (true) {
+        static struct option long_options[] = {
+            {"help",    no_argument,       0, 'h'},
+            {"version", no_argument,       0, 'V'},
+            {"broker",  required_argument, 0, 'b'},
+            {"port",    required_argument, 0, 'p'},
+            {0, 0, 0, 0}
+        };
+
+        if ((c = getopt_long(argc, argv, "hVb:p:", long_options, &option_index)) == -1) {
+            break;
+        }
+
+        switch (c) {
+            case 'h':
+                print_usage(strdup(basename(argv[0])));
+                return 0;
+
+            case 'V':
+                fprintf(stdout, "%s version %s\n", basename(argv[0]), APP_VERSION);
+                return 0;
+
+            case 'b':
+                broker = strdup(optarg);
+                break;
+
+            case 'p':
+                port = atoi(optarg);
+                if (port > 65536 || port <= 0) {
+                    fprintf(stderr, "error: invalid port specified\n");
+                    return 1;
+                }
+                break;
+        }
+    }
+
+    if (!broker) {
+        fprintf(stderr, "error: no broker configured\n");
+        return 1;
+    }
+
+    rc = real_main(broker, port);
+    free(broker);
+
+    return rc;
+}