X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=main.c;h=02d13f54ff3423e76d4ea02af077127bced3d194;hp=d0acf162e82c497686490d83123852404b9b00bb;hb=1fa9077d63b7a1083f71ec058c338b4fb8afebe9;hpb=67e8c3bed831f8a1b879a654ca290d14e333664a

diff --git a/main.c b/main.c
index d0acf16..02d13f5 100644
--- a/main.c
+++ b/main.c
@@ -25,12 +25,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <asm/byteorder.h>
 
 #include <libubus.h>
-#include <libubox/usock.h>
 #include <libubox/uloop.h>
-#include <libubox/avl-cmp.h>
 
 #include "dns.h"
 #include "ubus.h"
@@ -40,52 +37,13 @@
 #include "announce.h"
 #include "interface.h"
 
-static struct uloop_timeout reconnect;
-char *iface_name = "eth0";
+int cfg_proto = 0;
+int cfg_no_subnet = 0;
 
 static void
-read_socket(struct uloop_fd *u, unsigned int events)
+signal_shutdown(int signal)
 {
-	struct interface *iface = container_of(u, struct interface, fd);
-	static uint8_t buffer[8 * 1024];
-	int len;
-
-	if (u->eof) {
-		uloop_fd_delete(u);
-		close(u->fd);
-		u->fd = -1;
-		uloop_timeout_set(&reconnect, 1000);
-		return;
-	}
-
-	len = read(u->fd, buffer, sizeof(buffer));
-	if (len < 1) {
-		fprintf(stderr, "read failed: %s\n", strerror(errno));
-		return;
-	}
-
-	dns_handle_packet(iface, buffer, len);
-}
-
-static void
-reconnect_socket(struct uloop_timeout *timeout)
-{
-	cur_iface->fd.fd = usock(USOCK_UDP | USOCK_SERVER | USOCK_NONBLOCK, MCAST_ADDR, "5353");
-	if (cur_iface->fd.fd < 0) {
-		fprintf(stderr, "failed to add listener: %s\n", strerror(errno));
-		uloop_timeout_set(&reconnect, 1000);
-	} else {
-		if (interface_socket_setup(cur_iface)) {
-			uloop_timeout_set(&reconnect, 1000);
-			cur_iface->fd.fd = -1;
-			return;
-		}
-
-		uloop_fd_add(&cur_iface->fd, ULOOP_READ);
-		sleep(5);
-		dns_send_question(cur_iface, "_services._dns-sd._udp.local", TYPE_PTR);
-		announce_init(cur_iface);
-	}
+	uloop_end();
 }
 
 int
@@ -93,11 +51,10 @@ 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)
@@ -109,41 +66,41 @@ 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;
+		}
 	}
 
-	if (!cur_iface)
-		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();
 
-	cur_iface->fd.cb = read_socket;
-	reconnect.cb = reconnect_socket;
+	service_init(0);
 
-	uloop_timeout_set(&reconnect, 100);
-	ubus_startup();
 	uloop_run();
 	uloop_done();
 
-	cache_cleanup();
+	interface_shutdown();
+	cache_cleanup(NULL);
 	service_cleanup();
+	vlist_flush(&interfaces);
 
 	return 0;
 }