X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=service.c;h=b8eb40608e3578689a9f7ef987bf5733a0a7c2c2;hp=9eb620eddc645425bfe318bebf93b14e18758b03;hb=2c1fe9afacc9379dcfd0db911fc9ee45adfdc0f4;hpb=3558e5d49d8560fe7a09ef2034c10615b83974f9 diff --git a/service.c b/service.c index 9eb620e..b8eb406 100644 --- a/service.c +++ b/service.c @@ -12,11 +12,8 @@ */ #include -#include #include #include -#include -#include #include #include @@ -26,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -34,6 +31,7 @@ #include "dns.h" #include "service.h" #include "util.h" +#include "interface.h" enum { SERVICE_PORT, @@ -42,7 +40,7 @@ enum { }; struct service { - struct avl_node avl; + struct vlist_node node; time_t t; @@ -64,8 +62,12 @@ 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"; @@ -81,7 +83,7 @@ service_name(const 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]; const char *host = service_name(s->service); @@ -94,7 +96,7 @@ service_send_ptr(struct uloop_fd *u, struct service *s) } static void -service_send_ptr_c(struct uloop_fd *u, const 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,26 +108,20 @@ service_send_ptr_c(struct uloop_fd *u, const 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); - return; - } if (len < 1) return; - dns_add_answer(TYPE_A, (uint8_t *) &in.s_addr, 4); + dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4); } 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 +158,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, const 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 +186,26 @@ service_reply(struct uloop_fd *u, const 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, const char *service) +service_announce_services(struct interface *iface, const char *service) { struct service *s; int tcp = 1; @@ -219,27 +215,40 @@ service_announce_services(struct uloop_fd *u, const 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 @@ -282,15 +291,10 @@ service_load(char *path) s->port = blobmsg_get_u32(_tb[SERVICE_PORT]); s->service = strcpy(d_service, blobmsg_name(cur)); s->daemon = strcpy(d_daemon, gl.gl_pathv[i]); - s->avl.key = s->service; 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)); @@ -303,6 +307,8 @@ service_load(char *path) memcpy(d_txt, blobmsg_get_string(txt), len); d_txt += len; } + + vlist_add(&services, &s->node, s->service); } } } @@ -312,11 +318,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); }