Remove EXTRACT_LE_8BITS() macro, use EXTRACT_8BITS() macro

[tcpdump] / print-isakmp.c

diff --git a/print-isakmp.c b/print-isakmp.c
index 04374b0b3298ee702cdf03e62ded3ba912b81348..d38b473244be70f5c051d4b2c3877f6a26ad2e6c 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -923,7 +923,7 @@ ikev1_attrmap_print(netdissect_options *ndo,
                totlen = 4;
        else {
                ND_TCHECK_16BITS(&p[2]);
-               totlen = 4 + EXTRACT_16BITS(&p[2]);
+               totlen = 4 + EXTRACT_BE_16BITS(&p[2]);
        }
        if (ep2 < p + totlen) {
                ND_PRINT((ndo,"[|attr]"));
@@ -932,7 +932,7 @@ ikev1_attrmap_print(netdissect_options *ndo,
 
        ND_TCHECK_16BITS(&p[0]);
        ND_PRINT((ndo,"("));
-       t = EXTRACT_16BITS(&p[0]) & 0x7fff;
+       t = EXTRACT_BE_16BITS(&p[0]) & 0x7fff;
        if (map && t < nmap && map[t].type)
                ND_PRINT((ndo,"type=%s ", map[t].type));
        else
@@ -940,7 +940,7 @@ ikev1_attrmap_print(netdissect_options *ndo,
        if (p[0] & 0x80) {
                ND_PRINT((ndo,"value="));
                ND_TCHECK_16BITS(&p[2]);
-               v = EXTRACT_16BITS(&p[2]);
+               v = EXTRACT_BE_16BITS(&p[2]);
                if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
                        ND_PRINT((ndo,"%s", map[t].value[v]));
                else {
@@ -974,7 +974,7 @@ ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2)
                totlen = 4;
        else {
                ND_TCHECK_16BITS(&p[2]);
-               totlen = 4 + EXTRACT_16BITS(&p[2]);
+               totlen = 4 + EXTRACT_BE_16BITS(&p[2]);
        }
        if (ep2 < p + totlen) {
                ND_PRINT((ndo,"[|attr]"));
@@ -983,7 +983,7 @@ ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2)
 
        ND_TCHECK_16BITS(&p[0]);
        ND_PRINT((ndo,"("));
-       t = EXTRACT_16BITS(&p[0]) & 0x7fff;
+       t = EXTRACT_BE_16BITS(&p[0]) & 0x7fff;
        ND_PRINT((ndo,"type=#%d ", t));
        if (p[0] & 0x80) {
                ND_PRINT((ndo,"value="));
@@ -1770,7 +1770,7 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,
                case IPSECDOI_NTYPE_REPLAY_STATUS:
                        ND_PRINT((ndo," status=("));
                        ND_PRINT((ndo,"replay detection %sabled",
-                                 EXTRACT_32BITS(cp) ? "en" : "dis"));
+                                 EXTRACT_BE_32BITS(cp) ? "en" : "dis"));
                        ND_PRINT((ndo,")"));
                        break;
                default:
@@ -2822,7 +2822,7 @@ ikev1_print(netdissect_options *ndo,
        p = (const struct isakmp *)bp;
        ep = ndo->ndo_snapend;
 
-       phase = (EXTRACT_32BITS(base->msgid) == 0) ? 1 : 2;
+       phase = (EXTRACT_BE_32BITS(base->msgid) == 0) ? 1 : 2;
        if (phase == 1)
                ND_PRINT((ndo," phase %d", phase));
        else
@@ -2981,7 +2981,7 @@ ikev2_print(netdissect_options *ndo,
        p = (const struct isakmp *)bp;
        ep = ndo->ndo_snapend;
 
-       phase = (EXTRACT_32BITS(base->msgid) == 0) ? 1 : 2;
+       phase = (EXTRACT_BE_32BITS(base->msgid) == 0) ? 1 : 2;
        if (phase == 1)
                ND_PRINT((ndo, " parent_sa"));
        else