#include <resolv.h>
#include <glob.h>
+#include <inttypes.h>
#include <stdio.h>
#include <time.h>
#include "announce.h"
enum {
+ SERVICE_INSTANCE,
SERVICE_SERVICE,
SERVICE_PORT,
SERVICE_TXT,
time_t t;
const char *id;
+ const char *instance;
const char *service;
const uint8_t *txt;
int txt_len;
};
static const struct blobmsg_policy service_policy[__SERVICE_MAX] = {
+ [SERVICE_INSTANCE] = { .name = "instance", .type = BLOBMSG_TYPE_STRING },
[SERVICE_SERVICE] = { .name = "service", .type = BLOBMSG_TYPE_STRING },
[SERVICE_PORT] = { .name = "port", .type = BLOBMSG_TYPE_INT32 },
[SERVICE_TXT] = { .name = "txt", .type = BLOBMSG_TYPE_ARRAY },
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;
}
{
time_t t = monotonic_time();
- if (t - s->t <= TOUT_LOOKUP)
+ if (t - s->t <= TOUT_LOOKUP) {
+ DBG(2, "t=%" PRId64 ", s->t=%" PRId64 ", t - s->t = %" PRId64 "\n", (int64_t)t, (int64_t)s->t, (int64_t)(t - s->t));
return 0;
+ }
return t;
}
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);
s->t = t;
dns_init_answer();
- service_add_ptr(service_name(s->service), ttl);
- dns_send_answer(iface, NULL, 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, NULL, 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;
if (ttl) {
dns_init_answer();
service_add_ptr(s->service, ttl);
- dns_send_answer(iface, NULL, 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);
}
{
struct blob_attr *txt, *_tb[__SERVICE_MAX];
struct service *s;
- char *d_service, *d_id;
+ char *d_instance, *d_service, *d_id;
uint8_t *d_txt;
int rem2;
int txt_len = 0;
+ unsigned int n;
blobmsg_parse(service_policy, ARRAY_SIZE(service_policy),
_tb, blobmsg_data(b), blobmsg_data_len(b));
blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2)
txt_len += 1 + strlen(blobmsg_get_string(txt));
+ n = strlen(blobmsg_name(b));
s = calloc_a(sizeof(*s),
- &d_id, strlen(blobmsg_name(b)) + 1,
+ &d_id, n + 1,
+ &d_instance, _tb[SERVICE_INSTANCE] ? strlen(blobmsg_get_string(_tb[SERVICE_INSTANCE])) + 1 : 0,
&d_service, strlen(blobmsg_get_string(_tb[SERVICE_SERVICE])) + 1,
&d_txt, txt_len);
if (!s)
return;
s->port = blobmsg_get_u32(_tb[SERVICE_PORT]);
- s->id = strcpy(d_id, blobmsg_name(b));
+ s->id = strncpy(d_id, blobmsg_name(b), n);
+ if (_tb[SERVICE_INSTANCE])
+ s->instance = strcpy(d_instance, blobmsg_get_string(_tb[SERVICE_INSTANCE]));
+ else
+ s->instance = umdns_host_label;
s->service = strcpy(d_service, blobmsg_get_string(_tb[SERVICE_SERVICE]));
s->active = 1;
s->t = 0;