X-Git-Url: http://git.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=main.c;h=02d13f54ff3423e76d4ea02af077127bced3d194;hp=c23daf4f2715453c1616e4e3312bdf1c56ae3878;hb=HEAD;hpb=935161d9d7cff547c6a15aeec6ad0a1219914a19

diff --git a/main.c b/main.c
index c23daf4..752e78a 100644
--- a/main.c
+++ b/main.c
@@ -25,8 +25,8 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <asm/byteorder.h>
 
+#include <udebug.h>
 #include <libubus.h>
 #include <libubox/uloop.h>
 
@@ -38,18 +38,71 @@
 #include "announce.h"
 #include "interface.h"
 
-char *iface_name = "eth0";
+int cfg_proto = 0;
+int cfg_no_subnet = 0;
+
+static struct udebug ud;
+static struct udebug_buf udb;
+static bool udebug_enabled;
+
+static void
+umdns_udebug_vprintf(const char *format, va_list ap)
+{
+	if (!udebug_enabled)
+		return;
+
+	udebug_entry_init(&udb);
+	udebug_entry_vprintf(&udb, format, ap);
+	udebug_entry_add(&udb);
+}
+
+void umdns_udebug_printf(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	umdns_udebug_vprintf(format, ap);
+	va_end(ap);
+}
+
+void umdns_udebug_set_enabled(bool val)
+{
+	static const struct udebug_buf_meta meta = {
+		.name = "umdns_log",
+		.format = UDEBUG_FORMAT_STRING,
+	};
+
+	if (udebug_enabled == val)
+		return;
+
+	udebug_enabled = val;
+	if (!val) {
+		udebug_buf_free(&udb);
+		udebug_free(&ud);
+		return;
+	}
+
+	udebug_init(&ud);
+	udebug_auto_connect(&ud, NULL);
+	udebug_buf_init(&udb, 1024, 64 * 1024);
+	udebug_buf_add(&ud, &udb, &meta);
+}
+
+static void
+signal_shutdown(int signal)
+{
+	uloop_end();
+}
 
 int
 main(int argc, char **argv)
 {
 	int ch, ttl;
 
-	while ((ch = getopt(argc, argv, "h:t:i:d")) != -1) {
+	uloop_init();
+
+	while ((ch = getopt(argc, argv, "t:i:d46n")) != -1) {
 		switch (ch) {
-		case 'h':
-			hostname = optarg;
-			break;
 		case 't':
 			ttl = atoi(optarg);
 			if (ttl > 0)
@@ -61,33 +114,39 @@ main(int argc, char **argv)
 			debug++;
 			break;
 		case 'i':
-			iface_name = optarg;
+			interface_add(optarg);
+			break;
+		case '4':
+			cfg_proto = 4;
+			break;
+		case '6':
+			cfg_proto = 6;
+			break;
+		case 'n':
+			cfg_no_subnet = 1;
 			break;
-		}
-	}
-
-	if (!iface_name)
-		return -1;
-
-	uloop_init();
 
-	if (interface_add(iface_name)) {
-		fprintf(stderr, "Failed to add interface %s\n", iface_name);
-		return -1;
+		default:
+			return -1;
+		}
 	}
 
-	signal_setup();
+	signal(SIGPIPE, SIG_IGN);
+	signal(SIGTERM, signal_shutdown);
+	signal(SIGKILL, signal_shutdown);
 
 	if (cache_init())
 		return -1;
 
-	service_init();
-
 	ubus_startup();
+
+	service_init(0);
+
 	uloop_run();
 	uloop_done();
 
-	cache_cleanup();
+	interface_shutdown();
+	cache_cleanup(NULL);
 	service_cleanup();
 	vlist_flush(&interfaces);