make interface_socket_setup static

[project/mdnsd.git] / interface.c

diff --git a/interface.c b/interface.c
index 866bd05..01aeaa7 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -27,13 +27,14 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <libubox/usock.h>
+#include <libubox/uloop.h>
 #include <libubox/avl-cmp.h>
 #include <libubox/utils.h>
 #include "interface.h"
 #include "util.h"
 #include "dns.h"
-
-struct interface *cur_iface = NULL;
+#include "announce.h"
 
 int
 interface_send_packet(struct interface *iface, struct iovec *iov, int iov_len)
@@ -70,41 +71,47 @@ interface_send_packet(struct interface *iface, struct iovec *iov, int iov_len)
        return sendmsg(fd, &m, 0);
 }
 
-static void interface_free(struct interface *iface)
+static void interface_close(struct interface *iface)
 {
-       if (cur_iface == iface)
-               cur_iface = NULL;
+       if (iface->fd.fd < 0)
+               return;
 
-       if (iface->fd.fd >= 0) {
-               uloop_fd_delete(&iface->fd);
-               close(iface->fd.fd);
-       }
-       free(iface);
+       announce_free(iface);
+       uloop_fd_delete(&iface->fd);
+       close(iface->fd.fd);
+       iface->fd.fd = -1;
 }
 
-static void interface_start(struct interface *iface)
+static void interface_free(struct interface *iface)
 {
-       cur_iface = iface;
+       interface_close(iface);
+       free(iface);
 }
 
 static void
-iface_update_cb(struct vlist_tree *tree, struct vlist_node *node_new,
-               struct vlist_node *node_old)
+read_socket(struct uloop_fd *u, unsigned int events)
 {
-       struct interface *iface;
-
-       if (node_old) {
-               iface = container_of(node_old, struct interface, node);
-               interface_free(iface);
+       struct interface *iface = container_of(u, struct interface, fd);
+       static uint8_t buffer[8 * 1024];
+       int len;
+
+       if (u->eof) {
+               interface_close(iface);
+               uloop_timeout_set(&iface->reconnect, 1000);
+               return;
        }
 
-       if (node_new) {
-               iface = container_of(node_new, struct interface, node);
-               interface_start(iface);
+       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);
 }
 
-int interface_socket_setup(struct interface *iface)
+static int
+interface_socket_setup(struct interface *iface)
 {
        struct ip_mreqn mreq;
        uint8_t ttl = 255;
@@ -157,6 +164,56 @@ int interface_socket_setup(struct interface *iface)
        return 0;
 }
 
+static void
+reconnect_socket(struct uloop_timeout *timeout)
+{
+       struct interface *iface = container_of(timeout, struct interface, reconnect);
+
+       iface->fd.fd = usock(USOCK_UDP | USOCK_SERVER | USOCK_NONBLOCK, MCAST_ADDR, "5353");
+       if (iface->fd.fd < 0) {
+               fprintf(stderr, "failed to add listener: %s\n", strerror(errno));
+               goto retry;
+       }
+
+       if (interface_socket_setup(iface)) {
+               iface->fd.fd = -1;
+               goto retry;
+       }
+
+       uloop_fd_add(&iface->fd, ULOOP_READ);
+       dns_send_question(iface, "_services._dns-sd._udp.local", TYPE_PTR);
+       announce_init(iface);
+       return;
+
+retry:
+       uloop_timeout_set(timeout, 1000);
+}
+
+
+static void interface_start(struct interface *iface)
+{
+       iface->fd.cb = read_socket;
+       iface->reconnect.cb = reconnect_socket;
+       uloop_timeout_set(&iface->reconnect, 100);
+}
+
+static void
+iface_update_cb(struct vlist_tree *tree, struct vlist_node *node_new,
+               struct vlist_node *node_old)
+{
+       struct interface *iface;
+
+       if (node_old) {
+               iface = container_of(node_old, struct interface, node);
+               interface_free(iface);
+       }
+
+       if (node_new) {
+               iface = container_of(node_new, struct interface, node);
+               interface_start(iface);
+       }
+}
+
 static const char*
 get_iface_ipv4(const char *ifname)
 {