386BSD 0.1 development

[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 1d0903a..741de72 100644 (file)
--- a/usr/src/sbin/routed/trace.h
+++ b/usr/src/sbin/routed/trace.h
@@ -2,14 +2,35 @@
  * Copyright (c) 1983, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * 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 this notice is preserved and that due credit is given
- * to the University of California at 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'' without express or implied warranty.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)trace.h     5.4 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)trace.h     5.8 (Berkeley) 6/1/90

  */
 
 /*
  */
 
 /*


@@ -20,7 +41,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 */


@@ -44,10 +65,10 @@ struct      ifdebug {
  * Packet tracing stuff.
  */
 int    tracepackets;           /* watch packets as they go by */
  * Packet tracing stuff.
  */
 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 */
 int    traceactions;           /* on/off */
 int    tracehistory;           /* on/off */
 FILE   *ftrace;                /* output trace file */

-char   *curtime;               /* current timestamp string */

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


@@ -57,25 +78,19 @@ char        *curtime;               /* current timestamp string */
          if (traceactions) \
                tracenewmetric(ftrace, route, newmetric); \
        }
          if (traceactions) \
                tracenewmetric(ftrace, route, newmetric); \
        }

-#define        TRACE_INPUT(ifp, src, size) { \
+#define        TRACE_INPUT(ifp, src, pack, size) { \

          if (tracehistory) { \
                ifp = if_iflookup(src); \
                if (ifp) \
          if (tracehistory) { \
                ifp = if_iflookup(src); \
                if (ifp) \

-                       trace(&ifp->int_input, src, packet, size, \
+                       trace(&ifp->int_input, src, pack, size, \

                                ntohl(ifp->int_metric)); \
          } \
                                ntohl(ifp->int_metric)); \
          } \

-         if (tracepackets) { \
-               time_t t; \
-               t = time(0); \
-               dumppacket(stdout, "from", src, packet, size, &t); \
-         } \
+         if (tracepackets) \
+               dumppacket(ftrace, "from", src, pack, size, &now); \

        }
 #define        TRACE_OUTPUT(ifp, dst, size) { \
          if (tracehistory && ifp) \
                trace(&ifp->int_output, dst, 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) { \
-               time_t t; \
-               t = time(0); \
-               dumppacket(stdout, "to", dst, packet, size, &t); \
-         } \
+         if (tracepackets) \
+               dumppacket(ftrace, "to", dst, packet, size, &now); \

        }
        }