X-Git-Url: http://git.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=main.c;h=02d13f54ff3423e76d4ea02af077127bced3d194;hp=cc179038521173a38081b5a79313b7e5468930a3;hb=1dbd18dff89ff60d7bb9bfac6825eba33f043992;hpb=8381f595a6066f893cc24e8a161e27a10a140cf0

diff --git a/main.c b/main.c
index cc17903..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"
@@ -38,157 +35,15 @@
 #include "cache.h"
 #include "service.h"
 #include "announce.h"
+#include "interface.h"
 
-static struct uloop_timeout reconnect;
-char *iface_name = "eth0";
-const char *iface_ip;
-int iface_index;
-
-static int
-parse_answer(struct uloop_fd *u, uint8_t *buffer, int len, uint8_t **b, int *rlen, int cache)
-{
-	char *name = dns_consume_name(buffer, len, b, rlen);
-	struct dns_answer *a;
-	uint8_t *rdata;
-
-	if (!name) {
-		fprintf(stderr, "dropping: bad question\n");
-		return -1;
-	}
-
-	a = dns_consume_answer(b, rlen);
-	if (!a) {
-		fprintf(stderr, "dropping: bad question\n");
-		return -1;
-	}
-
-	rdata = *b;
-	if (a->rdlength > *rlen) {
-		fprintf(stderr, "dropping: bad question\n");
-		return -1;
-	}
-
-	*rlen -= a->rdlength;
-	*b += a->rdlength;
-
-	if (cache)
-		cache_answer(u, buffer, len, name, a, rdata);
-
-	return 0;
-}
-
-static void
-parse_question(struct uloop_fd *u, char *name, struct dns_question *q)
-{
-	char *host;
-
-	DBG(1, "Q -> %s %s\n", dns_type_string(q->type), name);
-
-	switch (q->type) {
-	case TYPE_ANY:
-		host = service_name("local");
-		if (!strcmp(name, host))
-			service_reply(u, NULL);
-		break;
-
-	case TYPE_PTR:
-		service_announce_services(u, name);
-		service_reply(u, name);
-		break;
-
-	case TYPE_AAAA:
-	case TYPE_A:
-		host = strstr(name, ".local");
-		if (host)
-			*host = '\0';
-		if (!strcmp(hostname, name))
-			service_reply_a(u, q->type);
-		break;
-	};
-}
-
-static void
-read_socket(struct uloop_fd *u, unsigned int events)
-{
-	uint8_t buffer[8 * 1024];
-	uint8_t *b = buffer;
-	struct dns_header *h;
-	int len, rlen;
-
-	if (u->eof) {
-		uloop_fd_delete(u);
-		close(u->fd);
-		u->fd = -1;
-		uloop_timeout_set(&reconnect, 1000);
-		return;
-	}
-
-	rlen = len = read(u->fd, buffer, sizeof(buffer));
-	if (len < 1) {
-		fprintf(stderr, "read failed: %s\n", strerror(errno));
-		return;
-	}
-
-	h = dns_consume_header(&b, &rlen);
-	if (!h) {
-		fprintf(stderr, "dropping: bad header\n");
-		return;
-	}
-
-	while (h->questions-- > 0) {
-		char *name = dns_consume_name(buffer, len, &b, &rlen);
-		struct dns_question *q;
-
-		if (!name) {
-			fprintf(stderr, "dropping: bad name\n");
-			return;
-		}
-
-		q = dns_consume_question(&b, &rlen);
-		if (!q) {
-			fprintf(stderr, "dropping: bad question\n");
-			return;
-		}
-
-		if (!(h->flags & FLAG_RESPONSE))
-			parse_question(announce_fd, name, q);
-	}
-
-	if (!(h->flags & FLAG_RESPONSE))
-		return;
-
-	while (h->answers-- > 0)
-		parse_answer(u, buffer, len, &b, &rlen, 1);
-
-	while (h->authority-- > 0)
-		parse_answer(u, buffer, len, &b, &rlen, 0);
-
-	while (h->additional-- > 0)
-		parse_answer(u, buffer, len, &b, &rlen, 1);
-}
+int cfg_proto = 0;
+int cfg_no_subnet = 0;
 
 static void
-reconnect_socket(struct uloop_timeout *timeout)
+signal_shutdown(int signal)
 {
-
-	if (iface_ip)
-		listener.fd = usock(USOCK_UDP | USOCK_SERVER | USOCK_NONBLOCK, MCAST_ADDR, "5353");
-
-	if (!iface_ip || listener.fd < 0) {
-		fprintf(stderr, "failed to add listener: %s\n", strerror(errno));
-		uloop_timeout_set(&reconnect, 1000);
-	} else {
-		if (socket_setup(listener.fd, iface_ip)) {
-			uloop_timeout_set(&reconnect, 1000);
-			listener.fd = -1;
-			return;
-		}
-
-		uloop_fd_add(&listener, ULOOP_READ);
-		sleep(5);
-		dns_send_question(&listener, "_services._dns-sd._udp.local", TYPE_PTR);
-		announce_init(&listener);
-	}
+	uloop_end();
 }
 
 int
@@ -196,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)
@@ -212,51 +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;
-
-	iface_ip = get_iface_ipv4(iface_name);
-
-	if (!iface_ip) {
-		fprintf(stderr, "failed to read ip for %s\n", iface_name);
-		return -1;
-	}
-
-	iface_index = get_iface_index(iface_name);
 
-	if (!iface_index) {
-		fprintf(stderr, "failed to read index for %s\n", iface_name);
-		return -1;
+		default:
+			return -1;
+		}
 	}
 
-	fprintf(stderr, "interface %s has ip %s and index %d\n", iface_name, iface_ip, iface_index);
-	signal_setup();
-
-	if (dns_init())
-		return -1;
+	signal(SIGPIPE, SIG_IGN);
+	signal(SIGTERM, signal_shutdown);
+	signal(SIGKILL, signal_shutdown);
 
 	if (cache_init())
 		return -1;
 
-	service_init();
+	ubus_startup();
 
-	listener.cb = read_socket;
-	reconnect.cb = reconnect_socket;
+	service_init(0);
 
-	uloop_init();
-	uloop_timeout_set(&reconnect, 100);
-	ubus_startup();
 	uloop_run();
 	uloop_done();
 
-	dns_cleanup();
-	cache_cleanup();
+	interface_shutdown();
+	cache_cleanup(NULL);
 	service_cleanup();
+	vlist_flush(&interfaces);
 
 	return 0;
 }