X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=main.c;h=505fb7d7667955478effb61642db02122a9aaa26;hp=cc179038521173a38081b5a79313b7e5468930a3;hb=431db651f04d18d2ee454e49d14806f08283f28c;hpb=8381f595a6066f893cc24e8a161e27a10a140cf0

diff --git a/main.c b/main.c
index cc17903..505fb7d 100644
--- a/main.c
+++ b/main.c
@@ -38,14 +38,13 @@
 #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)
+parse_answer(struct interface *iface, 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;
@@ -72,13 +71,13 @@ parse_answer(struct uloop_fd *u, uint8_t *buffer, int len, uint8_t **b, int *rle
 	*b += a->rdlength;
 
 	if (cache)
-		cache_answer(u, buffer, len, name, a, rdata);
+		cache_answer(iface, buffer, len, name, a, rdata);
 
 	return 0;
 }
 
 static void
-parse_question(struct uloop_fd *u, char *name, struct dns_question *q)
+parse_question(struct interface *iface, char *name, struct dns_question *q)
 {
 	char *host;
 
@@ -88,12 +87,12 @@ parse_question(struct uloop_fd *u, char *name, struct dns_question *q)
 	case TYPE_ANY:
 		host = service_name("local");
 		if (!strcmp(name, host))
-			service_reply(u, NULL);
+			service_reply(iface, NULL);
 		break;
 
 	case TYPE_PTR:
-		service_announce_services(u, name);
-		service_reply(u, name);
+		service_announce_services(iface, name);
+		service_reply(iface, name);
 		break;
 
 	case TYPE_AAAA:
@@ -102,7 +101,7 @@ parse_question(struct uloop_fd *u, char *name, struct dns_question *q)
 		if (host)
 			*host = '\0';
 		if (!strcmp(hostname, name))
-			service_reply_a(u, q->type);
+			service_reply_a(iface, q->type);
 		break;
 	};
 }
@@ -110,7 +109,8 @@ parse_question(struct uloop_fd *u, char *name, struct dns_question *q)
 static void
 read_socket(struct uloop_fd *u, unsigned int events)
 {
-	uint8_t buffer[8 * 1024];
+	struct interface *iface = container_of(u, struct interface, fd);
+	static uint8_t buffer[8 * 1024];
 	uint8_t *b = buffer;
 	struct dns_header *h;
 	int len, rlen;
@@ -151,43 +151,40 @@ read_socket(struct uloop_fd *u, unsigned int events)
 		}
 
 		if (!(h->flags & FLAG_RESPONSE))
-			parse_question(announce_fd, name, q);
+			parse_question(iface, name, q);
 	}
 
 	if (!(h->flags & FLAG_RESPONSE))
 		return;
 
 	while (h->answers-- > 0)
-		parse_answer(u, buffer, len, &b, &rlen, 1);
+		parse_answer(iface, buffer, len, &b, &rlen, 1);
 
 	while (h->authority-- > 0)
-		parse_answer(u, buffer, len, &b, &rlen, 0);
+		parse_answer(iface, buffer, len, &b, &rlen, 0);
 
 	while (h->additional-- > 0)
-		parse_answer(u, buffer, len, &b, &rlen, 1);
+		parse_answer(iface, buffer, len, &b, &rlen, 1);
 }
 
 static void
 reconnect_socket(struct uloop_timeout *timeout)
 {
-
-	if (iface_ip)
-		listener.fd = usock(USOCK_UDP | USOCK_SERVER | USOCK_NONBLOCK, MCAST_ADDR, "5353");
-
-	if (!iface_ip || listener.fd < 0) {
+	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 (socket_setup(listener.fd, iface_ip)) {
+		if (interface_socket_setup(cur_iface)) {
 			uloop_timeout_set(&reconnect, 1000);
-			listener.fd = -1;
+			cur_iface->fd.fd = -1;
 			return;
 		}
 
-		uloop_fd_add(&listener, ULOOP_READ);
+		uloop_fd_add(&cur_iface->fd, ULOOP_READ);
 		sleep(5);
-		dns_send_question(&listener, "_services._dns-sd._udp.local", TYPE_PTR);
-		announce_init(&listener);
+		dns_send_question(cur_iface, "_services._dns-sd._udp.local", TYPE_PTR);
+		announce_init(cur_iface);
 	}
 }
 
@@ -220,41 +217,31 @@ main(int argc, char **argv)
 	if (!iface_name)
 		return -1;
 
-	iface_ip = get_iface_ipv4(iface_name);
+	uloop_init();
 
-	if (!iface_ip) {
-		fprintf(stderr, "failed to read ip for %s\n", iface_name);
+	if (interface_add(iface_name)) {
+		fprintf(stderr, "Failed to add interface %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);
+	if (!cur_iface)
 		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;
-
 	if (cache_init())
 		return -1;
 
 	service_init();
 
-	listener.cb = read_socket;
+	cur_iface->fd.cb = read_socket;
 	reconnect.cb = reconnect_socket;
 
-	uloop_init();
 	uloop_timeout_set(&reconnect, 100);
 	ubus_startup();
 	uloop_run();
 	uloop_done();
 
-	dns_cleanup();
 	cache_cleanup();
 	service_cleanup();