Use more the ND_TTEST_1() macro

[tcpdump] / print-lane.c

diff --git a/print-lane.c b/print-lane.c
index dd8aff0be2c8b28ecc918f6294087224e5c2a81c..cc4cb6bb0d1a0a60f8437b9c4b987b5618cb7ff5 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
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"

-#include "ether.h"

 
 struct lecdatahdr_8023 {
 
 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;
+  uint16_t le_header;
+  nd_mac_addr h_dest;
+  nd_mac_addr h_source;
+  uint16_t h_type;

 };
 
 struct lane_controlhdr {
 };
 
 struct lane_controlhdr {

-  u_int16_t lec_header;
-  u_int8_t lec_proto;
-  u_int8_t lec_vers;
-  u_int16_t lec_opcode;
+  uint16_t lec_header;
+  uint8_t lec_proto;
+  uint8_t lec_vers;
+  uint16_t lec_opcode;

 };
 
 static const struct tok lecop2str[] = {
 };
 
 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)
 {
 static void
 lane_hdr_print(netdissect_options *ndo, const u_char *bp)
 {

-       (void)ND_PRINT((ndo, "lecid:%x ", EXTRACT_16BITS(bp)));
+       ND_PRINT((ndo, "lecid:%x ", EXTRACT_BE_U_2(bp)));

 }
 
 /*
 }
 
 /*


@@ -81,21 +82,21 @@ 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)
 {
 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;
        }
 
 
        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,
                /*
                 * 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))));
+                   tok2str(lecop2str, "opcode-#%u", EXTRACT_BE_U_2(&lec->lec_opcode))));

                return;
        }
 
                return;
        }