Simplify UDP vs. TCP handling in service_announce_services

[project/mdnsd.git] / service.c

diff --git a/service.c b/service.c
index a3a5bb4..e375fce 100644 (file)
--- a/service.c
+++ b/service.c
@@ -65,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 *


@@ -118,7 +118,7 @@ service_timeout(struct service *s)
 }
 
 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, "._");


@@ -130,9 +130,6 @@ service_reply_single(struct interface *iface, struct service *s, const char *mat
 
        service++;
 
 
        service++;
 

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

        s->t = t;
 
        dns_init_answer();
        s->t = t;
 
        dns_init_answer();


@@ -151,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)
-               dns_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)


@@ -186,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


@@ -209,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;
        }


@@ -217,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);
 }
 


@@ -236,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));
 


@@ -255,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)