don't use same buffer for input and output, as that leads to race

[unix-history] / usr / src / sbin / routed / trace.h

diff --git a/usr/src/sbin/routed/trace.h b/usr/src/sbin/routed/trace.h
index 15880ba..1582c08 100644 (file)
--- a/usr/src/sbin/routed/trace.h
+++ b/usr/src/sbin/routed/trace.h
@@ -1,4 +1,21 @@
-/*     trace.h 4.1     83/01/11        */
+/*
+ * Copyright (c) 1983, 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)trace.h     5.7 (Berkeley) %G%
+ */

 
 /*
  * Routing table management daemon.
 
 /*
  * Routing table management daemon.


@@ -8,7 +25,7 @@
  * Trace record format.
  */
 struct iftrace {
  * Trace record format.
  */
 struct iftrace {

-       time_t  ift_stamp;              /* time stamp */
+       struct  timeval ift_stamp;      /* time stamp */

        struct  sockaddr ift_who;       /* from/to */
        char    *ift_packet;            /* pointer to packet */
        short   ift_size;               /* size of packet */
        struct  sockaddr ift_who;       /* from/to */
        char    *ift_packet;            /* pointer to packet */
        short   ift_size;               /* size of packet */


@@ -24,27 +41,40 @@ struct      iftrace {
 struct ifdebug {
        struct  iftrace *ifd_records;   /* array of trace records */
        struct  iftrace *ifd_front;     /* next empty trace record */
 struct ifdebug {
        struct  iftrace *ifd_records;   /* array of trace records */
        struct  iftrace *ifd_front;     /* next empty trace record */

+       int     ifd_count;              /* number of unprinted records */

        struct  interface *ifd_if;      /* for locating stuff */
 };
 
 /*
  * Packet tracing stuff.
  */
        struct  interface *ifd_if;      /* for locating stuff */
 };
 
 /*
  * Packet tracing stuff.
  */

-int    tracing;                /* on/off */
+int    tracepackets;           /* watch packets as they go by */
+int    tracecontents;          /* watch packet contents as they go by */
+int    traceactions;           /* on/off */
+int    tracehistory;           /* on/off */

 FILE   *ftrace;                /* output trace file */
 FILE   *ftrace;                /* output trace file */

+

 #define        TRACE_ACTION(action, route) { \
 #define        TRACE_ACTION(action, route) { \

-         if (tracing) \
-               traceaction(ftrace, "action", route); \
+         if (traceactions) \
+               traceaction(ftrace, action, route); \
+       }
+#define        TRACE_NEWMETRIC(route, newmetric) { \
+         if (traceactions) \
+               tracenewmetric(ftrace, route, newmetric); \

        }
        }

-#define        TRACE_INPUT(ifp, from, size) { \
-         if (tracing) { \
-               ifp = if_iflookup(from); \
+#define        TRACE_INPUT(ifp, src, pack, size) { \
+         if (tracehistory) { \
+               ifp = if_iflookup(src); \

                if (ifp) \
                if (ifp) \

-                       trace(&ifp->int_input, from, packet, size, \
-                               ifp->int_metric); \
+                       trace(&ifp->int_input, src, pack, size, \
+                               ntohl(ifp->int_metric)); \

          } \
          } \

+         if (tracepackets) \
+               dumppacket(ftrace, "from", src, pack, size, &now); \

        }
        }

-#define        TRACE_OUTPUT(ifp, to, size) { \
-         if (tracing) \
-               trace(&ifp->int_output, to, packet, size, ifp->int_metric); \
+#define        TRACE_OUTPUT(ifp, dst, size) { \
+         if (tracehistory && ifp) \
+               trace(&ifp->int_output, dst, packet, size, ifp->int_metric); \
+         if (tracepackets) \
+               dumppacket(ftrace, "to", dst, packet, size, &now); \

        }
        }