Compile with '-Wsign-compare' in devel mode if supported

[tcpdump] / print-pptp.c

diff --git a/print-pptp.c b/print-pptp.c
index 1c4f52457232e3eada90c449fb191452567f36bf..1f5c331390ed64169abca887d6446cad43c72583 100644 (file)
--- 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 */
@@ -545,15 +544,15 @@ pptp_sccrq_print(netdissect_options *ndo,
        pptp_max_channel_print(ndo, &ptr->max_channel);
        ND_TCHECK_2(ptr->firm_rev);
        pptp_firm_rev_print(ndo, &ptr->firm_rev);
-       ND_TCHECK(ptr->hostname);
+       ND_TCHECK_SIZE(&ptr->hostname);
        pptp_hostname_print(ndo, &ptr->hostname[0]);
-       ND_TCHECK(ptr->vendor);
+       ND_TCHECK_SIZE(&ptr->vendor);
        pptp_vendor_print(ndo, &ptr->vendor[0]);
 
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -576,15 +575,15 @@ pptp_sccrp_print(netdissect_options *ndo,
        pptp_max_channel_print(ndo, &ptr->max_channel);
        ND_TCHECK_2(ptr->firm_rev);
        pptp_firm_rev_print(ndo, &ptr->firm_rev);
-       ND_TCHECK(ptr->hostname);
+       ND_TCHECK_SIZE(&ptr->hostname);
        pptp_hostname_print(ndo, &ptr->hostname[0]);
-       ND_TCHECK(ptr->vendor);
+       ND_TCHECK_SIZE(&ptr->vendor);
        pptp_vendor_print(ndo, &ptr->vendor[0]);
 
        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
@@ -704,15 +703,15 @@ pptp_ocrq_print(netdissect_options *ndo,
        ND_PRINT(" PHONE_NO_LEN(%u)", EXTRACT_BE_U_2(ptr->phone_no_len));
        ND_TCHECK_2(ptr->reserved1);
        PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
-       ND_TCHECK(ptr->phone_no);
+       ND_TCHECK_SIZE(&ptr->phone_no);
        ND_PRINT(" PHONE_NO(%.64s)", ptr->phone_no);
-       ND_TCHECK(ptr->subaddr);
+       ND_TCHECK_SIZE(&ptr->subaddr);
        pptp_subaddr_print(ndo, &ptr->subaddr[0]);
 
        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
@@ -764,17 +763,17 @@ pptp_icrq_print(netdissect_options *ndo,
        ND_PRINT(" DIALED_NO_LEN(%u)", EXTRACT_BE_U_2(ptr->dialed_no_len));
        ND_TCHECK_2(ptr->dialing_no_len);
        ND_PRINT(" DIALING_NO_LEN(%u)", EXTRACT_BE_U_2(ptr->dialing_no_len));
-       ND_TCHECK(ptr->dialed_no);
+       ND_TCHECK_SIZE(&ptr->dialed_no);
        ND_PRINT(" DIALED_NO(%.64s)", ptr->dialed_no);
-       ND_TCHECK(ptr->dialing_no);
+       ND_TCHECK_SIZE(&ptr->dialing_no);
        ND_PRINT(" DIALING_NO(%.64s)", ptr->dialing_no);
-       ND_TCHECK(ptr->subaddr);
+       ND_TCHECK_SIZE(&ptr->subaddr);
        pptp_subaddr_print(ndo, &ptr->subaddr[0]);
 
        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
@@ -862,13 +861,13 @@ pptp_cdn_print(netdissect_options *ndo,
        pptp_cause_code_print(ndo, &ptr->cause_code);
        ND_TCHECK_2(ptr->reserved1);
        PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
-       ND_TCHECK(ptr->call_stats);
+       ND_TCHECK_SIZE(&ptr->call_stats);
        ND_PRINT(" CALL_STATS(%.128s)", ptr->call_stats);
 
        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);
 }