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";
+const char *sdudp = "_services._dns-sd._udp.local";
static int service_init_announce;
static const char *
dns_init_answer();
service_add_ptr(service_name(s->service), ttl);
- dns_send_answer(iface, service);
+ dns_send_answer(iface, NULL, 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, NULL, host);
}
void
}
void
-service_announce_services(struct interface *iface, const char *service, int ttl)
+service_announce_services(struct interface *iface, 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, NULL, sdudp);
}
service_reply_single(iface, 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)
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));
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)
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);
}
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;