document SIGUSR1 in manual page

[tcpdump] / print-raw.c

diff --git a/print-raw.c b/print-raw.c
index a0452aec853d344f7505716202aa29408f452c5b..d20387c644c9149502615c601b763b42c61b9772 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -19,70 +19,26 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.22 1999-10-07 23:47:12 mcr Exp $ (LBL)";
+#define NETDISSECT_REWORKED
+#ifdef HAVE_CONFIG_H
+#include "config.h"

 #endif
 
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
+#include <tcpdump-stdinc.h>

 
 

-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
-
-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "addrtoname.h"

 #include "interface.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.
  */
 
 /*
  * The DLT_RAW packet has no header. It contains a raw IP packet.
  */
 

-void
-raw_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+u_int
+raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
 {

-       u_int length = h->len;
-       u_int caplen = h->caplen;
-
-       ts_print(&h->ts);
-
-       /*
-        * Some printers want to get back at the link level addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
-        */
-       packetp = p;
-       snapend = p + caplen;
-
-       if (eflag)
-               printf("ip: ");
+       if (ndo->ndo_eflag)
+               ND_PRINT((ndo, "ip: "));

 
 

-       ip_print(p, length);
+       ipN_print(ndo, p, h->len);

 
 

-       if (xflag)
-               default_print(p, caplen);
-       putchar('\n');
+       return (0);

 }
 }