move announce state to struct interface

[project/mdnsd.git] / service.c

diff --git a/service.c b/service.c
index 9d3f084..4a9ccc8 100644 (file)
--- a/service.c
+++ b/service.c
@@ -26,7 +26,7 @@
 #include <uci.h>
 #include <uci_blob.h>
 
-#include <libubox/avl.h>
+#include <libubox/vlist.h>
 #include <libubox/uloop.h>
 #include <libubox/avl-cmp.h>
 #include <libubox/blobmsg_json.h>
@@ -34,6 +34,7 @@
 #include "dns.h"
 #include "service.h"
 #include "util.h"
+#include "interface.h"
 
 enum {
        SERVICE_PORT,
@@ -42,12 +43,12 @@ enum {
 };
 
 struct service {
-       struct avl_node avl;
+       struct vlist_node node;
 
        time_t t;
 
-       char *service;
-       char *daemon;
+       const char *service;
+       const char *daemon;
        const uint8_t *txt;
        int txt_len;
        int port;
@@ -64,14 +65,18 @@ static const struct uci_blob_param_list service_attr_list = {
        .params = service_policy,
 };
 
+static void
+service_update(struct vlist_tree *tree, struct vlist_node *node_new,
+              struct vlist_node *node_old);
+
 static struct blob_buf b;
-static struct avl_tree services;
+static VLIST_TREE(services, avl_strcmp, service_update, false, false);
 char *hostname = NULL;
 static char *sdudp =  "_services._dns-sd._udp.local";
 static char *sdtcp =  "_services._dns-sd._tcp.local";
 
-char*
-service_name(char *domain)
+char *
+service_name(const char *domain)
 {
        static char buffer[256];
 
@@ -81,10 +86,10 @@ service_name(char *domain)
 }
 
 static void
-service_send_ptr(struct uloop_fd *u, struct service *s)
+service_add_ptr(struct service *s)
 {
        unsigned char buffer[MAX_NAME_LEN];
-       char *host = service_name(s->service);
+       const char *host = service_name(s->service);
        int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
 
        if (len < 1)
@@ -94,7 +99,7 @@ service_send_ptr(struct uloop_fd *u, struct service *s)
 }
 
 static void
-service_send_ptr_c(struct uloop_fd *u, char *host)
+service_add_ptr_c(const char *host)
 {
        unsigned char buffer[MAX_NAME_LEN];
        int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
@@ -106,15 +111,15 @@ service_send_ptr_c(struct uloop_fd *u, char *host)
 }
 
 static void
-service_send_a(struct uloop_fd *u)
+service_send_a(struct interface *iface)
 {
        unsigned char buffer[MAX_NAME_LEN];
        char *host = service_name("local");
        int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
        struct in_addr in;
 
-       if (!inet_aton(iface_ip, &in)) {
-               fprintf(stderr, "%s is not valid\n", iface_ip);
+       if (!inet_aton(iface->ip, &in)) {
+               fprintf(stderr, "%s is not valid\n", iface->ip);
                return;
        }
 
@@ -125,7 +130,7 @@ service_send_a(struct uloop_fd *u)
 }
 
 static void
-service_send_srv(struct uloop_fd *u, struct service *s)
+service_add_srv(struct service *s)
 {
        unsigned char buffer[MAX_NAME_LEN];
        struct dns_srv_data *sd;
@@ -162,22 +167,22 @@ service_timeout(struct service *s)
 }
 
 void
-service_reply_a(struct uloop_fd *u, int type)
+service_reply_a(struct interface *iface, int type)
 {
        if (type != TYPE_A)
                return;
 
        dns_init_answer();
-       service_send_a(u);
-       dns_send_answer(u, service_name("local"));
+       service_send_a(iface);
+       dns_send_answer(iface, service_name("local"));
 }
 
 void
-service_reply(struct uloop_fd *u, char *match)
+service_reply(struct interface *iface, const char *match)
 {
        struct service *s;
 
-       avl_for_each_element(&services, s, avl) {
+       vlist_for_each_element(&services, s, node) {
                char *host = service_name(s->service);
                char *service = strstr(host, "._");
 
@@ -190,26 +195,26 @@ service_reply(struct uloop_fd *u, char *match)
                        continue;
 
                dns_init_answer();
-               service_send_ptr(u, s);
-               dns_send_answer(u, service);
+               service_add_ptr(s);
+               dns_send_answer(iface, service);
 
                dns_init_answer();
-               service_send_srv(u, s);
+               service_add_srv(s);
                if (s->txt && s->txt_len)
                        dns_add_answer(TYPE_TXT, (uint8_t *) s->txt, s->txt_len);
-               dns_send_answer(u, host);
+               dns_send_answer(iface, host);
        }
 
        if (match)
                return;
 
        dns_init_answer();
-       service_send_a(u);
-       dns_send_answer(u, service_name("local"));
+       service_send_a(iface);
+       dns_send_answer(iface, service_name("local"));
 }
 
 void
-service_announce_services(struct uloop_fd *u, char *service)
+service_announce_services(struct interface *iface, const char *service)
 {
        struct service *s;
        int tcp = 1;
@@ -219,27 +224,40 @@ service_announce_services(struct uloop_fd *u, char *service)
        else if (strcmp(service, sdtcp))
                return;
 
-       avl_for_each_element(&services, s, avl) {
+       vlist_for_each_element(&services, s, node) {
                if (!strstr(s->service, "._tcp") && tcp)
                        continue;
                if (!strstr(s->service, "._udp") && !tcp)
                        continue;
                s->t = 0;
                dns_init_answer();
-               service_send_ptr_c(u, s->service);
+               service_add_ptr_c(s->service);
                if (tcp)
-                       dns_send_answer(u, sdtcp);
+                       dns_send_answer(iface, sdtcp);
                else
-                       dns_send_answer(u, sdudp);
-               service_reply(u, s->service);
+                       dns_send_answer(iface, sdudp);
+               service_reply(iface, s->service);
        }
 }
 
 void
-service_announce(struct uloop_fd *u)
+service_announce(struct interface *iface)
 {
-       service_announce_services(u, sdudp);
-       service_announce_services(u, sdtcp);
+       service_announce_services(iface, sdudp);
+       service_announce_services(iface, sdtcp);
+}
+
+static void
+service_update(struct vlist_tree *tree, struct vlist_node *node_new,
+              struct vlist_node *node_old)
+{
+       struct service *s;
+
+       if (!node_old)
+               return;
+
+       s = container_of(node_old, struct service, node);
+       free(s);
 }
 
 static void
@@ -280,19 +298,12 @@ service_load(char *path)
                                continue;
 
                        s->port = blobmsg_get_u32(_tb[SERVICE_PORT]);
-                       s->service = d_service;
-                       s->daemon = d_daemon;
-                       strcpy(s->service, blobmsg_name(cur));
-                       strcpy(s->daemon, gl.gl_pathv[i]);
-                       s->avl.key = s->service;
+                       s->service = strcpy(d_service, blobmsg_name(cur));
+                       s->daemon = strcpy(d_daemon, gl.gl_pathv[i]);
                        s->active = 1;
                        s->t = 0;
                        s->txt_len = txt_len;
                        s->txt = d_txt;
-                       avl_insert(&services, &s->avl);
-
-                       if (!s->txt_len)
-                               continue;
 
                        blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) {
                                int len = strlen(blobmsg_get_string(txt));
@@ -305,6 +316,8 @@ service_load(char *path)
                                memcpy(d_txt, blobmsg_get_string(txt), len);
                                d_txt += len;
                        }
+
+                       vlist_add(&services, &s->node, s->service);
                }
        }
 }
@@ -314,11 +327,14 @@ service_init(void)
 {
        if (!hostname)
                hostname = get_hostname();
-       avl_init(&services, avl_strcmp, true, NULL);
+
+       vlist_update(&services);
        service_load("/tmp/run/mdnsd/*");
+       vlist_flush(&services);
 }
 
 void
 service_cleanup(void)
 {
+       vlist_flush(&services);
 }