remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index 36c353512a960efac7770aeae02ed7f8008c423e..607331906c9bc762c4d4c8f0fa70216a21156c84 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -94,7 +94,7 @@ struct enchdr {
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
-u_int
+void
 enc_if_print(netdissect_options *ndo,
              const struct pcap_pkthdr *h, const u_char *p)
 {
@@ -103,11 +103,13 @@ enc_if_print(netdissect_options *ndo,
        u_int af, flags;
        const struct enchdr *hdr;
 
-       ndo->ndo_protocol = "enc_if";
+       ndo->ndo_protocol = "enc";
        if (caplen < ENC_HDRLEN) {
-               ND_PRINT("[|enc]");
-               goto out;
+               ndo->ndo_ll_hdr_len += caplen;
+               nd_print_trunc(ndo);
+               return;
        }
+       ndo->ndo_ll_hdr_len += ENC_HDRLEN;
 
        hdr = (const struct enchdr *)p;
        /*
@@ -142,7 +144,7 @@ enc_if_print(netdissect_options *ndo,
        ENC_PRINT_TYPE(flags, M_AUTH, "authentic");
        ENC_PRINT_TYPE(flags, M_CONF, "confidential");
        /* ENC_PRINT_TYPE(flags, M_TUNNEL, "tunnel"); */
-       ND_PRINT("SPI 0x%08x: ", EXTRACT_BE_U_4(hdr->spi));
+       ND_PRINT("SPI 0x%08x: ", GET_BE_U_4(hdr->spi));
 
        length -= ENC_HDRLEN;
        caplen -= ENC_HDRLEN;
@@ -159,6 +161,5 @@ enc_if_print(netdissect_options *ndo,
                break;
        }
 
-out:
-       return (ENC_HDRLEN);
+       return;
 }