Add EXTRACT_ calls.

[tcpdump] / print-lane.c

diff --git a/print-lane.c b/print-lane.c
index 1f10fab14046a3f634f6dfc50b88c9601630fb6e..745c339c4c354e06c9305a4059e8b9e837f534c4 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -20,28 +20,29 @@
  *
  */
 
+/* \summary: ATM LANE printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
-#include "ether.h"
 
 struct lecdatahdr_8023 {
-  uint16_t le_header;
-  uint8_t h_dest[ETHER_ADDR_LEN];
-  uint8_t h_source[ETHER_ADDR_LEN];
-  uint16_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 {
-  uint16_t lec_header;
-  uint8_t lec_proto;
-  uint8_t lec_vers;
-  uint16_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[] = {
@@ -67,7 +68,7 @@ static const struct tok lecop2str[] = {
 static void
 lane_hdr_print(netdissect_options *ndo, const u_char *bp)
 {
-       ND_PRINT((ndo, "lecid:%x ", EXTRACT_16BITS(bp)));
+       ND_PRINT((ndo, "lecid:%x ", EXTRACT_BE_U_2(bp)));
 }
 
 /*
@@ -81,21 +82,22 @@ lane_hdr_print(netdissect_options *ndo, const u_char *bp)
 void
 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)) {
                ND_PRINT((ndo, "[|lane]"));
                return;
        }
 
-       lec = (struct lane_controlhdr *)p;
-       if (EXTRACT_16BITS(&lec->lec_header) == 0xff00) {
+       lec = (const struct lane_controlhdr *)p;
+       if (EXTRACT_BE_U_2(lec->lec_header) == 0xff00) {
                /*
                 * LE Control.
                 */
                ND_PRINT((ndo, "lec: proto %x vers %x %s",
-                   lec->lec_proto, lec->lec_vers,
-                   tok2str(lecop2str, "opcode-#%u", EXTRACT_16BITS(&lec->lec_opcode))));
+                   EXTRACT_U_1(lec->lec_proto),
+                   EXTRACT_U_1(lec->lec_vers),
+                   tok2str(lecop2str, "opcode-#%u", EXTRACT_BE_U_2(lec->lec_opcode))));
                return;
        }