From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Mon, 21 Feb 2005 13:42:04 +0000 (+0000)
Subject: answerfrom back to rdf - IT WORKS
X-Git-Tag: release-0.50~392
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=849089bbff51038770545f3d6d8e4369ed27d196;p=thirdparty%2Fldns.git

answerfrom back to rdf - IT WORKS
---

diff --git a/host2str.c b/host2str.c
index 2a09cd38..4c17f3f0 100644
--- a/host2str.c
+++ b/host2str.c
@@ -935,7 +935,7 @@ ldns_pkt2buffer_str(ldns_buffer *output, ldns_pkt *pkt)
 		/* add some futher fields */
 		ldns_buffer_printf(output, ";; Query time: %d msec\n", ldns_pkt_querytime(pkt));
 		if (ldns_pkt_answerfrom(pkt)) {
-			ldns_buffer_printf(output, ";; SERVER: %s\n", ldns_pkt_answerfrom(pkt));
+			ldns_buffer_printf(output, ";; SERVER: %s\n", ldns_rdf2str(ldns_pkt_answerfrom(pkt)));
 		}
 		if (ldns_pkt_when(pkt)) {
 			/* \n included in when buffer, see ctime(3) */
diff --git a/ldns/packet.h b/ldns/packet.h
index f991684e..9c007d9a 100644
--- a/ldns/packet.h
+++ b/ldns/packet.h
@@ -67,7 +67,7 @@ struct ldns_struct_pkt
 	/* extra items needed in a packet */
 	/** \brief the size in bytes of the pkt */
 	uint16_t _answersize;
-	char *_answerfrom;
+	ldns_rdf *_answerfrom;
 	char *_when;
 	/** \brief query duration */
 	uint32_t _querytime;
@@ -125,7 +125,7 @@ uint16_t ldns_pkt_qdcount(ldns_pkt *);
 uint16_t ldns_pkt_ancount(ldns_pkt *);
 uint16_t ldns_pkt_nscount(ldns_pkt *);
 uint16_t ldns_pkt_arcount(ldns_pkt *);
-char *ldns_pkt_answerfrom(ldns_pkt *packet);
+ldns_rdf *ldns_pkt_answerfrom(ldns_pkt *packet);
 char *ldns_pkt_when(ldns_pkt *packet);
 uint32_t ldns_pkt_querytime(ldns_pkt *);
 size_t ldns_pkt_size(ldns_pkt *);
@@ -149,7 +149,7 @@ void ldns_pkt_set_qdcount(ldns_pkt *, uint16_t);
 void ldns_pkt_set_ancount(ldns_pkt *, uint16_t);
 void ldns_pkt_set_nscount(ldns_pkt *, uint16_t);
 void ldns_pkt_set_arcount(ldns_pkt *, uint16_t);
-void ldns_pkt_set_answerfrom(ldns_pkt *, char *);
+void ldns_pkt_set_answerfrom(ldns_pkt *, ldns_rdf *);
 void ldns_pkt_set_querytime(ldns_pkt *, uint32_t);
 void ldns_pkt_set_size(ldns_pkt *, size_t);
 void ldns_pkt_set_when(ldns_pkt *, char *);
diff --git a/net.c b/net.c
index c05667c0..cb87db9b 100644
--- a/net.c
+++ b/net.c
@@ -109,7 +109,7 @@ ldns_send(ldns_resolver *r, ldns_pkt *query_pkt)
 			ldns_pkt_set_querytime(reply,
 				((tv_e.tv_sec - tv_s.tv_sec) * 1000) +
 				(tv_e.tv_usec - tv_s.tv_usec) / 1000);
-			ldns_pkt_set_answerfrom(reply, ldns_rdf2str(ns_array[i]));
+			ldns_pkt_set_answerfrom(reply, ns_array[i]);
 			ldns_pkt_set_when(reply,  ctime((time_t*)&tv_s.tv_sec));
 			break;
 		}
diff --git a/packet.c b/packet.c
index 58395727..0acd3a68 100644
--- a/packet.c
+++ b/packet.c
@@ -144,7 +144,7 @@ ldns_pkt_querytime(ldns_pkt *packet)
 	return packet->_querytime;
 }
 
-char *
+ldns_rdf *
 ldns_pkt_answerfrom(ldns_pkt *packet)
 {
 	return packet->_answerfrom;
@@ -280,7 +280,7 @@ ldns_pkt_set_querytime(ldns_pkt *packet, uint32_t time)
 }
 
 void
-ldns_pkt_set_answerfrom(ldns_pkt *packet, char *answerfrom)
+ldns_pkt_set_answerfrom(ldns_pkt *packet, ldns_rdf *answerfrom)
 {
 	/* TODO if exists free? */
 	packet->_answerfrom = answerfrom;