From: Ted Lemon <source@isc.org>
Date: Thu, 22 Feb 2001 07:28:25 +0000 (+0000)
Subject: Always use trace_mr_*() functions.
X-Git-Tag: V3-BETA-2-PATCH-18~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3fb86fbe018b9a908ad9580d1560a33dc201071;p=thirdparty%2Fdhcp.git

Always use trace_mr_*() functions.
---

diff --git a/minires/ns_verify.c b/minires/ns_verify.c
index afa1c5a60..ce11e8736 100644
--- a/minires/ns_verify.c
+++ b/minires/ns_verify.c
@@ -16,13 +16,10 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_verify.c,v 1.4 2001/02/15 14:10:59 mellon Exp $";
+static const char rcsid[] = "$Id: ns_verify.c,v 1.5 2001/02/22 07:28:22 mellon Exp $";
 #endif
 
-#if defined (TRACING)
 #define time(x)		trace_mr_time (x)
-time_t trace_mr_time (time_t *);
-#endif
 
 /* Import. */
 
@@ -45,6 +42,8 @@ time_t trace_mr_time (time_t *);
 #include "arpa/nameser.h"
 #include <isc/dst.h>
 
+time_t trace_mr_time (time_t *);
+
 /* Private. */
 
 #define BOUNDS_CHECK(ptr, count) \
diff --git a/minires/res_init.c b/minires/res_init.c
index c77796067..512cdfeda 100644
--- a/minires/res_init.c
+++ b/minires/res_init.c
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$Id: res_init.c,v 1.3 2000/02/02 19:59:16 mellon Exp $";
+static const char rcsid[] = "$Id: res_init.c,v 1.4 2001/02/22 07:28:23 mellon Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -134,6 +134,10 @@ static u_int32_t net_mask (struct in_addr);
  */
 extern int __res_vinit(res_state, int);
 
+#if defined (TRACING)
+u_int trace_mr_res_randomid(u_int);
+#endif
+
 int
 res_ninit(res_state statp) {
 
@@ -163,6 +167,9 @@ __res_vinit(res_state statp, int preinit) {
 		statp->retry = RES_DFLRETRY;
 		statp->options = RES_DEFAULT;
 		statp->id = res_randomid();
+#if defined (TRACING)
+		statp->id = trace_mr_res_randomid (statp -> id);
+#endif
 	}
 
 #ifdef USELOOPBACK
diff --git a/minires/res_send.c b/minires/res_send.c
index 24011b678..79946a4fa 100644
--- a/minires/res_send.c
+++ b/minires/res_send.c
@@ -70,11 +70,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.6 2001/02/15 14:11:11 mellon Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.7 2001/02/22 07:28:25 mellon Exp $";
 #endif /* LIBC_SCCS and not lint */
 
-/* If we're tracing, rename the I/O functions. */
-#if defined (TRACING)
+/* Rename the I/O functions in case we're tracing. */
 #define send		trace_mr_send
 #define recvfrom	trace_mr_recvfrom
 #define	read		trace_mr_read
@@ -82,7 +81,8 @@ static const char rcsid[] = "$Id: res_send.c,v 1.6 2001/02/15 14:11:11 mellon Ex
 #define socket		trace_mr_socket
 #define bind		trace_mr_bind
 #define close		trace_mr_close
-#endif
+#define select		trace_mr_select
+#define time		trace_mr_time
 
 /*
  * Send query to name server and wait for reply.