arg i thought i aborted previous commit

diff --git a/ldns/packet.h b/ldns/packet.h
index 7556c42e944dce455bd7d4b607ae75f00f5abc2d..bde10ddc827cfd6596cc246aca341b03bb89f6c1 100644 (file)
--- 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 28fc18b1837672058d9730200f1ccca1e6149655..b6258d4ef190531d6a6cebc86e859629077fd087 100644 (file)
--- 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 997994eff874bb68c42f6b17c7b4a5f0a54b7449..88370120ca00cbada6d352cbf7bec552b66f7f9f 100644 (file)
--- 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