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

[tcpdump] / print-ipfc.c

diff --git a/print-ipfc.c b/print-ipfc.c
index 5df6127c712851e3fa716f2a7db9a180ec1ecb50..9aed44852dadada01925ecd8dbaebbf6b2df319a 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -23,22 +23,20 @@
 
 /* specification: RFC 2625 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
 #include <string.h>
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 
-static const char tstr[] = " [|ipfc]";
 
 struct ipfc_header {
-       nd_byte ipfc_dhost[2+MAC_ADDR_LEN];
-       nd_byte ipfc_shost[2+MAC_ADDR_LEN];
+       nd_byte ipfc_dhost[2+MAC48_LEN];
+       nd_byte ipfc_shost[2+MAC48_LEN];
 };
 
 #define IPFC_HDRLEN 16
@@ -52,8 +50,8 @@ extract_ipfc_addrs(const struct ipfc_header *ipfcp, char *ipfcsrc,
         * We assume that, as per RFC 2625, the lower 48 bits of the
         * source and destination addresses are MAC addresses.
         */
-       memcpy(ipfcdst, (const char *)&ipfcp->ipfc_dhost[2], MAC_ADDR_LEN);
-       memcpy(ipfcsrc, (const char *)&ipfcp->ipfc_shost[2], MAC_ADDR_LEN);
+       memcpy(ipfcdst, (const char *)&ipfcp->ipfc_dhost[2], MAC48_LEN);
+       memcpy(ipfcsrc, (const char *)&ipfcp->ipfc_shost[2], MAC48_LEN);
 }
 
 /*
@@ -66,8 +64,8 @@ ipfc_hdr_print(netdissect_options *ndo,
 {
        const char *srcname, *dstname;
 
-       srcname = etheraddr_string(ndo, ipfcsrc);
-       dstname = etheraddr_string(ndo, ipfcdst);
+       srcname = mac48_string(ndo, ipfcsrc);
+       dstname = mac48_string(ndo, ipfcdst);
 
        /*
         * XXX - should we show the upper 16 bits of the addresses?
@@ -91,26 +89,24 @@ static u_int
 ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        const struct ipfc_header *ipfcp = (const struct ipfc_header *)p;
-       nd_mac_addr srcmac, dstmac;
+       nd_mac48 srcmac, dstmac;
        struct lladdr_info src, dst;
        int llc_hdrlen;
 
        ndo->ndo_protocol = "ipfc";
-       if (caplen < IPFC_HDRLEN)
-               goto trunc;
+       ND_TCHECK_LEN(p, IPFC_HDRLEN);
        /*
         * Get the network addresses into a canonical form
         */
-       ND_TCHECK_SIZE(ipfcp);
        extract_ipfc_addrs(ipfcp, (char *)srcmac, (char *)dstmac);
 
        if (ndo->ndo_eflag)
                ipfc_hdr_print(ndo, ipfcp, length, srcmac, dstmac);
 
        src.addr = srcmac;
-       src.addr_string = etheraddr_string;
+       src.addr_string = mac48_string;
        dst.addr = dstmac;
-       dst.addr_string = etheraddr_string;
+       dst.addr_string = mac48_string;
 
        /* Skip over Network_Header */
        length -= IPFC_HDRLEN;
@@ -129,9 +125,6 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
                llc_hdrlen = -llc_hdrlen;
        }
        return (IPFC_HDRLEN + llc_hdrlen);
-trunc:
-       ND_PRINT("%s", tstr);
-       return caplen;
 }
 
 /*
@@ -140,9 +133,9 @@ trunc:
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 ipfc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
-       ndo->ndo_protocol = "ipfc_if";
-       return (ipfc_print(ndo, p, h->len, h->caplen));
+       ndo->ndo_protocol = "ipfc";
+       ndo->ndo_ll_hdr_len += ipfc_print(ndo, p, h->len, h->caplen);
 }