Allow filtering with instance name in service_reply

[project/mdnsd.git] / service.c

diff --git a/service.c b/service.c
index ca70274bcc8889897ea0ab4048ae8ca7c5d43abe..67e8f40a53b8c50417ba419e042863a226845011 100644 (file)
--- a/service.c
+++ b/service.c
@@ -46,6 +46,7 @@ struct service {
        time_t t;
 
        const char *id;
+       const char *instance;
        const char *service;
        const uint8_t *txt;
        int txt_len;
@@ -67,12 +68,21 @@ static struct blob_buf b;
 static VLIST_TREE(services, avl_strcmp, service_update, false, false);
 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>
+ *
+ * @s: service to generate service instance name for
+ */
 static const char *
-service_name(const char *domain)
+service_instance_name(struct service *s)
 {
        static char buffer[256];
 
-       snprintf(buffer, sizeof(buffer), "%s.%s", mdns_hostname, domain);
+       snprintf(buffer, sizeof(buffer), "%s.%s", s->instance, s->service);
 
        return buffer;
 }
@@ -118,7 +128,7 @@ service_timeout(struct service *s)
 static void
 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);
        char *service = strstr(host, "._");
        time_t t = service_timeout(s);
 
@@ -131,7 +141,7 @@ service_reply_single(struct interface *iface, struct sockaddr *to, struct servic
        s->t = t;
 
        dns_init_answer();
-       service_add_ptr(service_name(s->service), ttl);
+       service_add_ptr(service_instance_name(s), ttl);
        dns_send_answer(iface, to, service);
 
        dns_init_answer();
@@ -142,13 +152,16 @@ service_reply_single(struct interface *iface, struct sockaddr *to, struct servic
 }
 
 void
-service_reply(struct interface *iface, struct sockaddr *to, const char *match, int ttl)
+service_reply(struct interface *iface, struct sockaddr *to, const char *instance, const char *service_domain, int ttl)
 {
        struct service *s;
 
        vlist_for_each_element(&services, s, node) {
-               if (!match || !strcmp(s->service, match))
-                       service_reply_single(iface, to, s, ttl, 0);
+               if (instance && strcmp(s->instance, instance))
+                       continue;
+               if (service_domain && strcmp(s->service, service_domain))
+                       continue;
+               service_reply_single(iface, to, s, ttl, 0);
        }
 }
 
@@ -220,6 +233,7 @@ service_load_blob(struct blob_attr *b)
 
        s->port = blobmsg_get_u32(_tb[SERVICE_PORT]);
        s->id = strcpy(d_id, blobmsg_name(b));
+       s->instance = umdns_host_label;
        s->service = strcpy(d_service, blobmsg_get_string(_tb[SERVICE_SERVICE]));
        s->active = 1;
        s->t = 0;