X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=service.c;h=9e2287facb425d332b9435c48fc8a9a4166ac648;hp=763c89979d1463d0cf2979b3750db9e7a359bc98;hb=4aef44b51650d62cd35964b75f9157389c538527;hpb=a0f1b43caf06e13067ccadffdb85b0b57a436e24 diff --git a/service.c b/service.c index 763c899..9e2287f 100644 --- a/service.c +++ b/service.c @@ -12,12 +12,10 @@ */ #include -#include #include #include -#include -#include +#include #include #include #include @@ -26,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -34,6 +32,8 @@ #include "dns.h" #include "service.h" #include "util.h" +#include "interface.h" +#include "announce.h" enum { SERVICE_PORT, @@ -42,13 +42,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; @@ -59,91 +59,48 @@ static const struct blobmsg_policy service_policy[__SERVICE_MAX] = { [SERVICE_TXT] = { .name = "txt", .type = BLOBMSG_TYPE_ARRAY }, }; -static const struct uci_blob_param_list service_attr_list = { - .n_params = __SERVICE_MAX, - .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, int ttl) { - 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, ttl); } static void -service_send_srv(struct uloop_fd *u, struct service *s) +service_add_srv(struct service *s, int ttl) { - 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); - - if (len < 1) - return; + struct dns_srv_data *sd = (struct dns_srv_data *) mdns_buf; + int len = sizeof(*sd); - 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, ttl); } #define TOUT_LOOKUP 60 @@ -162,54 +119,82 @@ service_timeout(struct service *s) } void -service_reply_a(struct uloop_fd *u, int type) +service_reply_a(struct interface *iface, int type, int ttl) { - if (type != TYPE_A) - return; + struct ifaddrs *ifap, *ifa; + struct sockaddr_in *sa; + struct sockaddr_in6 *sa6; + char *addr; + + getifaddrs(&ifap); dns_init_answer(); - service_send_a(u); - dns_send_answer(u, service_name("local")); + for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + if (strcmp(ifa->ifa_name, iface->name)) + continue; + if (ifa->ifa_addr->sa_family==AF_INET) { + sa = (struct sockaddr_in *) ifa->ifa_addr; + addr = inet_ntoa(sa->sin_addr); + printf("Interface: %s\tAddress4: %s\n", ifa->ifa_name, addr); + dns_add_answer(TYPE_A, (uint8_t *) &sa->sin_addr, 4, ttl); + } + if (ifa->ifa_addr->sa_family==AF_INET6) { + uint8_t ll_prefix[] = {0xfe, 0x80 }; + char buf[64] = { 0 }; + sa6 = (struct sockaddr_in6 *) ifa->ifa_addr; + if (!memcmp(&sa6->sin6_addr, &ll_prefix, 2)) { + if (inet_ntop(AF_INET6, &sa6->sin6_addr, buf, 64)) + printf("Interface: %s\tAddress6: %s\n", ifa->ifa_name, buf); + dns_add_answer(TYPE_AAAA, (uint8_t *) &sa6->sin6_addr, 16, ttl); + } + } + } + dns_send_answer(iface, mdns_hostname_local); + + freeifaddrs(ifap); } -void -service_reply(struct uloop_fd *u, char *match) +static void +service_reply_single(struct interface *iface, struct service *s, const char *match, int ttl) { - struct service *s; + const char *host = service_name(s->service); + char *service = strstr(host, "._"); - avl_for_each_element(&services, s, avl) { - char *host = service_name(s->service); - char *service = strstr(host, "._"); + if (!s->active || !service || !service_timeout(s)) + return; - if (!s->active || !service || !service_timeout(s)) - continue; + service++; - service++; + if (match && strcmp(match, s->service)) + return; - if (match && strcmp(match, s->service)) - continue; + dns_init_answer(); + service_add_ptr(service_name(s->service), ttl); + dns_send_answer(iface, service); - dns_init_answer(); - service_send_ptr(u, s); - dns_send_answer(u, service); + dns_init_answer(); + service_add_srv(s, ttl); + if (s->txt && s->txt_len) + dns_add_answer(TYPE_TXT, (uint8_t *) s->txt, s->txt_len, ttl); + dns_send_answer(iface, host); +} - dns_init_answer(); - service_send_srv(u, s); - if (s->txt && s->txt_len) - dns_add_answer(TYPE_TXT, (uint8_t *) s->txt, s->txt_len); - dns_send_answer(u, host); - } +void +service_reply(struct interface *iface, const char *match, int ttl) +{ + struct service *s; + + vlist_for_each_element(&services, s, node) + service_reply_single(iface, s, match, ttl); if (match) return; - dns_init_answer(); - service_send_a(u); - dns_send_answer(u, service_name("local")); + service_reply_a(iface, TYPE_A, ttl); } 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 +204,46 @@ 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, announce_ttl); 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, announce_ttl); } } void -service_announce(struct uloop_fd *u) +service_announce(struct interface *iface) +{ + 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) { - service_announce_services(u, sdudp); - service_announce_services(u, sdtcp); + struct interface *iface; + struct service *s; + + if (!node_old) + return; + + s = container_of(node_old, struct service, node); + + if (!node_new) + vlist_for_each_element(&interfaces, iface, node) + service_reply_single(iface, s, NULL, 0); + + free(s); } static void @@ -259,7 +263,8 @@ 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; @@ -279,19 +284,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)); @@ -304,6 +302,8 @@ service_load(char *path) memcpy(d_txt, blobmsg_get_string(txt), len); d_txt += len; } + + vlist_add(&services, &s->node, s->service); } } } @@ -311,13 +311,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); }