fix off by one in record find code

[project/mdnsd.git] / service.c

diff --git a/service.c b/service.c
index 5976891..7ae3cde 100644 (file)
--- a/service.c
+++ b/service.c
@@ -57,89 +57,48 @@ static const struct blobmsg_policy service_policy[__SERVICE_MAX] = {
        [SERVICE_TXT] = { .name = "txt", .type = BLOBMSG_TYPE_ARRAY },
 };
 
-static const struct uci_blob_param_list service_attr_list = {
-       .n_params = __SERVICE_MAX,
-       .params = service_policy,
-};
-
 static void
 service_update(struct vlist_tree *tree, struct vlist_node *node_new,
               struct vlist_node *node_old);
 
 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";
 
-char *
+static const char *
 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;
 }
 
 static void
-service_add_ptr(struct service *s)
-{
-       unsigned char buffer[MAX_NAME_LEN];
-       const char *host = service_name(s->service);
-       int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
-
-       if (len < 1)
-               return;
-
-       dns_add_answer(TYPE_PTR, buffer, len);
-}
-
-static void
-service_add_ptr_c(const char *host)
-{
-       unsigned char buffer[MAX_NAME_LEN];
-       int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
-
-       if (len < 1)
-               return;
-
-       dns_add_answer(TYPE_PTR, buffer, len);
-}
-
-static void
-service_send_a(struct interface *iface)
+service_add_ptr(const char *host)
 {
-       unsigned char buffer[MAX_NAME_LEN];
-       char *host = service_name("local");
-       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;
 
-       dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4);
+       dns_add_answer(TYPE_PTR, mdns_buf, len);
 }
 
 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);
-
-       if (len < 1)
-               return;
+       struct dns_srv_data *sd = (struct dns_srv_data *) mdns_buf;
+       int len = sizeof(*sd);
 
-       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);
-       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
@@ -164,8 +123,8 @@ service_reply_a(struct interface *iface, int type)
                return;
 
        dns_init_answer();
-       service_send_a(iface);
-       dns_send_answer(iface, service_name("local"));
+       dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4);
+       dns_send_answer(iface, mdns_hostname_local);
 }
 
 void
@@ -174,7 +133,7 @@ service_reply(struct interface *iface, const char *match)
        struct service *s;
 
        vlist_for_each_element(&services, s, node) {
-               char *host = service_name(s->service);
+               const char *host = service_name(s->service);
                char *service = strstr(host, "._");
 
                if (!s->active || !service || !service_timeout(s))
@@ -186,7 +145,7 @@ service_reply(struct interface *iface, const char *match)
                        continue;
 
                dns_init_answer();
-               service_add_ptr(s);
+               service_add_ptr(service_name(s->service));
                dns_send_answer(iface, service);
 
                dns_init_answer();
@@ -199,9 +158,7 @@ service_reply(struct interface *iface, const char *match)
        if (match)
                return;
 
-       dns_init_answer();
-       service_send_a(iface);
-       dns_send_answer(iface, service_name("local"));
+       service_reply_a(iface, TYPE_A);
 }
 
 void
@@ -222,7 +179,7 @@ service_announce_services(struct interface *iface, const char *service)
                        continue;
                s->t = 0;
                dns_init_answer();
-               service_add_ptr_c(s->service);
+               service_add_ptr(s->service);
                if (tcp)
                        dns_send_answer(iface, sdtcp);
                else
@@ -316,8 +273,7 @@ service_load(char *path)
 void
 service_init(void)
 {
-       if (!hostname)
-               hostname = get_hostname();
+       get_hostname();
 
        vlist_update(&services);
        service_load("/tmp/run/mdnsd/*");