Hoist a bunch of stuff that should be done by all if_print routines into

[tcpdump] / print-raw.c

diff --git a/print-raw.c b/print-raw.c
index 88a276f63379610faea7880c32a32ee71faa54ce..08cee76ca8e53a56996259998aa829c2e45ca537 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.38 2002-12-18 08:53:23 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.39 2002-12-19 09:39:15 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -41,31 +41,13 @@ static const char rcsid[] =
  * The DLT_RAW packet has no header. It contains a raw IP packet.
  */
 
-void
-raw_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
+u_int
+raw_if_print(const struct pcap_pkthdr *h, const u_char *p)
 {
-       u_int length = h->len;
-       u_int caplen = h->caplen;
-
-       ++infodelay;
-       ts_print(&h->ts);
-
-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
-
        if (eflag)
                printf("ip: ");
 
-       ipN_print(p, length);
+       ipN_print(p, h->len);
 
-       if (xflag)
-               default_print(p, caplen);
-       putchar('\n');
-       --infodelay;
-       if (infoprint)
-               info(0);
+       return (0);
 }