Remove EXTRACT_LE_8BITS() macro, use EXTRACT_8BITS() macro

[tcpdump] / print-vtp.c

diff --git a/print-vtp.c b/print-vtp.c
index d153cc19a5fd25d1bf8d773266c24ca18d775a4c..0c07293ae0e3d384934459716b903b257ae3ea14 100644 (file)
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -182,21 +182,21 @@ vtp_print (netdissect_options *ndo,
 
        ND_TCHECK2(*tptr, 8);
        ND_PRINT((ndo, "\n\t  Config Rev %x, Updater %s",
-              EXTRACT_32BITS(tptr),
+              EXTRACT_BE_32BITS(tptr),
               ipaddr_string(ndo, tptr+4)));
        tptr += 8;
        ND_TCHECK2(*tptr, VTP_UPDATE_TIMESTAMP_LEN);
        ND_PRINT((ndo, ", Timestamp 0x%08x 0x%08x 0x%08x",
-              EXTRACT_32BITS(tptr),
-              EXTRACT_32BITS(tptr + 4),
-              EXTRACT_32BITS(tptr + 8)));
+              EXTRACT_BE_32BITS(tptr),
+              EXTRACT_BE_32BITS(tptr + 4),
+              EXTRACT_BE_32BITS(tptr + 8)));
        tptr += VTP_UPDATE_TIMESTAMP_LEN;
        ND_TCHECK2(*tptr, VTP_MD5_DIGEST_LEN);
        ND_PRINT((ndo, ", MD5 digest: %08x%08x%08x%08x",
-              EXTRACT_32BITS(tptr),
-              EXTRACT_32BITS(tptr + 4),
-              EXTRACT_32BITS(tptr + 8),
-              EXTRACT_32BITS(tptr + 12)));
+              EXTRACT_BE_32BITS(tptr),
+              EXTRACT_BE_32BITS(tptr + 4),
+              EXTRACT_BE_32BITS(tptr + 8),
+              EXTRACT_BE_32BITS(tptr + 12)));
        tptr += VTP_MD5_DIGEST_LEN;
        break;
 
@@ -223,7 +223,7 @@ vtp_print (netdissect_options *ndo,
         */
 
        ND_TCHECK_32BITS(tptr);
-       ND_PRINT((ndo, ", Config Rev %x", EXTRACT_32BITS(tptr)));
+       ND_PRINT((ndo, ", Config Rev %x", EXTRACT_BE_32BITS(tptr)));
 
        /*
         *  VLAN INFORMATION
@@ -257,9 +257,9 @@ vtp_print (netdissect_options *ndo,
            ND_PRINT((ndo, "\n\tVLAN info status %s, type %s, VLAN-id %u, MTU %u, SAID 0x%08x, Name ",
                   tok2str(vtp_vlan_status,"Unknown",vtp_vlan->status),
                   tok2str(vtp_vlan_type_values,"Unknown",vtp_vlan->type),
-                  EXTRACT_16BITS(&vtp_vlan->vlanid),
-                  EXTRACT_16BITS(&vtp_vlan->mtu),
-                  EXTRACT_32BITS(&vtp_vlan->index)));
+                  EXTRACT_BE_16BITS(&vtp_vlan->vlanid),
+                  EXTRACT_BE_16BITS(&vtp_vlan->mtu),
+                  EXTRACT_BE_32BITS(&vtp_vlan->index)));
            len  -= VTP_VLAN_INFO_FIXED_PART_LEN;
            tptr += VTP_VLAN_INFO_FIXED_PART_LEN;
            if (len < 4*((vtp_vlan->name_len + 3)/4))
@@ -308,7 +308,7 @@ vtp_print (netdissect_options *ndo,
                     ND_PRINT((ndo, " (invalid TLV length %u != 1)", tlv_len));
                     return;
                 } else {
-                    tlv_value = EXTRACT_16BITS(tptr+2);
+                    tlv_value = EXTRACT_BE_16BITS(tptr + 2);
 
                     switch (type) {
                     case VTP_VLAN_STE_HOP_COUNT:
@@ -377,7 +377,7 @@ vtp_print (netdissect_options *ndo,
         */
 
        ND_TCHECK2(*tptr, 4);
-       ND_PRINT((ndo, "\n\tStart value: %u", EXTRACT_32BITS(tptr)));
+       ND_PRINT((ndo, "\n\tStart value: %u", EXTRACT_BE_32BITS(tptr)));
        break;
 
     case VTP_JOIN_MESSAGE: