X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=service.c;h=67e8f40a53b8c50417ba419e042863a226845011;hb=26ce7dca8085d34e6c3910680da51695f3508eec;hp=588daf351a787177e67ce58a2458beeaf757dfa4;hpb=0450f9bb07a6a8684a761b9005ec06b4ef959b4c;p=project%2Fmdnsd.git

diff --git a/service.c b/service.c
index 588daf3..67e8f40 100644
--- 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;
@@ -65,15 +66,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);
-const char *sdudp =  "_services._dns-sd._udp.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>
+ *
+ * @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;
 }
@@ -117,9 +126,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);
 	char *service = strstr(host, "._");
 	time_t t = service_timeout(s);
 
@@ -132,29 +141,32 @@ 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), 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 *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, 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);
 	}
 }
 
 void
-service_announce_services(struct interface *iface, int ttl)
+service_announce_services(struct interface *iface, struct sockaddr *to, int ttl)
 {
 	struct service *s;
 
@@ -163,9 +175,9 @@ service_announce_services(struct interface *iface, int ttl)
 		if (ttl) {
 			dns_init_answer();
 			service_add_ptr(s->service, ttl);
-			dns_send_answer(iface, sdudp);
+			dns_send_answer(iface, to, C_DNS_SD);
 		}
-		service_reply_single(iface, s, ttl, 0);
+		service_reply_single(iface, to, s, ttl, 0);
 	}
 }
 
@@ -181,7 +193,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;
 	}
@@ -189,7 +201,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);
 }
 
@@ -221,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;
@@ -255,9 +268,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);
 }