more consistent use of the length: output;

[tcpdump] / print-raw.c

diff --git a/print-raw.c b/print-raw.c
index 19b04547b718848d9b89b7d4a763168248f31908..b4a2139dd39e8d32c98c770f6e44c589c79b78e3 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -21,27 +21,14 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.29 2000-09-23 08:26:37 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.36 2002-08-01 08:53:25 risso Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-struct mbuf;
-struct rtentry;
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
+#include <tcpdump-stdinc.h>
 
 #include <pcap.h>
 #include <stdio.h>
@@ -50,10 +37,6 @@ struct rtentry;
 #include "addrtoname.h"
 #include "interface.h"
 
-#ifndef AF_NS
-#define AF_NS          6               /* XEROX NS protocols */
-#endif
-
 /*
  * The DLT_RAW packet has no header. It contains a raw IP packet.
  */
@@ -64,6 +47,7 @@ raw_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        u_int length = h->len;
        u_int caplen = h->caplen;
 
+       ++infodelay;
        ts_print(&h->ts);
 
        /*
@@ -82,4 +66,7 @@ raw_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        if (xflag)
                default_print(p, caplen);
        putchar('\n');
+       --infodelay;
+       if (infoprint)
+               info(0);
 }