X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f04971f7af729a0ac398e7355e3374ed552c38dc..0b3880c91e169db7cfbdce1b18ef4f1e3fd277de:/print-pptp.c?ds=sidebyside

diff --git a/print-pptp.c b/print-pptp.c
index 1e10f8db..7bdc7d82 100644
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -26,15 +26,14 @@
 /* specification: RFC 2637 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|pptp]";
 
 #define PPTP_MSG_TYPE_CTRL	1	/* Control Message */
 #define PPTP_MSG_TYPE_MGMT	2	/* Management Message (currently not used */
@@ -233,7 +232,7 @@ struct pptp_msg_sli {
 /* attributes that appear more than once in above messages:
 
    Number of
-   occurence    attributes
+   occurrence    attributes
   --------------------------------------
       2         uint32_t bearer_cap;
       2         uint32_t bearer_type;
@@ -553,7 +552,7 @@ pptp_sccrq_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -584,7 +583,7 @@ pptp_sccrp_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -620,7 +619,7 @@ pptp_stopccrq_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -639,7 +638,7 @@ pptp_stopccrp_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -654,7 +653,7 @@ pptp_echorq_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -675,7 +674,7 @@ pptp_echorp_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -712,7 +711,7 @@ pptp_ocrq_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -743,7 +742,7 @@ pptp_ocrp_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -774,7 +773,7 @@ pptp_icrq_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -801,7 +800,7 @@ pptp_icrp_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -826,7 +825,7 @@ pptp_iccn_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -843,7 +842,7 @@ pptp_ccrq_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -868,7 +867,7 @@ pptp_cdn_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -897,7 +896,7 @@ pptp_wen_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -918,7 +917,7 @@ pptp_sli_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }
 
 void
@@ -929,6 +928,7 @@ pptp_print(netdissect_options *ndo,
 	uint32_t mc;
 	uint16_t ctrl_msg_type;
 
+	ndo->ndo_protocol = "pptp";
 	ND_PRINT(": pptp");
 
 	hdr = (const struct pptp_hdr *)dat;
@@ -1027,5 +1027,5 @@ pptp_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("%s", tstr);
+	nd_print_trunc(ndo);
 }