IPoIB: Add the output with -e for a capture test

[tcpdump] / print-ah.c

diff --git a/print-ah.c b/print-ah.c
index 2f58716b8a553eb8d9c7b50dc5b23dbdc531c6d2..59b006ea9a152a639c8dcf500060f00cb1015d89 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -40,25 +40,23 @@ ah_print(netdissect_options *ndo, const u_char *bp)
        const struct ah *ah;
        u_int sumlen;
 
+       ndo->ndo_protocol = "ah";
        ah = (const struct ah *)bp;
 
        ND_TCHECK_SIZE(ah);
 
-       sumlen = EXTRACT_U_1(ah->ah_len) << 2;
+       sumlen = GET_U_1(ah->ah_len) << 2;
 
-       ND_PRINT("AH(spi=0x%08x", EXTRACT_BE_U_4(ah->ah_spi));
+       ND_PRINT("AH(spi=0x%08x", GET_BE_U_4(ah->ah_spi));
        if (ndo->ndo_vflag)
                ND_PRINT(",sumlen=%u", sumlen);
        ND_TCHECK_4(ah + 1);
-       ND_PRINT(",seq=0x%x", EXTRACT_BE_U_4(ah + 1));
-       if (!ND_TTEST_LEN(bp, sizeof(struct ah) + sumlen)) {
-               ND_PRINT("[truncated]):");
-               return -1;
-       }
+       ND_PRINT(",seq=0x%x", GET_BE_U_4(ah + 1));
+       ND_TCHECK_LEN(bp, sizeof(struct ah) + sumlen);
        ND_PRINT("): ");
 
        return sizeof(struct ah) + sumlen;
  trunc:
-       ND_PRINT("[|AH]");
+       nd_print_trunc(ndo);
        return -1;
 }