X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/464c44fbd1394ac006d8d99f16e80ead423c1c47..ffa1470e5c7ff0e50028d085a481dc797b0b51ed:/print-lane.c

diff --git a/print-lane.c b/print-lane.c
index e020c3bf..e775f1fc 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -21,27 +21,22 @@
  */
 
 #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)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23.2.2 2005-11-13 12:12:59 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>
 
 #include <stdio.h>
 #include <pcap.h>
 
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
 #include "ether.h"
 #include "lane.h"
 
@@ -73,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),
@@ -87,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.
@@ -108,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;
 	}
 
@@ -127,24 +122,18 @@ 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?
 	 */
-	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,
@@ -156,7 +145,7 @@ lane_print(const u_char *p, u_int length, u_int caplen)
 				printf("(LLC %s) ",
 			       etherproto_string(htons(extracted_ethertype)));
 			}
-			if (!xflag && !qflag)
+			if (!suppress_default_print)
 				default_print(p, caplen);
 		}
 	} else if (ether_encap_print(ether_type, p, length, caplen,
@@ -164,26 +153,15 @@ lane_print(const u_char *p, u_int length, u_int caplen)
 		/* ether_type not known, print raw packet */
 		if (!eflag)
 			lane_hdr_print((u_char *)ep, length + sizeof(*ep));
-		if (!xflag && !qflag)
+		if (!suppress_default_print)
 			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));
 }