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

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index cb9d972f43b6f83a80db3e75f05e7b831db1b0d0..c9a5e80c644a6bee0fe9275e1a05ef2fa17ebbe3 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -18,21 +18,15 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.5 2006-02-11 22:12:06 hannes Exp $ (LBL)";
-#endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: Apple IP-over-IEEE 1394 printer */
 
-#include <tcpdump-stdinc.h>
+#include <config.h>
 
-#include <stdio.h>
-#include <pcap.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
@@ -40,42 +34,43 @@ static const char rcsid[] _U_ =
 /*
  * Structure of a header for Apple's IP-over-IEEE 1384 BPF header.
  */
-#define FIREWIRE_EUI64_LEN     8
 struct firewire_header {
-       u_char  firewire_dhost[FIREWIRE_EUI64_LEN];
-       u_char  firewire_shost[FIREWIRE_EUI64_LEN];
-       u_short firewire_type;
+       nd_eui64    firewire_dhost;
+       nd_eui64    firewire_shost;
+       nd_uint16_t firewire_type;
 };
 
 /*
  * Length of that header; note that some compilers may pad
  * "struct firewire_header" to a multiple of 4 bytes, for example, so
  * "sizeof (struct firewire_header)" may not give the right answer.
+ * (That could be true even though we're using nd_ types, none of
+ * which should require anything more than byte alignment.)
  */
 #define FIREWIRE_HDRLEN                18
 
-static inline void
-ap1394_hdr_print(register const u_char *bp, u_int length)
+static void
+ap1394_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
-       register const struct firewire_header *fp;
-       u_int16_t firewire_type;
+       const struct firewire_header *fp;
+       uint16_t firewire_type;
 
        fp = (const struct firewire_header *)bp;
 
-       (void)printf("%s > %s",
-                    linkaddr_string(fp->firewire_dhost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN),
-                    linkaddr_string(fp->firewire_shost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN));
+       ND_PRINT("%s > %s",
+                    eui64_string(ndo, fp->firewire_shost),
+                    eui64_string(ndo, fp->firewire_dhost));
 
-       firewire_type = EXTRACT_16BITS(&fp->firewire_type);
-       if (!qflag) {
-               (void)printf(", ethertype %s (0x%04x)",
+       firewire_type = GET_BE_U_2(fp->firewire_type);
+       if (!ndo->ndo_qflag) {
+               ND_PRINT(", ethertype %s (0x%04x)",
                               tok2str(ethertype_values,"Unknown", firewire_type),
                                firewire_type);
         } else {
-                (void)printf(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type));
+                ND_PRINT(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type));
         }
 
-       (void)printf(", length %u: ", length);
+       ND_PRINT(", length %u: ", length);
 }
 
 /*
@@ -84,36 +79,38 @@ ap1394_hdr_print(register const u_char *bp, u_int length)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
-ap1394_if_print(const struct pcap_pkthdr *h, const u_char *p)
+void
+ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int length = h->len;
        u_int caplen = h->caplen;
-       struct firewire_header *fp;
+       const struct firewire_header *fp;
        u_short ether_type;
+       struct lladdr_info src, dst;
 
-       if (caplen < FIREWIRE_HDRLEN) {
-               printf("[|ap1394]");
-               return FIREWIRE_HDRLEN;
-       }
+       ndo->ndo_protocol = "ap1394";
+       ND_TCHECK_LEN(p, FIREWIRE_HDRLEN);
+       ndo->ndo_ll_hdr_len += FIREWIRE_HDRLEN;
 
-       if (eflag)
-               ap1394_hdr_print(p, length);
+       if (ndo->ndo_eflag)
+               ap1394_hdr_print(ndo, p, length);
 
        length -= FIREWIRE_HDRLEN;
        caplen -= FIREWIRE_HDRLEN;
-       fp = (struct firewire_header *)p;
+       fp = (const struct firewire_header *)p;
        p += FIREWIRE_HDRLEN;
 
-       ether_type = EXTRACT_16BITS(&fp->firewire_type);
-       if (ethertype_print(ether_type, p, length, caplen) == 0) {
+       ether_type = GET_BE_U_2(fp->firewire_type);
+       src.addr = fp->firewire_shost;
+       src.addr_string = eui64_string;
+       dst.addr = fp->firewire_dhost;
+       dst.addr_string = eui64_string;
+       if (ethertype_print(ndo, ether_type, p, length, caplen, &src, &dst) == 0) {
                /* ether_type not known, print raw packet */
-               if (!eflag)
-                       ap1394_hdr_print((u_char *)fp, length + FIREWIRE_HDRLEN);
-
-               if (!suppress_default_print)
-                       default_print(p, caplen);
-       } 
+               if (!ndo->ndo_eflag)
+                       ap1394_hdr_print(ndo, (const u_char *)fp, length + FIREWIRE_HDRLEN);
 
-       return FIREWIRE_HDRLEN;
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);
+       }
 }