remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-esp.c

diff --git a/print-esp.c b/print-esp.c
index 0b3ecc910c3d0ced00fbc0d898f1cada09f2969b..14885d6b693b3ad088e8d462b3d5cd72123ca6df 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -45,10 +45,12 @@
 #endif
 
 #include "netdissect.h"
-#include "strtoaddr.h"
 #include "extract.h"
 
+#ifdef HAVE_LIBCRYPTO
+#include "strtoaddr.h"
 #include "ascii_strcasecmp.h"
+#endif
 
 #include "ip.h"
 #include "ip6.h"
@@ -902,7 +904,7 @@ esp_print(netdissect_options *ndo,
        ND_PRINT(": ");
 
        /* Now dissect the plaintext. */
-       ip_print_demux(ndo, pt, payloadlen - (padlen + 2), ver, fragmented,
+       ip_demux_print(ndo, pt, payloadlen - (padlen + 2), ver, fragmented,
            ttl_hl, nh, bp2);
 
        /* Pop the buffer, freeing it. */