change make check to work with POSIX shell

[tcpdump] / print-lane.c

diff --git a/print-lane.c b/print-lane.c
index c8d919e148ee82c3f05cb8999b2a284a0d7df4cd..ba5208425bc3319f90e580acbc78ad68b0146b91 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -20,29 +20,30 @@
  *
  */
 
-#define NETDISSECT_REWORKED
+/* \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 {
-  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;
+  uint8_t h_dest[ETHER_ADDR_LEN];
+  uint8_t h_source[ETHER_ADDR_LEN];
+  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;
+  uint16_t lec_header;
+  uint8_t lec_proto;
+  uint8_t lec_vers;
+  uint16_t lec_opcode;
 };
 
 static const struct tok lecop2str[] = {
@@ -82,14 +83,14 @@ 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;
+       lec = (const struct lane_controlhdr *)p;
        if (EXTRACT_16BITS(&lec->lec_header) == 0xff00) {
                /*
                 * LE Control.