projects
/
project
/
mdnsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare support for sending unicast DNS answers
[project/mdnsd.git]
/
service.c
diff --git
a/service.c
b/service.c
index
36d20c7
..
9ee01e6
100644
(file)
--- 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);
static struct blob_buf b;
static VLIST_TREE(services, avl_strcmp, service_update, false, false);
-char *sdudp = "_services._dns-sd._udp.local";
+c
onst c
har *sdudp = "_services._dns-sd._udp.local";
static int service_init_announce;
static const char *
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_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_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
@@
-163,7
+163,7
@@
service_announce_services(struct interface *iface, int ttl)
if (ttl) {
dns_init_answer();
service_add_ptr(s->service, 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);
}
}
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);
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);
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);
}
}
globfree(&gl);
}
@@
-271,7
+274,7
@@
service_init_cb(struct ubus_request *req, int type, struct blob_attr *msg)
get_hostname();
vlist_update(&services);
get_hostname();
vlist_update(&services);
- service_load("/
tmp/run/
mdns/*");
+ service_load("/
etc/u
mdns/*");
blob_for_each_attr(cur, msg, rem) {
struct blob_attr *cur2;
blob_for_each_attr(cur, msg, rem) {
struct blob_attr *cur2;