projects
/
project
/
mdnsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up hostname handling, make service_name() static
[project/mdnsd.git]
/
service.c
diff --git
a/service.c
b/service.c
index
1cf50e3
..
8704a86
100644
(file)
--- a/
service.c
+++ b/
service.c
@@
-68,16
+68,15
@@
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 *hostname = NULL;
static char *sdudp = "_services._dns-sd._udp.local";
static char *sdtcp = "_services._dns-sd._tcp.local";
static char *sdudp = "_services._dns-sd._udp.local";
static char *sdtcp = "_services._dns-sd._tcp.local";
-char *
+
static const
char *
service_name(const char *domain)
{
static char buffer[256];
service_name(const char *domain)
{
static char buffer[256];
- snprintf(buffer, sizeof(buffer), "%s.%s", hostname, domain);
+ snprintf(buffer, sizeof(buffer), "%s.%s",
mdns_
hostname, domain);
return buffer;
}
return buffer;
}
@@
-85,35
+84,26
@@
service_name(const char *domain)
static void
service_add_ptr(const char *host)
{
static void
service_add_ptr(const char *host)
{
- unsigned char buffer[MAX_NAME_LEN];
- int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
+ int len = dn_comp(host, mdns_buf, sizeof(mdns_buf), NULL, NULL);
if (len < 1)
return;
if (len < 1)
return;
- dns_add_answer(TYPE_PTR,
buffer
, len);
+ dns_add_answer(TYPE_PTR,
mdns_buf
, len);
}
static void
service_add_srv(struct service *s)
{
}
static void
service_add_srv(struct service *s)
{
- unsigned char buffer[MAX_NAME_LEN];
- struct dns_srv_data *sd;
- char *host = service_name("local");
- int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
+ struct dns_srv_data *sd = (struct dns_srv_data *) mdns_buf;
+ int len = sizeof(*sd);
- if (len < 1)
- return;
-
- sd = calloc(1, len + sizeof(struct dns_srv_data));
- if (!sd)
+ len += dn_comp(mdns_hostname_local, mdns_buf + len, sizeof(mdns_buf) - len, NULL, NULL);
+ if (len <= sizeof(*sd))
return;
sd->port = cpu_to_be16(s->port);
return;
sd->port = cpu_to_be16(s->port);
- memcpy(&sd[1], buffer, len);
- host = service_name(s->service);
- dns_add_answer(TYPE_SRV, (uint8_t *) sd, len + sizeof(struct dns_srv_data));
- free(sd);
+ dns_add_answer(TYPE_SRV, mdns_buf, len);
}
#define TOUT_LOOKUP 60
}
#define TOUT_LOOKUP 60
@@
-139,7
+129,7
@@
service_reply_a(struct interface *iface, int type)
dns_init_answer();
dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4);
dns_init_answer();
dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4);
- dns_send_answer(iface,
service_name("local")
);
+ dns_send_answer(iface,
mdns_hostname_local
);
}
void
}
void
@@
-148,7
+138,7
@@
service_reply(struct interface *iface, const char *match)
struct service *s;
vlist_for_each_element(&services, s, node) {
struct service *s;
vlist_for_each_element(&services, s, node) {
- char *host = service_name(s->service);
+ c
onst c
har *host = service_name(s->service);
char *service = strstr(host, "._");
if (!s->active || !service || !service_timeout(s))
char *service = strstr(host, "._");
if (!s->active || !service || !service_timeout(s))
@@
-288,8
+278,7
@@
service_load(char *path)
void
service_init(void)
{
void
service_init(void)
{
- if (!hostname)
- hostname = get_hostname();
+ get_hostname();
vlist_update(&services);
service_load("/tmp/run/mdnsd/*");
vlist_update(&services);
service_load("/tmp/run/mdnsd/*");