CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-raw.c

diff --git a/print-raw.c b/print-raw.c
index 20dbc23947e61546eb65cad906c3774c867d7034..d0edd2ece948069419a9b556dc7d4cc85c0e5776 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -19,64 +19,25 @@
  * 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.31 2000-09-28 06:43:06 guy Exp $ (LBL)";
-#endif
+/* \summary: Raw IP printer */

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

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

 
 

-struct mbuf;
-struct rtentry;
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-
-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "addrtoname.h"
-#include "interface.h"
-
-#ifndef AF_NS
-#define AF_NS          6               /* XEROX NS protocols */
-#endif
+#include "netdissect.h"

 
 /*
  * The DLT_RAW packet has no header. It contains a raw IP packet.
  */
 
 void
 
 /*
  * 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)
+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: ");
-
-       ipN_print(p, length);
+       ndo->ndo_protocol = "raw";
+       ndo->ndo_ll_hdr_len += 0;
+       if (ndo->ndo_eflag)
+               ND_PRINT("ip: ");

 
 

-       if (xflag)
-               default_print(p, caplen);
-       putchar('\n');
+       ipN_print(ndo, p, h->len);

 }
 }