Simplify UDP vs. TCP handling in service_announce_services

[project/mdnsd.git] / service.c

diff --git a/service.c b/service.c
index fe6e5a9..e375fce 100644 (file)
--- a/service.c
+++ b/service.c
@@ -15,7 +15,6 @@
 #include <arpa/nameser.h>
 #include <sys/socket.h>
 
 #include <arpa/nameser.h>
 #include <sys/socket.h>
 

-#include <ifaddrs.h>

 #include <resolv.h>
 #include <glob.h>
 #include <stdio.h>
 #include <resolv.h>
 #include <glob.h>
 #include <stdio.h>


@@ -66,8 +65,8 @@ 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 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";
+char *sdudp =  "_services._dns-sd._udp.local";
+char *sdtcp =  "_services._dns-sd._tcp.local";

 static int service_init_announce;
 
 static const char *
 static int service_init_announce;
 
 static const char *


@@ -107,7 +106,7 @@ service_add_srv(struct service *s, int ttl)
 
 #define TOUT_LOOKUP    60
 
 
 #define TOUT_LOOKUP    60
 

-static int
+static time_t

 service_timeout(struct service *s)
 {
        time_t t = monotonic_time();
 service_timeout(struct service *s)
 {
        time_t t = monotonic_time();


@@ -115,53 +114,23 @@ service_timeout(struct service *s)
        if (t - s->t <= TOUT_LOOKUP)
                return 0;
 
        if (t - s->t <= TOUT_LOOKUP)
                return 0;
 

-       s->t = t;
-
-       return 1;
-}
-
-void
-service_reply_a(struct interface *iface, 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
 }
 
 static void

-service_reply_single(struct interface *iface, struct service *s, const char *match, int ttl, int force)
+service_reply_single(struct interface *iface, struct service *s, int ttl, int force)

 {
        const char *host = service_name(s->service);
        char *service = strstr(host, "._");
 {
        const char *host = service_name(s->service);
        char *service = strstr(host, "._");

+       time_t t = service_timeout(s);
+

 
 

-       if (!force && (!s->active || !service || !service_timeout(s)))
+       if (!force && (!s->active || !service || !t))

                return;
 
        service++;
 
                return;
 
        service++;
 

-       if (match && strcmp(match, s->service))
-               return;
+       s->t = t;

 
        dns_init_answer();
        service_add_ptr(service_name(s->service), ttl);
 
        dns_init_answer();
        service_add_ptr(service_name(s->service), ttl);


@@ -179,26 +148,16 @@ service_reply(struct interface *iface, const char *match, int ttl)
 {
        struct service *s;
 
 {
        struct service *s;
 

-       vlist_for_each_element(&services, s, node)
-               service_reply_single(iface, s, match, ttl, 0);
-
-       if (match)
-               return;
-
-       if (ttl)
-               service_reply_a(iface, ttl);
+       vlist_for_each_element(&services, s, node) {
+               if (!match || !strcmp(s->service, match))
+                       service_reply_single(iface, s, ttl, 0);
+       }

 }
 
 void
 }
 
 void

-service_announce_services(struct interface *iface, const char *service, int ttl)
+service_announce_services(struct interface *iface, int tcp, int ttl)

 {
        struct service *s;
 {
        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)
 
        vlist_for_each_element(&services, s, node) {
                if (!strstr(s->service, "._tcp") && tcp)


@@ -214,15 +173,15 @@ service_announce_services(struct interface *iface, const char *service, int ttl)
                        else
                                dns_send_answer(iface, sdudp);
                }
                        else
                                dns_send_answer(iface, sdudp);
                }

-               service_reply(iface, s->service, ttl);
+               service_reply_single(iface, s, ttl, 0);

        }
 }
 
 void
 service_announce(struct interface *iface, int ttl)
 {
        }
 }
 
 void
 service_announce(struct interface *iface, int ttl)
 {

-       service_announce_services(iface, sdudp, ttl);
-       service_announce_services(iface, sdtcp, ttl);
+       service_announce_services(iface, 0, ttl);
+       service_announce_services(iface, 1, ttl);

 }
 
 static void
 }
 
 static void


@@ -237,7 +196,7 @@ service_update(struct vlist_tree *tree, struct vlist_node *node_new,
                if (service_init_announce)
                        vlist_for_each_element(&interfaces, iface, node) {
                                s->t = 0;
                if (service_init_announce)
                        vlist_for_each_element(&interfaces, iface, node) {
                                s->t = 0;

-                               service_reply_single(iface, s, NULL, announce_ttl, 1);
+                               service_reply_single(iface, s, announce_ttl, 1);

                        }
                return;
        }
                        }
                return;
        }


@@ -245,7 +204,7 @@ service_update(struct vlist_tree *tree, struct vlist_node *node_new,
        s = container_of(node_old, struct service, node);
        if (!node_new && service_init_announce)
                vlist_for_each_element(&interfaces, iface, node)
        s = container_of(node_old, struct service, node);
        if (!node_new && service_init_announce)
                vlist_for_each_element(&interfaces, iface, node)

-                       service_reply_single(iface, s, NULL, 0, 1);
+                       service_reply_single(iface, s, 0, 1);

        free(s);
 }
 
        free(s);
 }
 


@@ -264,7 +223,7 @@ service_load_blob(struct blob_attr *b)
        if (!_tb[SERVICE_PORT] || !_tb[SERVICE_SERVICE])
                return;
 
        if (!_tb[SERVICE_PORT] || !_tb[SERVICE_SERVICE])
                return;
 

-       if (_tb[SERVICE_SERVICE])
+       if (_tb[SERVICE_TXT])

                blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2)
                        txt_len += 1 + strlen(blobmsg_get_string(txt));
 
                blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2)
                        txt_len += 1 + strlen(blobmsg_get_string(txt));
 


@@ -283,7 +242,7 @@ service_load_blob(struct blob_attr *b)
        s->txt_len = txt_len;
        s->txt = d_txt;
 
        s->txt_len = txt_len;
        s->txt = d_txt;
 

-       if (_tb[SERVICE_SERVICE])
+       if (_tb[SERVICE_TXT])

                blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) {
                        int len = strlen(blobmsg_get_string(txt));
                        if (!len)
                blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) {
                        int len = strlen(blobmsg_get_string(txt));
                        if (!len)