Rename service_name function to the service_instance_name

[project/mdnsd.git] / service.c

diff --git a/service.c b/service.c
index 182b2b2..c8187de 100644 (file)
--- a/service.c
+++ b/service.c
@@ -65,16 +65,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 = <Instance> . <Service> . <Domain>
+ *
+ * @service_domain: service name (a pair of labels) with domain name appended
+ */
 static const char *
-service_name(const char *domain)
+service_instance_name(const char *service_domain)
 {
        static char buffer[256];
 
-       snprintf(buffer, sizeof(buffer), "%s.%s", mdns_hostname, domain);
+       snprintf(buffer, sizeof(buffer), "%s.%s", umdns_host_label, service_domain);
 
        return buffer;
 }
@@ -118,9 +125,9 @@ service_timeout(struct service *s)
 }
 
 static void
-service_reply_single(struct interface *iface, struct service *s, int ttl, int force)
+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->service);
        char *service = strstr(host, "._");
        time_t t = service_timeout(s);
 
@@ -133,63 +140,43 @@ service_reply_single(struct interface *iface, struct service *s, int ttl, int fo
        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->service), 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 *match, int ttl)
 {
        struct service *s;
 
        vlist_for_each_element(&services, s, node) {
                if (!match || !strcmp(s->service, match))
-                       service_reply_single(iface, s, ttl, 0);
+                       service_reply_single(iface, to, s, ttl, 0);
        }
 }
 
 void
-service_announce_services(struct interface *iface, const char *service, int ttl)
+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;
                if (ttl) {
                        dns_init_answer();
                        service_add_ptr(s->service, ttl);
-                       if (tcp)
-                               dns_send_answer(iface, sdtcp);
-                       else
-                               dns_send_answer(iface, sdudp);
+                       dns_send_answer(iface, to, C_DNS_SD);
                }
-               service_reply(iface, s->service, ttl);
+               service_reply_single(iface, to, s, ttl, 0);
        }
 }
 
-void
-service_announce(struct interface *iface, int ttl)
-{
-       service_announce_services(iface, sdudp, ttl);
-       service_announce_services(iface, sdtcp, ttl);
-}
-
 static void
 service_update(struct vlist_tree *tree, struct vlist_node *node_new,
               struct vlist_node *node_old)
@@ -202,7 +189,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;
-                               service_reply_single(iface, s, announce_ttl, 1);
+                               service_reply_single(iface, NULL, s, announce_ttl, 1);
                        }
                return;
        }
@@ -210,7 +197,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)
-                       service_reply_single(iface, s, 0, 1);
+                       service_reply_single(iface, NULL, s, 0, 1);
        free(s);
 }
 
@@ -229,7 +216,7 @@ service_load_blob(struct blob_attr *b)
        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));
 
@@ -248,7 +235,7 @@ service_load_blob(struct blob_attr *b)
        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)
@@ -276,9 +263,12 @@ service_load(char *path)
 
        for (i = 0; i < gl.gl_pathc; i++) {
                blob_buf_init(&b, 0);
-               if (blobmsg_add_json_from_file(&b, gl.gl_pathv[i]))
+               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);
 }
@@ -292,7 +282,7 @@ service_init_cb(struct ubus_request *req, int type, struct blob_attr *msg)
        get_hostname();
 
        vlist_update(&services);
-       service_load("/tmp/run/mdns/*");
+       service_load("/etc/umdns/*");
 
        blob_for_each_attr(cur, msg, rem) {
                struct blob_attr *cur2;