X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=service.c;h=9ee01e6a4bef3e2807dc8f4d0762533182ba67f7;hp=15f05f95d53029151186bf9bec989d3c09416d42;hb=e78deecf29d4c7298743aba09ee22c51a547c70d;hpb=1a6e9b01b1f9032c92fb9c17d4aa4348666b24ef diff --git a/service.c b/service.c index 15f05f9..9ee01e6 100644 --- a/service.c +++ b/service.c @@ -65,7 +65,7 @@ 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); -char *sdudp = "_services._dns-sd._udp.local"; +const char *sdudp = "_services._dns-sd._udp.local"; static int service_init_announce; static const char * @@ -133,13 +133,13 @@ service_reply_single(struct interface *iface, struct service *s, int ttl, int fo 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 @@ -163,7 +163,7 @@ 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, NULL, sdudp); } service_reply_single(iface, s, ttl, 0); } @@ -255,9 +255,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); }