Rename EXTRACT_ macros

[tcpdump] / print-esp.c

diff --git a/print-esp.c b/print-esp.c
index d19b36da940196a9762818d98a86947e5a067755..d71bd23e1be8066526bbd69f6f7c963e695ddb5c 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -683,8 +683,8 @@ esp_print(netdissect_options *ndo,
                ND_PRINT((ndo, "[|ESP]"));
                goto fail;
        }
                ND_PRINT((ndo, "[|ESP]"));
                goto fail;
        }

-       ND_PRINT((ndo, "ESP(spi=0x%08x", EXTRACT_BE_32BITS(&esp->esp_spi)));
-       ND_PRINT((ndo, ",seq=0x%x)", EXTRACT_BE_32BITS(&esp->esp_seq)));
+       ND_PRINT((ndo, "ESP(spi=0x%08x", EXTRACT_BE_U_4(&esp->esp_spi)));
+       ND_PRINT((ndo, ",seq=0x%x)", EXTRACT_BE_U_4(&esp->esp_seq)));

        ND_PRINT((ndo, ", length %u", length));
 
 #ifndef HAVE_LIBCRYPTO
        ND_PRINT((ndo, ", length %u", length));
 
 #ifndef HAVE_LIBCRYPTO


@@ -706,14 +706,14 @@ esp_print(netdissect_options *ndo,
        case 6:
                ip6 = (const struct ip6_hdr *)bp2;
                /* we do not attempt to decrypt jumbograms */
        case 6:
                ip6 = (const struct ip6_hdr *)bp2;
                /* we do not attempt to decrypt jumbograms */

-               if (!EXTRACT_BE_16BITS(&ip6->ip6_plen))
+               if (!EXTRACT_BE_U_2(&ip6->ip6_plen))

                        goto fail;
                /* if we can't get nexthdr, we do not need to decrypt it */
                        goto fail;
                /* if we can't get nexthdr, we do not need to decrypt it */

-               len = sizeof(struct ip6_hdr) + EXTRACT_BE_16BITS(&ip6->ip6_plen);
+               len = sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(&ip6->ip6_plen);

 
                /* see if we can find the SA, and if so, decode it */
                for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) {
 
                /* see if we can find the SA, and if so, decode it */
                for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) {

-                       if (sa->spi == EXTRACT_BE_32BITS(&esp->esp_spi) &&
+                       if (sa->spi == EXTRACT_BE_U_4(&esp->esp_spi) &&

                            sa->daddr_version == 6 &&
                            UNALIGNED_MEMCMP(&sa->daddr.in6, &ip6->ip6_dst,
                                   sizeof(struct in6_addr)) == 0) {
                            sa->daddr_version == 6 &&
                            UNALIGNED_MEMCMP(&sa->daddr.in6, &ip6->ip6_dst,
                                   sizeof(struct in6_addr)) == 0) {


@@ -723,13 +723,13 @@ esp_print(netdissect_options *ndo,
                break;
        case 4:
                /* nexthdr & padding are in the last fragment */
                break;
        case 4:
                /* nexthdr & padding are in the last fragment */

-               if (EXTRACT_BE_16BITS(&ip->ip_off) & IP_MF)
+               if (EXTRACT_BE_U_2(&ip->ip_off) & IP_MF)

                        goto fail;
                        goto fail;

-               len = EXTRACT_BE_16BITS(&ip->ip_len);
+               len = EXTRACT_BE_U_2(&ip->ip_len);

 
                /* see if we can find the SA, and if so, decode it */
                for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) {
 
                /* see if we can find the SA, and if so, decode it */
                for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) {

-                       if (sa->spi == EXTRACT_BE_32BITS(&esp->esp_spi) &&
+                       if (sa->spi == EXTRACT_BE_U_4(&esp->esp_spi) &&

                            sa->daddr_version == 4 &&
                            UNALIGNED_MEMCMP(&sa->daddr.in4, &ip->ip_dst,
                                   sizeof(struct in_addr)) == 0) {
                            sa->daddr_version == 4 &&
                            UNALIGNED_MEMCMP(&sa->daddr.in4, &ip->ip_dst,
                                   sizeof(struct in_addr)) == 0) {


@@ -807,14 +807,14 @@ esp_print(netdissect_options *ndo,
                advance = sizeof(struct newesp);
 
        /* sanity check for pad length */
                advance = sizeof(struct newesp);
 
        /* sanity check for pad length */

-       if (ep - bp < EXTRACT_8BITS(ep - 2))
+       if (ep - bp < EXTRACT_U_1(ep - 2))

                goto fail;
 
        if (padlen)
                goto fail;
 
        if (padlen)

-               *padlen = EXTRACT_8BITS(ep - 2) + 2;
+               *padlen = EXTRACT_U_1(ep - 2) + 2;

 
        if (nhdr)
 
        if (nhdr)

-               *nhdr = EXTRACT_8BITS(ep - 1);
+               *nhdr = EXTRACT_U_1(ep - 1);

 
        ND_PRINT((ndo, ": "));
        return advance;
 
        ND_PRINT((ndo, ": "));
        return advance;