Use more the ND_TTEST_1() macro

[tcpdump] / print-esp.c

diff --git a/print-esp.c b/print-esp.c
index d12b97daf10421d9bb3d71a6fcc946d3d0a5f840..ade700a29540faa7debdd026856b213b85ad29aa 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -636,19 +636,19 @@ esp_print(netdissect_options *ndo,
        _U_
 #endif
        ,
-       int *nhdr
+       u_int *nhdr
 #ifndef HAVE_LIBCRYPTO
        _U_
 #endif
        ,
-       int *padlen
+       u_int *padlen
 #ifndef HAVE_LIBCRYPTO
        _U_
 #endif
        )
 {
-       register const struct newesp *esp;
-       register const u_char *ep;
+       const struct newesp *esp;
+       const u_char *ep;
 #ifdef HAVE_LIBCRYPTO
        const struct ip *ip;
        struct sa_list *sa = NULL;
@@ -683,8 +683,8 @@ esp_print(netdissect_options *ndo,
                ND_PRINT((ndo, "[|ESP]"));
                goto fail;
        }
-       ND_PRINT((ndo, "ESP(spi=0x%08x", EXTRACT_32BITS(&esp->esp_spi)));
-       ND_PRINT((ndo, ",seq=0x%x)", EXTRACT_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
@@ -706,14 +706,14 @@ esp_print(netdissect_options *ndo,
        case 6:
                ip6 = (const struct ip6_hdr *)bp2;
                /* we do not attempt to decrypt jumbograms */
-               if (!EXTRACT_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 */
-               len = sizeof(struct ip6_hdr) + EXTRACT_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) {
-                       if (sa->spi == EXTRACT_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) {
@@ -723,13 +723,13 @@ esp_print(netdissect_options *ndo,
                break;
        case 4:
                /* nexthdr & padding are in the last fragment */
-               if (EXTRACT_16BITS(&ip->ip_off) & IP_MF)
+               if (EXTRACT_BE_U_2(&ip->ip_off) & IP_MF)
                        goto fail;
-               len = EXTRACT_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) {
-                       if (sa->spi == EXTRACT_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) {
@@ -807,14 +807,14 @@ esp_print(netdissect_options *ndo,
                advance = sizeof(struct newesp);
 
        /* sanity check for pad length */
-       if (ep - bp < *(ep - 2))
+       if (ep - bp < EXTRACT_U_1(ep - 2))
                goto fail;
 
        if (padlen)
-               *padlen = *(ep - 2) + 2;
+               *padlen = EXTRACT_U_1(ep - 2) + 2;
 
        if (nhdr)
-               *nhdr = *(ep - 1);
+               *nhdr = EXTRACT_U_1(ep - 1);
 
        ND_PRINT((ndo, ": "));
        return advance;