X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/27d428c0a126e9ca6518b16f011cacc1caab1f2c..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-lane.c

diff --git a/print-lane.c b/print-lane.c
index 81b0bb66..c5fa33be 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -20,41 +20,30 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.25 2005-11-13 12:12:42 guy Exp $ (LBL)";
-#endif
+/* \summary: ATM LANE printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <pcap.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
-#include "addrtoname.h"
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
 #include "extract.h"
-#include "ether.h"
-
-#ifndef ETHER_ADDR_LEN
-#define ETHER_ADDR_LEN 6
-#endif
 
 struct lecdatahdr_8023 {
-  u_int16_t le_header;
-  u_int8_t h_dest[ETHER_ADDR_LEN];
-  u_int8_t h_source[ETHER_ADDR_LEN];
-  u_int16_t h_type;
+  nd_uint16_t le_header;
+  nd_mac_addr h_dest;
+  nd_mac_addr h_source;
+  nd_uint16_t h_type;
 };
 
 struct lane_controlhdr {
-  u_int16_t lec_header;
-  u_int8_t lec_proto;
-  u_int8_t lec_vers;
-  u_int16_t lec_opcode;
+  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[] = {
@@ -80,41 +69,35 @@ static const struct tok lecop2str[] = {
 static void
 lane_hdr_print(netdissect_options *ndo, const u_char *bp)
 {
-	(void)ND_PRINT((ndo, "lecid:%x ", EXTRACT_16BITS(bp)));
+	ND_PRINT("lecid:%x ", GET_BE_U_2(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
-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;
+	const struct lane_controlhdr *lec;
 
-	if (caplen < sizeof(struct lane_controlhdr)) {
-		printf("[|lane]");
-		return;
-	}
+	ndo->ndo_protocol = "lane";
 
-	lec = (struct lane_controlhdr *)p;
-	if (EXTRACT_16BITS(&lec->lec_header) == 0xff00) {
+	lec = (const struct lane_controlhdr *)p;
+	if (GET_BE_U_2(lec->lec_header) == 0xff00) {
 		/*
 		 * LE Control.
 		 */
-		printf("lec: proto %x vers %x %s",
-		    lec->lec_proto, lec->lec_vers,
-		    tok2str(lecop2str, "opcode-#%u", EXTRACT_16BITS(&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;
 	}
 
 	/*
 	 * Go past the LE header.
 	 */
+	ND_TCHECK_2(p); /* Needed */
 	length -= 2;
 	caplen -= 2;
 	p += 2;
@@ -123,13 +106,5 @@ lane_print(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(gndo, p, length, caplen, lane_hdr_print, p - 2);
-}
-
-u_int
-lane_if_print(const struct pcap_pkthdr *h, const u_char *p)
-{
-	lane_print(p, h->len, h->caplen);
-
-	return (sizeof(struct lecdatahdr_8023));
+	ether_print(ndo, p, length, caplen, lane_hdr_print, p - 2);
 }