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>
+ *
+ * @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;
}
}
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);
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, int ttl)
+service_announce_services(struct interface *iface, struct sockaddr *to, int ttl)
{
struct service *s;
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);
}
}
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;
}
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);
}