From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Fri, 28 Oct 2005 15:50:53 +0000 (+0000)
Subject: arg i thought i aborted previous commit
X-Git-Tag: release-1.1.0~643
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=024ac213da31bff9dbe3110f57a0f8e2ca617db9;p=thirdparty%2Fldns.git

arg i thought i aborted previous commit
---

diff --git a/ldns/packet.h b/ldns/packet.h
index 7556c42e..bde10ddc 100644
--- a/ldns/packet.h
+++ b/ldns/packet.h
@@ -203,7 +203,7 @@ void ldns_pkt_set_answerfrom(ldns_pkt *p, ldns_rdf *r);
 void ldns_pkt_set_querytime(ldns_pkt *p, uint32_t t);
 void ldns_pkt_set_size(ldns_pkt *p, size_t s);
 void ldns_pkt_set_when(ldns_pkt *p, char *w);
-void ldns_pkt_set_timestamp(ldns_pkt *p, uint32_t sec, uint32_t usec);
+void ldns_pkt_set_timestamp(ldns_pkt *p, struct timeval);
 void ldns_pkt_set_section_count(ldns_pkt *p, ldns_pkt_section s, uint16_t x);
 void ldns_pkt_set_tsig(ldns_pkt *p, ldns_rr *t);
 
diff --git a/net.c b/net.c
index 28fc18b1..b6258d4e 100644
--- a/net.c
+++ b/net.c
@@ -141,7 +141,7 @@ ldns_send(ldns_pkt **result, ldns_resolver *r, ldns_pkt *query_pkt)
 				((tv_e.tv_sec - tv_s.tv_sec) * 1000) +
 				(tv_e.tv_usec - tv_s.tv_usec) / 1000);
 			ldns_pkt_set_answerfrom(reply, ns_rand_array[i]);
-			ldns_pkt_set_timestamp(reply, tv_s.tv_sec, tv_s.tv_usec);
+			ldns_pkt_set_timestamp(reply, tv_s);
 /*			ldns_pkt_set_when(reply, ctime((time_t*)&tv_s.tv_sec));*/
 			ldns_pkt_set_size(reply, reply_size);
 			break;
diff --git a/packet.c b/packet.c
index 997994ef..88370120 100644
--- a/packet.c
+++ b/packet.c
@@ -683,10 +683,10 @@ ldns_pkt_set_when(ldns_pkt *packet, char *when)
 }
 
 void
-ldns_pkt_set_timestamp(ldns_pkt *packet, uint32_t sec, uint32_t usec)
+ldns_pkt_set_timestamp(ldns_pkt *packet, struct timeval timeval)
 {
-	packet->timestamp.tv_sec = sec;
-	packet->timestamp.tv_usec = usec;
+	packet->timestamp.tv_sec = timeval.tv_sec;
+	packet->timestamp.tv_usec = timeval.tv_usec;
 }
 
 void