From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Mon, 27 Jun 2005 08:56:36 +0000 (+0000)
Subject: prefixes
X-Git-Tag: release-0.70~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3c8c2945190bc666ca3aff235764f16dcf8d9d5;p=thirdparty%2Fldns.git

prefixes
---

diff --git a/dnssec.c b/dnssec.c
index 31da7cf9..3f124e0d 100644
--- a/dnssec.c
+++ b/dnssec.c
@@ -625,7 +625,7 @@ ldns_tsig_prepare_pkt_wire(uint8_t *wire, size_t wire_len, size_t *result_len)
 	wire2 = LDNS_XMALLOC(uint8_t, *result_len);
 	memcpy(wire2, wire, *result_len);
 	
-	write_uint16(wire2 + LDNS_ARCOUNT_OFF, ar_count);
+	ldns_write_uint16(wire2 + LDNS_ARCOUNT_OFF, ar_count);
 	
 	return wire2;
 }
@@ -712,7 +712,7 @@ ldns_create_tsig_mac(
 	if (digester) {
 		(void) HMAC(digester, key_bytes, key_size, (void *)wireformat, wiresize, mac_bytes + 2, &md_len);
 	
-		write_uint16(mac_bytes, md_len);
+		ldns_write_uint16(mac_bytes, md_len);
 		result = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_INT16_DATA, md_len + 2, mac_bytes);
 	} else {
 		/*dprintf("No digest found for %s\n", algorithm_name);*/
@@ -843,7 +843,7 @@ ldns_pkt_tsig_sign(ldns_pkt *pkt, const char *key_name, const char *key_data, ui
 	/* bleh :p */
 	if (gettimeofday(&tv_time_signed, NULL) == 0) {
 		time_signed = LDNS_XMALLOC(uint8_t, 6);
-		write_uint64_as_uint48(time_signed, tv_time_signed.tv_sec);
+		ldns_write_uint64_as_uint48(time_signed, tv_time_signed.tv_sec);
 	} else {
 		status = LDNS_STATUS_INTERNAL_ERR;
 		goto clean;
diff --git a/host2wire.c b/host2wire.c
index 8dc5116d..31f09cae 100644
--- a/host2wire.c
+++ b/host2wire.c
@@ -243,8 +243,8 @@ ldns_pkt2buffer_wire(ldns_buffer *buffer, const ldns_pkt *packet)
 		ldns_rr_set_class(edns_rr, ldns_pkt_edns_udp_size(packet));
 		edata[0] = ldns_pkt_edns_extended_rcode(packet);
 		edata[1] = ldns_pkt_edns_version(packet);
-		write_uint16(&edata[2], ldns_pkt_edns_z(packet));
-		ldns_rr_set_ttl(edns_rr, read_uint32(edata));
+		ldns_write_uint16(&edata[2], ldns_pkt_edns_z(packet));
+		ldns_rr_set_ttl(edns_rr, ldns_read_uint32(edata));
 		(void)ldns_rr2buffer_wire(buffer, edns_rr, LDNS_SECTION_ADDITIONAL);
 		ldns_rr_free(edns_rr);
 	}
diff --git a/ldns/wire2host.h b/ldns/wire2host.h
index 580952bf..64ecdc71 100644
--- a/ldns/wire2host.h
+++ b/ldns/wire2host.h
@@ -84,26 +84,26 @@
 #define	LDNS_RA_CLR(wirebuf)	(*(wirebuf+3) &= ~LDNS_RA_MASK)
 
 /* Query ID */
-#define	LDNS_ID_WIRE(wirebuf)			(read_uint16(wirebuf))
+#define	LDNS_ID_WIRE(wirebuf)			(ldns_read_uint16(wirebuf))
 
 /* Counter of the question section */
 #define LDNS_QDCOUNT_OFF		4
 /*
 #define	QDCOUNT(wirebuf)		(ntohs(*(uint16_t *)(wirebuf+QDCOUNT_OFF)))
 */
-#define	LDNS_QDCOUNT(wirebuf)		(read_uint16(wirebuf+LDNS_QDCOUNT_OFF))
+#define	LDNS_QDCOUNT(wirebuf)		(ldns_read_uint16(wirebuf+LDNS_QDCOUNT_OFF))
 
 /* Counter of the answer section */
 #define LDNS_ANCOUNT_OFF		6
-#define	LDNS_ANCOUNT(wirebuf)		(read_uint16(wirebuf+LDNS_ANCOUNT_OFF))
+#define	LDNS_ANCOUNT(wirebuf)		(ldns_read_uint16(wirebuf+LDNS_ANCOUNT_OFF))
 
 /* Counter of the authority section */
 #define LDNS_NSCOUNT_OFF		8
-#define	LDNS_NSCOUNT(wirebuf)		(read_uint16(wirebuf+LDNS_NSCOUNT_OFF))
+#define	LDNS_NSCOUNT(wirebuf)		(ldns_read_uint16(wirebuf+LDNS_NSCOUNT_OFF))
 
 /* Counter of the additional section */
 #define LDNS_ARCOUNT_OFF		10
-#define	LDNS_ARCOUNT(wirebuf)		(read_uint16(wirebuf+LDNS_ARCOUNT_OFF))
+#define	LDNS_ARCOUNT(wirebuf)		(ldns_read_uint16(wirebuf+LDNS_ARCOUNT_OFF))
 
 /**
  * converts the data on the uint8_t bytearray (in wire format) to a DNS packet.