X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=service.c;h=9e2287facb425d332b9435c48fc8a9a4166ac648;hb=2b6893cdb811c57ff0fc01cdd75f86d3e5567c3f;hp=30f477017996c06f13605c14b438ae9348d26ae1;hpb=cef25024bc6d3948d1e4a164d82a63fa21414912;p=project%2Fmdnsd.git diff --git a/service.c b/service.c index 30f4770..9e2287f 100644 --- a/service.c +++ b/service.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -32,6 +33,7 @@ #include "service.h" #include "util.h" #include "interface.h" +#include "announce.h" enum { SERVICE_PORT, @@ -57,56 +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 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 * +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_add_ptr(const char *host) +service_add_ptr(const char *host, int ttl) { int len = dn_comp(host, mdns_buf, sizeof(mdns_buf), NULL, NULL); if (len < 1) return; - dns_add_answer(TYPE_PTR, mdns_buf, len); + dns_add_answer(TYPE_PTR, mdns_buf, len, ttl); } static void -service_add_srv(struct service *s) +service_add_srv(struct service *s, int ttl) { struct dns_srv_data *sd = (struct dns_srv_data *) mdns_buf; - char *host = service_name("local"); int len = sizeof(*sd); - len += dn_comp(host, mdns_buf + len, sizeof(mdns_buf) - len, NULL, NULL); + 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); - dns_add_answer(TYPE_SRV, mdns_buf, len); - service_name(s->service); + dns_add_answer(TYPE_SRV, mdns_buf, len, ttl); } #define TOUT_LOOKUP 60 @@ -125,48 +119,78 @@ service_timeout(struct service *s) } void -service_reply_a(struct interface *iface, 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(); - dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4); - dns_send_answer(iface, 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 interface *iface, const 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, "._"); - vlist_for_each_element(&services, s, node) { - 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_add_ptr(service_name(s->service)); - dns_send_answer(iface, 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_add_srv(s); - if (s->txt && s->txt_len) - dns_add_answer(TYPE_TXT, (uint8_t *) s->txt, s->txt_len); - dns_send_answer(iface, 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; - service_reply_a(iface, TYPE_A); + service_reply_a(iface, TYPE_A, ttl); } void @@ -187,12 +211,12 @@ service_announce_services(struct interface *iface, const char *service) continue; s->t = 0; dns_init_answer(); - service_add_ptr(s->service); + 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); + service_reply(iface, s->service, announce_ttl); } } @@ -207,12 +231,18 @@ static void service_update(struct vlist_tree *tree, struct vlist_node *node_new, struct vlist_node *node_old) { + 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); } @@ -281,8 +311,7 @@ service_load(char *path) void service_init(void) { - if (!hostname) - hostname = get_hostname(); + get_hostname(); vlist_update(&services); service_load("/tmp/run/mdnsd/*");