Use more the EXTRACT_8BITS() macro to fetch a one-byte value (11/n)

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index 96727faa31f3309d09b1a093741ce35f641b7efc..69a86ce2cc0c2c00ac8d20a452a21c252cfb622b 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -86,11 +86,11 @@ struct  arp_pkthdr {
 
 #define ARP_HDRLEN     8
 
 
 #define ARP_HDRLEN     8
 

-#define HRD(ap) EXTRACT_16BITS(&(ap)->ar_hrd)
+#define HRD(ap) EXTRACT_BE_16BITS(&(ap)->ar_hrd)

 #define HRD_LEN(ap) ((ap)->ar_hln)
 #define PROTO_LEN(ap) ((ap)->ar_pln)
 #define HRD_LEN(ap) ((ap)->ar_hln)
 #define PROTO_LEN(ap) ((ap)->ar_pln)

-#define OP(ap)  EXTRACT_16BITS(&(ap)->ar_op)
-#define PRO(ap) EXTRACT_16BITS(&(ap)->ar_pro)
+#define OP(ap)  EXTRACT_BE_16BITS(&(ap)->ar_op)
+#define PRO(ap) EXTRACT_BE_16BITS(&(ap)->ar_pro)

 #define SHA(ap) (ar_sha(ap))
 #define SPA(ap) (ar_spa(ap))
 #define THA(ap) (ar_tha(ap))
 #define SHA(ap) (ar_sha(ap))
 #define SPA(ap) (ar_spa(ap))
 #define THA(ap) (ar_tha(ap))


@@ -153,12 +153,12 @@ struct  atmarp_pkthdr {
        u_char  aar_tpa[];      /* target protocol address */
 #endif
 
        u_char  aar_tpa[];      /* target protocol address */
 #endif
 

-#define ATMHRD(ap)  EXTRACT_16BITS(&(ap)->aar_hrd)
+#define ATMHRD(ap)  EXTRACT_BE_16BITS(&(ap)->aar_hrd)

 #define ATMSHRD_LEN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK)
 #define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK)
 #define ATMSPROTO_LEN(ap) ((ap)->aar_spln)
 #define ATMSHRD_LEN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK)
 #define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK)
 #define ATMSPROTO_LEN(ap) ((ap)->aar_spln)

-#define ATMOP(ap)   EXTRACT_16BITS(&(ap)->aar_op)
-#define ATMPRO(ap)  EXTRACT_16BITS(&(ap)->aar_pro)
+#define ATMOP(ap)   EXTRACT_BE_16BITS(&(ap)->aar_op)
+#define ATMPRO(ap)  EXTRACT_BE_16BITS(&(ap)->aar_pro)

 #define ATMTHRD_LEN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK)
 #define ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK)
 #define ATMTPROTO_LEN(ap) ((ap)->aar_tpln)
 #define ATMTHRD_LEN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK)
 #define ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK)
 #define ATMTPROTO_LEN(ap) ((ap)->aar_tpln)