When checking for pcap_if_t, add $V_INCLS to CFLAGS, so we look at the

[tcpdump] / print-lane.c

diff --git a/print-lane.c b/print-lane.c
index a7fa2908d41fd6d319d806767c610929003667a1..03e5652d10f738249f4499cc8450cb4095efd273 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -21,8 +21,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.15 2002-08-01 08:53:15 risso Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23 2004-03-17 23:24:37 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -36,6 +36,7 @@ static const char rcsid[] =
 
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
 #include "ether.h"
 #include "lane.h"
 
@@ -67,13 +68,13 @@ lane_hdr_print(register const u_char *bp, int length)
        ep = (const struct lecdatahdr_8023 *)bp;
        if (qflag)
                (void)printf("lecid:%x %s %s %d: ",
-                            ntohs(ep->le_header),
+                            EXTRACT_16BITS(&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),
+                            EXTRACT_16BITS(&ep->le_header),
                             etheraddr_string(ep->h_source),
                             etheraddr_string(ep->h_dest),
                             etherproto_string(ep->h_type),
@@ -81,9 +82,9 @@ lane_hdr_print(register const u_char *bp, int length)
 }
 
 /*
- * 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'
+ * 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.
@@ -102,13 +103,13 @@ lane_print(const u_char *p, u_int length, u_int caplen)
        }
 
        lec = (struct lane_controlhdr *)p;
-       if (ntohs(lec->lec_header) == 0xff00) {
+       if (EXTRACT_16BITS(&lec->lec_header) == 0xff00) {
                /*
                 * LE Control.
                 */
                printf("lec: proto %x vers %x %s",
                    lec->lec_proto, lec->lec_vers,
-                   tok2str(lecop2str, "opcode-#%u", ntohs(lec->lec_opcode)));
+                   tok2str(lecop2str, "opcode-#%u", EXTRACT_16BITS(&lec->lec_opcode)));
                return;
        }
 
@@ -121,19 +122,14 @@ lane_print(const u_char *p, u_int length, u_int caplen)
                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 LANE 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);
+       ether_type = EXTRACT_16BITS(&ep->h_type);
 
        /*
         * Is it (gag) an 802.3 encapsulation?
@@ -161,23 +157,12 @@ lane_print(const u_char *p, u_int length, u_int caplen)
                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)
+u_int
+lane_if_print(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);
+       lane_print(p, h->len, h->caplen);
 
-       putchar('\n');
-       --infodelay;
-       if (infoprint)
-               info(0);
+       return (sizeof(struct lecdatahdr_8023));
 }