From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 9 Jun 2014 21:14:53 +0000 (+0200)
Subject: service: simplify and remove more code duplication
X-Git-Url: http://git.openwrt.org/?p=project%2Fmdnsd.git;a=commitdiff_plain;h=9061708d9d39f011c5e78f922a5262ad571607cb

service: simplify and remove more code duplication

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/service.c b/service.c
index f60431d..1cf50e3 100644
--- a/service.c
+++ b/service.c
@@ -94,19 +94,6 @@ service_add_ptr(const char *host)
 	dns_add_answer(TYPE_PTR, buffer, len);
 }
 
-static void
-service_send_a(struct interface *iface)
-{
-	unsigned char buffer[MAX_NAME_LEN];
-	char *host = service_name("local");
-	int len = dn_comp(host, buffer, MAX_NAME_LEN, NULL, NULL);
-
-	if (len < 1)
-		return;
-
-	dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4);
-}
-
 static void
 service_add_srv(struct service *s)
 {
@@ -151,7 +138,7 @@ service_reply_a(struct interface *iface, int type)
 		return;
 
 	dns_init_answer();
-	service_send_a(iface);
+	dns_add_answer(TYPE_A, (uint8_t *) &iface->v4_addr.s_addr, 4);
 	dns_send_answer(iface, service_name("local"));
 }
 
@@ -186,9 +173,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