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 e020c3bfbce32d99facde5d9c3fd4701c3ad0379..3836b066991e6331903c3497198395f23e09bef4 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -20,30 +20,29 @@
  *
  */
 
  *
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.14 2002-07-11 09:17:24 guy Exp $ (LBL)";
-#endif
+/* \summary: ATM LANE printer */

 
 

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

 
 

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

 
 

+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"

 
 

-#include <netinet/in.h>
-
-#include <stdio.h>
-#include <pcap.h>
+struct lecdatahdr_8023 {
+  nd_uint16_t le_header;
+  nd_mac48 h_dest;
+  nd_mac48 h_source;
+  nd_uint16_t h_type;
+};

 
 

-#include "interface.h"
-#include "addrtoname.h"
-#include "ether.h"
-#include "lane.h"
+struct lane_controlhdr {
+  nd_uint16_t lec_header;
+  nd_uint8_t  lec_proto;
+  nd_uint8_t  lec_vers;
+  nd_uint16_t lec_opcode;
+};

 
 static const struct tok lecop2str[] = {
        { 0x0001,       "configure request" },
 
 static const struct tok lecop2str[] = {
        { 0x0001,       "configure request" },


@@ -65,125 +64,45 @@ static const struct tok lecop2str[] = {
        { 0,            NULL }
 };
 
        { 0,            NULL }
 };
 

-static inline void
-lane_hdr_print(register const u_char *bp, int length)
+static void
+lane_hdr_print(netdissect_options *ndo, const u_char *bp)

 {
 {

-       register const struct lecdatahdr_8023 *ep;
-
-       ep = (const struct lecdatahdr_8023 *)bp;
-       if (qflag)
-               (void)printf("lecid:%x %s %s %d: ",
-                            ntohs(ep->le_header),
-                            etheraddr_string(ep->h_source),
-                            etheraddr_string(ep->h_dest),
-                            length);
-       else
-               (void)printf("lecid:%x %s %s %s %d: ",
-                            ntohs(ep->le_header),
-                            etheraddr_string(ep->h_source),
-                            etheraddr_string(ep->h_dest),
-                            etherproto_string(ep->h_type),
-                            length);
+       ND_PRINT("lecid:%x ", GET_BE_U_2(bp));

 }
 
 /*
 }
 
 /*

- * This is the top level routine of the printer.  'p' is the points
- * to the ether header of the packet, 'h->tv' is the timestamp,
- * 'h->length' 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
  * This assumes 802.3, not 802.5, LAN emulation.
  */
 void

-lane_print(const u_char *p, u_int length, u_int caplen)
+lane_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)

 {
 {

-       struct lane_controlhdr *lec;
-       struct lecdatahdr_8023 *ep;
-       u_short ether_type;
-       u_short extracted_ethertype;
+       const struct lane_controlhdr *lec;

 
 

-       if (caplen < sizeof(struct lane_controlhdr)) {
-               printf("[|lane]");
-               return;
-       }
+       ndo->ndo_protocol = "lane";

 
 

-       lec = (struct lane_controlhdr *)p;
-       if (ntohs(lec->lec_header) == 0xff00) {
+       lec = (const struct lane_controlhdr *)p;
+       if (GET_BE_U_2(lec->lec_header) == 0xff00) {

                /*
                 * LE Control.
                 */
                /*
                 * LE Control.
                 */

-               printf("lec: proto %x vers %x %s",
-                   lec->lec_proto, lec->lec_vers,
-                   tok2str(lecop2str, "opcode-#%u", ntohs(lec->lec_opcode)));
+               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)));

                return;
        }
 
                return;
        }
 

-       if (caplen < sizeof(struct lecdatahdr_8023)) {
-               printf("[|lane]");
-               return;
-       }
-
-       if (eflag)
-               lane_hdr_print(p, length);
-

        /*
        /*

-        * Some printers want to get back at the ethernet 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.
+        * Go past the LE header.

         */
         */

-       packetp = p + 2;        /* skip the LECID */
-       snapend = p + caplen;
-
-       length -= sizeof(struct lecdatahdr_8023);
-       caplen -= sizeof(struct lecdatahdr_8023);
-       ep = (struct lecdatahdr_8023 *)p;
-       p += sizeof(struct lecdatahdr_8023);
-
-       ether_type = ntohs(ep->h_type);
+       ND_TCHECK_2(p); /* Needed */
+       length -= 2;
+       caplen -= 2;
+       p += 2;

 
        /*
 
        /*

-        * Is it (gag) an 802.3 encapsulation?
+        * Now print the encapsulated frame, under the assumption
+        * that it's an Ethernet frame.

         */
         */

-       extracted_ethertype = 0;
-       if (ether_type <= ETHERMTU) {
-               /* Try to print the LLC-layer header & higher layers */
-               if (llc_print(p, length, caplen, ep->h_source, ep->h_dest,
-                   &extracted_ethertype) == 0) {
-                       /* ether_type not known, print raw packet */
-                       if (!eflag)
-                               lane_hdr_print((u_char *)ep, length + sizeof(*ep));
-                       if (extracted_ethertype) {
-                               printf("(LLC %s) ",
-                              etherproto_string(htons(extracted_ethertype)));
-                       }
-                       if (!xflag && !qflag)
-                               default_print(p, caplen);
-               }
-       } else if (ether_encap_print(ether_type, p, length, caplen,
-           &extracted_ethertype) == 0) {
-               /* ether_type not known, print raw packet */
-               if (!eflag)
-                       lane_hdr_print((u_char *)ep, length + sizeof(*ep));
-               if (!xflag && !qflag)
-                       default_print(p, caplen);
-       }
-       if (xflag)
-               default_print(p, caplen);
-}
-
-void
-lane_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
-{
-       int caplen = h->caplen;
-       int length = h->len;
-
-       ++infodelay;
-       ts_print(&h->ts);
-
-       lane_print(p, length, caplen);
-
-       putchar('\n');
-       --infodelay;
-       if (infoprint)
-               info(0);
+       ether_print(ndo, p, length, caplen, lane_hdr_print, p - 2);

 }
 }