fix segfault while dumping records

[project/mdnsd.git] / service.c

diff --git a/service.c b/service.c
index 55cd2bb..8704a86 100644 (file)
--- a/service.c
+++ b/service.c
@@ -12,11 +12,8 @@
  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

-#include <netinet/in.h>

 #include <arpa/nameser.h>
 #include <sys/socket.h>
 #include <arpa/nameser.h>
 #include <sys/socket.h>

-#include <netinet/in.h>
-#include <arpa/inet.h>

 
 #include <resolv.h>
 #include <glob.h>
 
 #include <resolv.h>
 #include <glob.h>


@@ -34,6 +31,7 @@
 #include "dns.h"
 #include "service.h"
 #include "util.h"
 #include "dns.h"
 #include "service.h"
 #include "util.h"

+#include "interface.h"

 
 enum {
        SERVICE_PORT,
 
 enum {
        SERVICE_PORT,


@@ -70,84 +68,42 @@ 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;
 }
 
 static void
 
        return buffer;
 }
 
 static void

-service_send_ptr(struct uloop_fd *u, struct service *s)
+service_add_ptr(const char *host)

 {
 {

-       unsigned char buffer[MAX_NAME_LEN];
-       const char *host = service_name(s->service);
-       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
 }
 
 static void

-service_send_ptr_c(struct uloop_fd *u, const char *host)
+service_add_srv(struct service *s)

 {
 {

-       unsigned char buffer[MAX_NAME_LEN];
-       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;
-
-       dns_add_answer(TYPE_PTR, buffer, len);
-}
-
-static void
-service_send_a(struct uloop_fd *u)
-{
-       unsigned char buffer[MAX_NAME_LEN];
-       char *host = service_name("local");
-       int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
-       struct in_addr in;
-
-       if (!inet_aton(iface_ip, &in)) {
-               fprintf(stderr, "%s is not valid\n", iface_ip);
-               return;
-       }
-
-       if (len < 1)
-               return;
-
-       dns_add_answer(TYPE_A, (uint8_t *) &in.s_addr, 4);
-}
-
-static void
-service_send_srv(struct uloop_fd *u, 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;
-
-       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


@@ -166,23 +122,23 @@ service_timeout(struct service *s)
 }
 
 void
 }
 
 void

-service_reply_a(struct uloop_fd *u, int type)
+service_reply_a(struct interface *iface, int type)

 {
        if (type != TYPE_A)
                return;
 
        dns_init_answer();
 {
        if (type != TYPE_A)
                return;
 
        dns_init_answer();

-       service_send_a(u);
-       dns_send_answer(u, service_name("local"));
+       dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4);
+       dns_send_answer(iface, mdns_hostname_local);

 }
 
 void
 }
 
 void

-service_reply(struct uloop_fd *u, const char *match)
+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);
+               const char *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))


@@ -194,26 +150,24 @@ service_reply(struct uloop_fd *u, const char *match)
                        continue;
 
                dns_init_answer();
                        continue;
 
                dns_init_answer();

-               service_send_ptr(u, s);
-               dns_send_answer(u, service);
+               service_add_ptr(service_name(s->service));
+               dns_send_answer(iface, service);

 
                dns_init_answer();
 
                dns_init_answer();

-               service_send_srv(u, s);
+               service_add_srv(s);

                if (s->txt && s->txt_len)
                        dns_add_answer(TYPE_TXT, (uint8_t *) s->txt, s->txt_len);
                if (s->txt && s->txt_len)
                        dns_add_answer(TYPE_TXT, (uint8_t *) s->txt, s->txt_len);

-               dns_send_answer(u, host);
+               dns_send_answer(iface, host);

        }
 
        if (match)
                return;
 
        }
 
        if (match)
                return;
 

-       dns_init_answer();
-       service_send_a(u);
-       dns_send_answer(u, service_name("local"));
+       service_reply_a(iface, TYPE_A);

 }
 
 void
 }
 
 void

-service_announce_services(struct uloop_fd *u, const char *service)
+service_announce_services(struct interface *iface, const char *service)

 {
        struct service *s;
        int tcp = 1;
 {
        struct service *s;
        int tcp = 1;


@@ -230,20 +184,20 @@ service_announce_services(struct uloop_fd *u, const char *service)
                        continue;
                s->t = 0;
                dns_init_answer();
                        continue;
                s->t = 0;
                dns_init_answer();

-               service_send_ptr_c(u, s->service);
+               service_add_ptr(s->service);

                if (tcp)
                if (tcp)

-                       dns_send_answer(u, sdtcp);
+                       dns_send_answer(iface, sdtcp);

                else
                else

-                       dns_send_answer(u, sdudp);
-               service_reply(u, s->service);
+                       dns_send_answer(iface, sdudp);
+               service_reply(iface, s->service);

        }
 }
 
 void
        }
 }
 
 void

-service_announce(struct uloop_fd *u)
+service_announce(struct interface *iface)

 {
 {

-       service_announce_services(u, sdudp);
-       service_announce_services(u, sdtcp);
+       service_announce_services(iface, sdudp);
+       service_announce_services(iface, sdtcp);

 }
 
 static void
 }
 
 static void


@@ -324,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/*");


@@ -336,4 +289,5 @@ void
 service_cleanup(void)
 {
        vlist_flush(&services);
 service_cleanup(void)
 {
        vlist_flush(&services);

+       blob_buf_free(&b);

 }
 }