projects
/
project
/
mdnsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify UDP vs. TCP handling in service_announce_services
[project/mdnsd.git]
/
service.c
diff --git
a/service.c
b/service.c
index 182b2b2bfaa4496cc35eedecf570f1df20127acf..e375fced85ffb8f1a13a8d0b4cd8933a06c79f56 100644
(file)
--- a/
service.c
+++ b/
service.c
@@
-65,8
+65,8
@@
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);
-
static
char *sdudp = "_services._dns-sd._udp.local";
-
static
char *sdtcp = "_services._dns-sd._tcp.local";
+char *sdudp = "_services._dns-sd._udp.local";
+char *sdtcp = "_services._dns-sd._tcp.local";
static int service_init_announce;
static const char *
static int service_init_announce;
static const char *
@@
-155,15
+155,9
@@
service_reply(struct interface *iface, const char *match, int ttl)
}
void
}
void
-service_announce_services(struct interface *iface,
const char *service
, int ttl)
+service_announce_services(struct interface *iface,
int tcp
, int ttl)
{
struct service *s;
{
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)
vlist_for_each_element(&services, s, node) {
if (!strstr(s->service, "._tcp") && tcp)
@@
-179,15
+173,15
@@
service_announce_services(struct interface *iface, const char *service, int ttl)
else
dns_send_answer(iface, sdudp);
}
else
dns_send_answer(iface, sdudp);
}
- service_reply
(iface, s->service, ttl
);
+ service_reply
_single(iface, s, ttl, 0
);
}
}
void
service_announce(struct interface *iface, int ttl)
{
}
}
void
service_announce(struct interface *iface, int ttl)
{
- service_announce_services(iface,
sdudp
, ttl);
- service_announce_services(iface,
sdtcp
, ttl);
+ service_announce_services(iface,
0
, ttl);
+ service_announce_services(iface,
1
, ttl);
}
static void
}
static void
@@
-229,7
+223,7
@@
service_load_blob(struct blob_attr *b)
if (!_tb[SERVICE_PORT] || !_tb[SERVICE_SERVICE])
return;
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));
blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2)
txt_len += 1 + strlen(blobmsg_get_string(txt));
@@
-248,7
+242,7
@@
service_load_blob(struct blob_attr *b)
s->txt_len = txt_len;
s->txt = d_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)
blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) {
int len = strlen(blobmsg_get_string(txt));
if (!len)