X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=service.c;h=8704a866d9ec6b2d200e86bb343b207ce2b9f285;hp=486a1fbcae7606c7237e60a984acee06e56c6e18;hb=28de4beed5a3ffb8ce5ad6a2543e60c5efb46430;hpb=37121416de13c5cfd74635a5632f95eab4c0a3d9 diff --git a/service.c b/service.c index 486a1fb..8704a86 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,13 +40,13 @@ enum { }; struct service { - struct avl_node avl; + struct vlist_node node; time_t t; - char *service; - char *daemon; - char *txt; + const char *service; + const char *daemon; + const uint8_t *txt; int txt_len; int port; int active; @@ -64,86 +62,48 @@ 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; -char *hostname = NULL; +static VLIST_TREE(services, avl_strcmp, service_update, false, false); static char *sdudp = "_services._dns-sd._udp.local"; static char *sdtcp = "_services._dns-sd._tcp.local"; -char* -service_name(char *domain) +static const char * +service_name(const char *domain) { static char buffer[256]; - snprintf(buffer, sizeof(buffer), "%s.%s", hostname, domain); + snprintf(buffer, sizeof(buffer), "%s.%s", mdns_hostname, domain); return buffer; } static void -service_send_ptr(struct uloop_fd *u, struct service *s) -{ - unsigned char buffer[MAX_NAME_LEN]; - char *host = service_name(s->service); - int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL); - - if (len < 1) - return; - - dns_add_answer(TYPE_PTR, buffer, len); -} - -static void -service_send_ptr_c(struct uloop_fd *u, char *host) -{ - unsigned char buffer[MAX_NAME_LEN]; - int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL); - - if (len < 1) - return; - - dns_add_answer(TYPE_PTR, buffer, len); -} - -static void -service_send_a(struct uloop_fd *u) +service_add_ptr(const char *host) { - 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; - } + int len = dn_comp(host, mdns_buf, sizeof(mdns_buf), NULL, NULL); if (len < 1) return; - dns_add_answer(TYPE_A, (uint8_t *) &in.s_addr, 4); + dns_add_answer(TYPE_PTR, mdns_buf, len); } 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; - char *host = service_name("local"); - int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL); + struct dns_srv_data *sd = (struct dns_srv_data *) mdns_buf; + int len = sizeof(*sd); - if (len < 1) - return; - - sd = calloc(1, len + sizeof(struct dns_srv_data)); - if (!sd) + len += dn_comp(mdns_hostname_local, mdns_buf + len, sizeof(mdns_buf) - len, NULL, NULL); + if (len <= sizeof(*sd)) return; sd->port = cpu_to_be16(s->port); - memcpy(&sd[1], buffer, len); - host = service_name(s->service); - dns_add_answer(TYPE_SRV, (uint8_t *) sd, len + sizeof(struct dns_srv_data)); - free(sd); + dns_add_answer(TYPE_SRV, mdns_buf, len); } #define TOUT_LOOKUP 60 @@ -162,23 +122,23 @@ 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")); + dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4); + dns_send_answer(iface, mdns_hostname_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) { - char *host = service_name(s->service); + vlist_for_each_element(&services, s, node) { + const char *host = service_name(s->service); char *service = strstr(host, "._"); if (!s->active || !service || !service_timeout(s)) @@ -190,26 +150,24 @@ 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(service_name(s->service)); + 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_reply_a(iface, TYPE_A); } 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 +177,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(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 @@ -259,40 +230,33 @@ service_load(char *path) continue; blob_for_each_attr(cur, b.head, rem) { struct service *s; - char *d_service, *d_txt, *d_daemon; + char *d_service, *d_daemon; + uint8_t *d_txt; int rem2; + int txt_len = 0; blobmsg_parse(service_policy, ARRAY_SIZE(service_policy), _tb, blobmsg_data(cur), blobmsg_data_len(cur)); if (!_tb[SERVICE_PORT] || !_tb[SERVICE_TXT]) continue; + blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) + txt_len += 1 + strlen(blobmsg_get_string(txt)); + s = calloc_a(sizeof(*s), &d_daemon, strlen(gl.gl_pathv[i]) + 1, &d_service, strlen(blobmsg_name(cur)) + 1, - &d_txt, blobmsg_data_len(_tb[SERVICE_TXT])); + &d_txt, txt_len); if (!s) 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; - avl_insert(&services, &s->avl); - - blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) - s->txt_len += 1 + strlen(blobmsg_get_string(txt)); - - if (!s->txt_len) - continue; - - d_txt = s->txt = malloc(s->txt_len); - if (!s->txt) - continue; + s->txt_len = txt_len; + s->txt = d_txt; blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) { int len = strlen(blobmsg_get_string(txt)); @@ -305,6 +269,8 @@ service_load(char *path) memcpy(d_txt, blobmsg_get_string(txt), len); d_txt += len; } + + vlist_add(&services, &s->node, s->service); } } } @@ -312,13 +278,16 @@ service_load(char *path) void service_init(void) { - if (!hostname) - hostname = get_hostname(); - avl_init(&services, avl_strcmp, true, NULL); + get_hostname(); + + vlist_update(&services); service_load("/tmp/run/mdnsd/*"); + vlist_flush(&services); } void service_cleanup(void) { + vlist_flush(&services); + blob_buf_free(&b); }