Add EXTRACT_ calls.

[tcpdump] / print-lane.c

diff --git a/print-lane.c b/print-lane.c
index 81b0bb665f4067e9ec6a04ec52137a60d6a535b3..745c339c4c354e06c9305a4059e8b9e837f534c4 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -20,41 +20,29 @@
  *
  */
 
  *
  */
 

-#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"
 #endif
 
 
 #ifdef HAVE_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"
+#include "netdissect.h"

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

-#include "ether.h"
-
-#ifndef ETHER_ADDR_LEN
-#define ETHER_ADDR_LEN 6
-#endif

 
 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;
+  nd_uint16_t le_header;
+  nd_mac_addr h_dest;
+  nd_mac_addr h_source;
+  nd_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;
+  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[] = {
 };
 
 static const struct tok lecop2str[] = {


@@ -80,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)));

 }
 
 /*
 }
 
 /*


@@ -92,23 +80,24 @@ lane_hdr_print(netdissect_options *ndo, const u_char *bp)
  * This assumes 802.3, not 802.5, LAN emulation.
  */
 void
  * 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)) {
 
        if (caplen < sizeof(struct lane_controlhdr)) {

-               printf("[|lane]");
+               ND_PRINT((ndo, "[|lane]"));

                return;
        }
 
                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.
                 */
                /*
                 * 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((ndo, "lec: proto %x vers %x %s",
+                   EXTRACT_U_1(lec->lec_proto),
+                   EXTRACT_U_1(lec->lec_vers),
+                   tok2str(lecop2str, "opcode-#%u", EXTRACT_BE_U_2(lec->lec_opcode))));

                return;
        }
 
                return;
        }
 


@@ -123,13 +112,13 @@ 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.
         */
         * 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);
+       ether_print(ndo, p, length, caplen, lane_hdr_print, p - 2);

 }
 
 u_int
 }
 
 u_int

-lane_if_print(const struct pcap_pkthdr *h, const u_char *p)
+lane_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
 {

-       lane_print(p, h->len, h->caplen);
+       lane_print(ndo, p, h->len, h->caplen);

 
        return (sizeof(struct lecdatahdr_8023));
 }
 
        return (sizeof(struct lecdatahdr_8023));
 }