move dns packet processing to dns.c

[project/mdnsd.git] / main.c

diff --git a/main.c b/main.c
index 39b8320..d0acf16 100644 (file)
--- a/main.c
+++ b/main.c
@@ -38,82 +38,17 @@
 #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;
+       struct interface *iface = container_of(u, struct interface, fd);
+       static uint8_t buffer[8 * 1024];
+       int len;
 
        if (u->eof) {
                uloop_fd_delete(u);
@@ -123,71 +58,33 @@ read_socket(struct uloop_fd *u, unsigned int events)
                return;
        }
 
-       rlen = len = read(u->fd, buffer, sizeof(buffer));
+       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);
+       dns_handle_packet(iface, buffer, len);
 }
 
 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,21 +117,16 @@ 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 (cache_init())
@@ -242,10 +134,9 @@ main(int argc, char **argv)
 
        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();