X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=service.c;h=8704a866d9ec6b2d200e86bb343b207ce2b9f285;hp=cf1d3365b48991c95e8c67c6feadd03e4f6c7dce;hb=28de4beed5a3ffb8ce5ad6a2543e60c5efb46430;hpb=f13f07d145515b80b6f7cc3e1b06dc262ded174d

diff --git a/service.c b/service.c
index cf1d336..8704a86 100644
--- a/service.c
+++ b/service.c
@@ -12,11 +12,8 @@
  */
 
 #include <sys/types.h>
-#include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include <resolv.h>
 #include <glob.h>
@@ -71,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);
-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_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;
 
-	dns_add_answer(TYPE_PTR, buffer, len);
+	dns_add_answer(TYPE_PTR, mdns_buf, len);
 }
 
 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(cur_iface->ip, &in)) {
-		fprintf(stderr, "%s is not valid\n", cur_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);
-	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
@@ -167,23 +122,23 @@ service_timeout(struct service *s)
 }
 
 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();
-	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
-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) {
-		char *host = service_name(s->service);
+		const char *host = service_name(s->service);
 		char *service = strstr(host, "._");
 
 		if (!s->active || !service || !service_timeout(s))
@@ -195,26 +150,24 @@ service_reply(struct uloop_fd *u, const char *match)
 			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();
-		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);
-		dns_send_answer(u, host);
+		dns_send_answer(iface, host);
 	}
 
 	if (match)
 		return;
 
-	dns_init_answer();
-	service_send_a(u);
-	dns_send_answer(u, service_name("local"));
+	service_reply_a(iface, TYPE_A);
 }
 
 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;
@@ -231,20 +184,20 @@ service_announce_services(struct uloop_fd *u, const char *service)
 			continue;
 		s->t = 0;
 		dns_init_answer();
-		service_send_ptr_c(u, s->service);
+		service_add_ptr(s->service);
 		if (tcp)
-			dns_send_answer(u, sdtcp);
+			dns_send_answer(iface, sdtcp);
 		else
-			dns_send_answer(u, sdudp);
-		service_reply(u, s->service);
+			dns_send_answer(iface, sdudp);
+		service_reply(iface, s->service);
 	}
 }
 
 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
@@ -325,8 +278,7 @@ service_load(char *path)
 void
 service_init(void)
 {
-	if (!hostname)
-		hostname = get_hostname();
+	get_hostname();
 
 	vlist_update(&services);
 	service_load("/tmp/run/mdnsd/*");
@@ -337,4 +289,5 @@ void
 service_cleanup(void)
 {
 	vlist_flush(&services);
+	blob_buf_free(&b);
 }