properly announce all ips of an interface when asked

[project/mdnsd.git] / service.c

diff --git a/service.c b/service.c
index f60431d..6b885de 100644 (file)
--- a/service.c
+++ b/service.c
@@ -15,6 +15,7 @@
 #include <arpa/nameser.h>
 #include <sys/socket.h>
 
+#include <ifaddrs.h>
 #include <resolv.h>
 #include <glob.h>
 #include <stdio.h>
@@ -57,27 +58,21 @@ 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;
 }
@@ -85,48 +80,26 @@ service_name(const char *domain)
 static void
 service_add_ptr(const char *host)
 {
-       unsigned char buffer[MAX_NAME_LEN];
-       int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
+       int len = dn_comp(host, mdns_buf, sizeof(mdns_buf), NULL, NULL);
 
        if (len < 1)
                return;
 
-       dns_add_answer(TYPE_PTR, buffer, len);
-}
-
-static void
-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);
-
-       if (len < 1)
-               return;
-
-       dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4);
+       dns_add_answer(TYPE_PTR, mdns_buf, len);
 }
 
 static void
 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);
-
-       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);
 }
 
 #define TOUT_LOOKUP    60
@@ -147,12 +120,37 @@ service_timeout(struct service *s)
 void
 service_reply_a(struct interface *iface, int type)
 {
-       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(iface);
-       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);
+               }
+               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);
+                       }
+               }
+       }
+       dns_send_answer(iface, mdns_hostname_local);
+
+       freeifaddrs(ifap);
 }
 
 void
@@ -161,7 +159,7 @@ service_reply(struct interface *iface, const char *match)
        struct service *s;
 
        vlist_for_each_element(&services, s, node) {
-               char *host = service_name(s->service);
+               const char *host = service_name(s->service);
                char *service = strstr(host, "._");
 
                if (!s->active || !service || !service_timeout(s))
@@ -186,9 +184,7 @@ service_reply(struct interface *iface, const char *match)
        if (match)
                return;
 
-       dns_init_answer();
-       service_send_a(iface);
-       dns_send_answer(iface, service_name("local"));
+       service_reply_a(iface, TYPE_A);
 }
 
 void
@@ -303,8 +299,7 @@ service_load(char *path)
 void
 service_init(void)
 {
-       if (!hostname)
-               hostname = get_hostname();
+       get_hostname();
 
        vlist_update(&services);
        service_load("/tmp/run/mdnsd/*");