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

diff --git a/main.c b/main.c
index d0acf16..c23daf4 100644
--- a/main.c
+++ b/main.c
@@ -28,9 +28,7 @@
 #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,54 +38,8 @@
 #include "announce.h"
 #include "interface.h"
 
-static struct uloop_timeout reconnect;
 char *iface_name = "eth0";
 
-static void
-read_socket(struct uloop_fd *u, unsigned int events)
-{
-	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);
-	}
-}
-
 int
 main(int argc, char **argv)
 {
@@ -124,9 +76,6 @@ main(int argc, char **argv)
 		return -1;
 	}
 
-	if (!cur_iface)
-		return -1;
-
 	signal_setup();
 
 	if (cache_init())
@@ -134,16 +83,13 @@ main(int argc, char **argv)
 
 	service_init();
 
-	cur_iface->fd.cb = read_socket;
-	reconnect.cb = reconnect_socket;
-
-	uloop_timeout_set(&reconnect, 100);
 	ubus_startup();
 	uloop_run();
 	uloop_done();
 
 	cache_cleanup();
 	service_cleanup();
+	vlist_flush(&interfaces);
 
 	return 0;
 }