X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/dfe00c486a379bccce43ecf8d28bea99d525c955..HEAD:/print-pptp.c

diff --git a/print-pptp.c b/print-pptp.c
index 038ba9b3..8666e505 100644
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -25,9 +25,7 @@
 
 /* specification: RFC 2637 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -55,7 +53,7 @@
 #define PPTP_CTRL_MSG_TYPE_WEN		14
 #define PPTP_CTRL_MSG_TYPE_SLI		15
 
-#define PPTP_FRAMING_CAP_ASYNC_MASK	0x00000001      /* Aynchronous */
+#define PPTP_FRAMING_CAP_ASYNC_MASK	0x00000001      /* Asynchronous */
 #define PPTP_FRAMING_CAP_SYNC_MASK	0x00000002      /* Synchronous */
 
 #define PPTP_BEARER_CAP_ANALOG_MASK	0x00000001      /* Analog */
@@ -392,7 +390,7 @@ pptp_hostname_print(netdissect_options *ndo,
                     const u_char *hostname)
 {
 	ND_PRINT(" HOSTNAME(");
-	nd_printzp(ndo, hostname, 64, ndo->ndo_snapend);
+	nd_printjnp(ndo, hostname, 64);
 	ND_PRINT(")");
 }
 
@@ -514,7 +512,7 @@ pptp_subaddr_print(netdissect_options *ndo,
                    const u_char *subaddr)
 {
 	ND_PRINT(" SUB_ADDR(");
-	nd_printzp(ndo, subaddr, 64, ndo->ndo_snapend);
+	nd_printjnp(ndo, subaddr, 64);
 	ND_PRINT(")");
 }
 
@@ -523,7 +521,7 @@ pptp_vendor_print(netdissect_options *ndo,
                   const u_char *vendor)
 {
 	ND_PRINT(" VENDOR(");
-	nd_printzp(ndo, vendor, 64, ndo->ndo_snapend);
+	nd_printjnp(ndo, vendor, 64);
 	ND_PRINT(")");
 }
 
@@ -640,9 +638,8 @@ pptp_ocrq_print(netdissect_options *ndo,
 	ND_PRINT(" PHONE_NO_LEN(%u)", GET_BE_U_2(ptr->phone_no_len));
 	PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
 	ND_PRINT(" PHONE_NO(");
-	nd_printzp(ndo, ptr->phone_no,
-		   ND_MIN(64, GET_BE_U_2(ptr->phone_no_len)),
-		   ndo->ndo_snapend);
+	nd_printjnp(ndo, ptr->phone_no,
+		    ND_MIN(64, GET_BE_U_2(ptr->phone_no_len)));
 	ND_PRINT(")");
 	pptp_subaddr_print(ndo, ptr->subaddr);
 }
@@ -677,14 +674,12 @@ pptp_icrq_print(netdissect_options *ndo,
 	ND_PRINT(" DIALED_NO_LEN(%u)", GET_BE_U_2(ptr->dialed_no_len));
 	ND_PRINT(" DIALING_NO_LEN(%u)", GET_BE_U_2(ptr->dialing_no_len));
 	ND_PRINT(" DIALED_NO(");
-	nd_printzp(ndo, ptr->dialed_no,
-		   ND_MIN(64, GET_BE_U_2(ptr->dialed_no_len)),
-		   ndo->ndo_snapend);
+	nd_printjnp(ndo, ptr->dialed_no,
+		    ND_MIN(64, GET_BE_U_2(ptr->dialed_no_len)));
 	ND_PRINT(")");
 	ND_PRINT(" DIALING_NO(");
-	nd_printzp(ndo, ptr->dialing_no,
-		   ND_MIN(64, GET_BE_U_2(ptr->dialing_no_len)),
-		   ndo->ndo_snapend);
+	nd_printjnp(ndo, ptr->dialing_no,
+		    ND_MIN(64, GET_BE_U_2(ptr->dialing_no_len)));
 	ND_PRINT(")");
 	pptp_subaddr_print(ndo, ptr->subaddr);
 }
@@ -740,7 +735,7 @@ pptp_cdn_print(netdissect_options *ndo,
 	pptp_cause_code_print(ndo, ptr->cause_code);
 	PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
 	ND_PRINT(" CALL_STATS(");
-	nd_printzp(ndo, ptr->call_stats, 128, ndo->ndo_snapend);
+	nd_printjnp(ndo, ptr->call_stats, 128);
 	ND_PRINT(")");
 }