X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=service.c;h=97b6f911121c2cd2b22334a4705e66f5a23d723c;hp=01a55b6d8b4d7ca80cbb76e74cf928c5fe51a126;hb=HEAD;hpb=27353bce41b3c60cd28f9841466b241653c6fe32 diff --git a/service.c b/service.c index 01a55b6..97b6f91 100644 --- a/service.c +++ b/service.c @@ -15,20 +15,18 @@ #include #include -#include #include #include #include #include -#include -#include - +#include #include #include #include #include +#include "ubus.h" #include "dns.h" #include "service.h" #include "util.h" @@ -36,6 +34,8 @@ #include "announce.h" enum { + SERVICE_INSTANCE, + SERVICE_SERVICE, SERVICE_PORT, SERVICE_TXT, __SERVICE_MAX, @@ -46,8 +46,9 @@ struct service { time_t t; + const char *id; + const char *instance; const char *service; - const char *daemon; const uint8_t *txt; int txt_len; int port; @@ -55,6 +56,8 @@ struct service { }; static const struct blobmsg_policy service_policy[__SERVICE_MAX] = { + [SERVICE_INSTANCE] = { .name = "instance", .type = BLOBMSG_TYPE_STRING }, + [SERVICE_SERVICE] = { .name = "service", .type = BLOBMSG_TYPE_STRING }, [SERVICE_PORT] = { .name = "port", .type = BLOBMSG_TYPE_INT32 }, [SERVICE_TXT] = { .name = "txt", .type = BLOBMSG_TYPE_ARRAY }, }; @@ -65,15 +68,23 @@ service_update(struct vlist_tree *tree, struct vlist_node *node_new, static struct blob_buf b; 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"; +static int service_init_announce; +/** + * service_instance_name - construct Service Instance Name as in RFC 6763 + * + * RFC 6763 specifies Service Instance Names in the following way: + * + * Service Instance Name = . . + * + * @s: service to generate service instance name for + */ static const char * -service_name(const char *domain) +service_instance_name(struct service *s) { static char buffer[256]; - snprintf(buffer, sizeof(buffer), "%s.%s", mdns_hostname, domain); + snprintf(buffer, sizeof(buffer), "%s.%s", s->instance, s->service); return buffer; } @@ -105,121 +116,75 @@ service_add_srv(struct service *s, int ttl) #define TOUT_LOOKUP 60 -static int +static time_t service_timeout(struct service *s) { - time_t t = time(NULL); + time_t t = monotonic_time(); - if (t - s->t <= TOUT_LOOKUP) + if (t - s->t <= TOUT_LOOKUP) { + DBG(2, "t=%lu, s->t=%lu, t - s->t = %lu\n", t, s->t, t - s->t); return 0; - - s->t = t; - - return 1; -} - -void -service_reply_a(struct interface *iface, int type, int ttl) -{ - struct ifaddrs *ifap, *ifa; - struct sockaddr_in *sa; - struct sockaddr_in6 *sa6; - - getifaddrs(&ifap); - - dns_init_answer(); - 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; - 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 }; - sa6 = (struct sockaddr_in6 *) ifa->ifa_addr; - if (!memcmp(&sa6->sin6_addr, &ll_prefix, 2)) - dns_add_answer(TYPE_AAAA, (uint8_t *) &sa6->sin6_addr, 16, ttl); - } } - dns_send_answer(iface, mdns_hostname_local); - freeifaddrs(ifap); + return t; } static void -service_reply_single(struct interface *iface, struct service *s, const char *match, int ttl) +service_reply_single(struct interface *iface, struct sockaddr *to, struct service *s, int ttl, int force) { - const char *host = service_name(s->service); + const char *host = service_instance_name(s); char *service = strstr(host, "._"); + time_t t = service_timeout(s); - if (!s->active || !service || !service_timeout(s)) + + if (!force && (!s->active || !service || !t)) return; service++; - if (match && strcmp(match, s->service)) - return; + s->t = t; dns_init_answer(); - service_add_ptr(service_name(s->service), ttl); - dns_send_answer(iface, service); + service_add_ptr(service_instance_name(s), ttl); + dns_send_answer(iface, to, 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_send_answer(iface, to, host); } void -service_reply(struct interface *iface, const char *match, int ttl) +service_reply(struct interface *iface, struct sockaddr *to, const char *instance, const char *service_domain, int ttl) { struct service *s; - vlist_for_each_element(&services, s, node) - service_reply_single(iface, s, match, ttl); - - if (match) - return; - - service_reply_a(iface, TYPE_A, ttl); + vlist_for_each_element(&services, s, node) { + if (instance && strcmp(s->instance, instance)) + continue; + if (service_domain && strcmp(s->service, service_domain)) + continue; + service_reply_single(iface, to, s, ttl, 0); + } } void -service_announce_services(struct interface *iface, const char *service) +service_announce_services(struct interface *iface, struct sockaddr *to, int ttl) { struct service *s; - int tcp = 1; - - if (!strcmp(service, sdudp)) - tcp = 0; - else if (strcmp(service, sdtcp)) - return; 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_add_ptr(s->service, announce_ttl); - if (tcp) - dns_send_answer(iface, sdtcp); - else - dns_send_answer(iface, sdudp); - service_reply(iface, s->service, announce_ttl); + if (ttl) { + dns_init_answer(); + service_add_ptr(s->service, ttl); + dns_send_answer(iface, to, C_DNS_SD); + } + service_reply_single(iface, to, s, ttl, 0); } } -void -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) @@ -227,88 +192,162 @@ service_update(struct vlist_tree *tree, struct vlist_node *node_new, struct interface *iface; struct service *s; - if (!node_old) + if (!node_old) { + s = container_of(node_new, struct service, node); + if (service_init_announce) + vlist_for_each_element(&interfaces, iface, node) { + s->t = 0; + service_reply_single(iface, NULL, s, announce_ttl, 1); + } return; + } s = container_of(node_old, struct service, node); - - if (!node_new) + if (!node_new && service_init_announce) vlist_for_each_element(&interfaces, iface, node) - service_reply_single(iface, s, NULL, 0); - + service_reply_single(iface, NULL, s, 0, 1); free(s); } static void +service_load_blob(struct blob_attr *b) +{ + struct blob_attr *txt, *_tb[__SERVICE_MAX]; + struct service *s; + char *d_instance, *d_service, *d_id; + uint8_t *d_txt; + int rem2; + int txt_len = 0; + + blobmsg_parse(service_policy, ARRAY_SIZE(service_policy), + _tb, blobmsg_data(b), blobmsg_data_len(b)); + if (!_tb[SERVICE_PORT] || !_tb[SERVICE_SERVICE]) + return; + + if (_tb[SERVICE_TXT]) + blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) + txt_len += 1 + strlen(blobmsg_get_string(txt)); + + s = calloc_a(sizeof(*s), + &d_id, strlen(blobmsg_name(b)) + 1, + &d_instance, _tb[SERVICE_INSTANCE] ? strlen(blobmsg_get_string(_tb[SERVICE_INSTANCE])) + 1 : 0, + &d_service, strlen(blobmsg_get_string(_tb[SERVICE_SERVICE])) + 1, + &d_txt, txt_len); + if (!s) + return; + + s->port = blobmsg_get_u32(_tb[SERVICE_PORT]); + s->id = strcpy(d_id, blobmsg_name(b)); + if (_tb[SERVICE_INSTANCE]) + s->instance = strcpy(d_instance, blobmsg_get_string(_tb[SERVICE_INSTANCE])); + else + s->instance = umdns_host_label; + s->service = strcpy(d_service, blobmsg_get_string(_tb[SERVICE_SERVICE])); + s->active = 1; + s->t = 0; + s->txt_len = txt_len; + s->txt = d_txt; + + if (_tb[SERVICE_TXT]) + blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) { + int len = strlen(blobmsg_get_string(txt)); + if (!len) + return; + if (len > 0xff) + len = 0xff; + *d_txt = len; + d_txt++; + memcpy(d_txt, blobmsg_get_string(txt), len); + d_txt += len; + } + + vlist_add(&services, &s->node, s->id); +} + +static void service_load(char *path) { - struct blob_attr *txt, *cur, *_tb[__SERVICE_MAX]; - int rem, i; + struct blob_attr *cur; glob_t gl; + int i, rem; if (glob(path, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl)) return; for (i = 0; i < gl.gl_pathc; i++) { blob_buf_init(&b, 0); + if (blobmsg_add_json_from_file(&b, gl.gl_pathv[i])) { + blob_for_each_attr(cur, b.head, rem) + service_load_blob(cur); + } else { + fprintf(stderr, "Error reading %s JSON\n", gl.gl_pathv[i]); + } + } + globfree(&gl); +} - if (!blobmsg_add_json_from_file(&b, gl.gl_pathv[i])) - continue; - blob_for_each_attr(cur, b.head, rem) { - struct service *s; - 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; +static void +service_init_cb(struct ubus_request *req, int type, struct blob_attr *msg) +{ + struct blob_attr *cur; + int rem; - blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) - txt_len += 1 + strlen(blobmsg_get_string(txt)); + get_hostname(); - s = calloc_a(sizeof(*s), - &d_daemon, strlen(gl.gl_pathv[i]) + 1, - &d_service, strlen(blobmsg_name(cur)) + 1, - &d_txt, txt_len); - if (!s) + vlist_update(&services); + service_load("/etc/umdns/*"); + + blob_for_each_attr(cur, msg, rem) { + struct blob_attr *cur2; + int rem2; + + blobmsg_for_each_attr(cur2, cur, rem2) { + struct blob_attr *cur3; + int rem3; + + if (strcmp(blobmsg_name(cur2), "instances")) continue; - 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->active = 1; - s->t = 0; - 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)); - if (!len) - continue; - if (len > 0xff) - len = 0xff; - *d_txt = len; - d_txt++; - memcpy(d_txt, blobmsg_get_string(txt), len); - d_txt += len; + blobmsg_for_each_attr(cur3, cur2, rem3) { + struct blob_attr *cur4; + int rem4; + int running = 0; + + blobmsg_for_each_attr(cur4, cur3, rem4) { + const char *name = blobmsg_name(cur4); + + if (!strcmp(name, "running")) { + running = blobmsg_get_bool(cur4); + } else if (running && !strcmp(name, "data")) { + struct blob_attr *cur5; + int rem5; + + blobmsg_for_each_attr(cur5, cur4, rem5) { + struct blob_attr *cur6; + int rem6; + + if (strcmp(blobmsg_name(cur5), "mdns")) + continue; + + blobmsg_for_each_attr(cur6, cur5, rem6) + service_load_blob(cur6); + } + break; + } + } } - - vlist_add(&services, &s->node, s->service); } } + vlist_flush(&services); } void -service_init(void) +service_init(int announce) { get_hostname(); - vlist_update(&services); - service_load("/tmp/run/mdnsd/*"); - vlist_flush(&services); + service_init_announce = announce; + ubus_service_list(service_init_cb); } void