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

[tcpdump] / print-lane.c

diff --git a/print-lane.c b/print-lane.c
index 09f92c0616cf5190c794471897191d06413bf9ea..3836b066991e6331903c3497198395f23e09bef4 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -22,19 +22,18 @@
 
 /* \summary: ATM LANE printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
 struct lecdatahdr_8023 {
   nd_uint16_t le_header;
-  nd_mac_addr h_dest;
-  nd_mac_addr h_source;
+  nd_mac48 h_dest;
+  nd_mac48 h_source;
   nd_uint16_t h_type;
 };
 
@@ -72,11 +71,6 @@ lane_hdr_print(netdissect_options *ndo, const u_char *bp)
 }
 
 /*
- * This is the top level routine of the printer.  'p' points
- * to the LANE header of the packet, 'h->ts' is the timestamp,
- * 'h->len' is the length of the packet off the wire, and 'h->caplen'
- * is the number of bytes actually captured.
- *
  * This assumes 802.3, not 802.5, LAN emulation.
  */
 void
@@ -85,10 +79,6 @@ lane_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
        const struct lane_controlhdr *lec;
 
        ndo->ndo_protocol = "lane";
-       if (caplen < sizeof(struct lane_controlhdr)) {
-               nd_print_trunc(ndo);
-               return;
-       }
 
        lec = (const struct lane_controlhdr *)p;
        if (GET_BE_U_2(lec->lec_header) == 0xff00) {
@@ -96,15 +86,16 @@ lane_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
                 * LE Control.
                 */
                ND_PRINT("lec: proto %x vers %x %s",
-                   GET_U_1(lec->lec_proto),
-                   GET_U_1(lec->lec_vers),
-                   tok2str(lecop2str, "opcode-#%u", GET_BE_U_2(lec->lec_opcode)));
+                        GET_U_1(lec->lec_proto),
+                        GET_U_1(lec->lec_vers),
+                        tok2str(lecop2str, "opcode-#%u", GET_BE_U_2(lec->lec_opcode)));
                return;
        }
 
        /*
         * Go past the LE header.
         */
+       ND_TCHECK_2(p); /* Needed */
        length -= 2;
        caplen -= 2;
        p += 2;
@@ -113,5 +104,5 @@ lane_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
         * Now print the encapsulated frame, under the assumption
         * that it's an Ethernet frame.
         */
-       ether_print(ndo, p, length, caplen, lane_hdr_print, p - 2, FALSE);
+       ether_print(ndo, p, length, caplen, lane_hdr_print, p - 2);
 }