Fix a bunch of de-constifications.

[tcpdump] / print-pptp.c

diff --git a/print-pptp.c b/print-pptp.c
index c77868d46256e0f9bf3327f4a4fbb918e1f6c026..bac6078c211e25ed67c596aade6405f773a5b3da 100644 (file)
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -21,7 +21,6 @@
  * PPTP support contributed by Motonori Shindo ([email protected])
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -518,7 +517,7 @@ static void
 pptp_sccrq_print(netdissect_options *ndo,
                  const u_char *dat)
 {
-       struct pptp_msg_sccrq *ptr = (struct pptp_msg_sccrq *)dat;
+       const struct pptp_msg_sccrq *ptr = (const struct pptp_msg_sccrq *)dat;
 
        ND_TCHECK(ptr->proto_ver);
        pptp_proto_ver_print(ndo, &ptr->proto_ver);
@@ -546,7 +545,7 @@ static void
 pptp_sccrp_print(netdissect_options *ndo,
                  const u_char *dat)
 {
-       struct pptp_msg_sccrp *ptr = (struct pptp_msg_sccrp *)dat;
+       const struct pptp_msg_sccrp *ptr = (const struct pptp_msg_sccrp *)dat;
 
        ND_TCHECK(ptr->proto_ver);
        pptp_proto_ver_print(ndo, &ptr->proto_ver);
@@ -577,7 +576,7 @@ static void
 pptp_stopccrq_print(netdissect_options *ndo,
                     const u_char *dat)
 {
-       struct pptp_msg_stopccrq *ptr = (struct pptp_msg_stopccrq *)dat;
+       const struct pptp_msg_stopccrq *ptr = (const struct pptp_msg_stopccrq *)dat;
 
        ND_TCHECK(ptr->reason);
        ND_PRINT((ndo, " REASON(%u", ptr->reason));
@@ -611,7 +610,7 @@ static void
 pptp_stopccrp_print(netdissect_options *ndo,
                     const u_char *dat)
 {
-       struct pptp_msg_stopccrp *ptr = (struct pptp_msg_stopccrp *)dat;
+       const struct pptp_msg_stopccrp *ptr = (const struct pptp_msg_stopccrp *)dat;
 
        ND_TCHECK(ptr->result_code);
        pptp_result_code_print(ndo, &ptr->result_code, PPTP_CTRL_MSG_TYPE_StopCCRP);
@@ -629,7 +628,7 @@ static void
 pptp_echorq_print(netdissect_options *ndo,
                   const u_char *dat)
 {
-       struct pptp_msg_echorq *ptr = (struct pptp_msg_echorq *)dat;
+       const struct pptp_msg_echorq *ptr = (const struct pptp_msg_echorq *)dat;
 
        ND_TCHECK(ptr->id);
        pptp_id_print(ndo, &ptr->id);
@@ -644,7 +643,7 @@ static void
 pptp_echorp_print(netdissect_options *ndo,
                   const u_char *dat)
 {
-       struct pptp_msg_echorp *ptr = (struct pptp_msg_echorp *)dat;
+       const struct pptp_msg_echorp *ptr = (const struct pptp_msg_echorp *)dat;
 
        ND_TCHECK(ptr->id);
        pptp_id_print(ndo, &ptr->id);
@@ -664,7 +663,7 @@ static void
 pptp_ocrq_print(netdissect_options *ndo,
                 const u_char *dat)
 {
-       struct pptp_msg_ocrq *ptr = (struct pptp_msg_ocrq *)dat;
+       const struct pptp_msg_ocrq *ptr = (const struct pptp_msg_ocrq *)dat;
 
        ND_TCHECK(ptr->call_id);
        pptp_call_id_print(ndo, &ptr->call_id);
@@ -700,7 +699,7 @@ static void
 pptp_ocrp_print(netdissect_options *ndo,
                 const u_char *dat)
 {
-       struct pptp_msg_ocrp *ptr = (struct pptp_msg_ocrp *)dat;
+       const struct pptp_msg_ocrp *ptr = (const struct pptp_msg_ocrp *)dat;
 
        ND_TCHECK(ptr->call_id);
        pptp_call_id_print(ndo, &ptr->call_id);
@@ -731,7 +730,7 @@ static void
 pptp_icrq_print(netdissect_options *ndo,
                 const u_char *dat)
 {
-       struct pptp_msg_icrq *ptr = (struct pptp_msg_icrq *)dat;
+       const struct pptp_msg_icrq *ptr = (const struct pptp_msg_icrq *)dat;
 
        ND_TCHECK(ptr->call_id);
        pptp_call_id_print(ndo, &ptr->call_id);
@@ -762,7 +761,7 @@ static void
 pptp_icrp_print(netdissect_options *ndo,
                 const u_char *dat)
 {
-       struct pptp_msg_icrp *ptr = (struct pptp_msg_icrp *)dat;
+       const struct pptp_msg_icrp *ptr = (const struct pptp_msg_icrp *)dat;
 
        ND_TCHECK(ptr->call_id);
        pptp_call_id_print(ndo, &ptr->call_id);
@@ -788,7 +787,7 @@ static void
 pptp_iccn_print(netdissect_options *ndo,
                 const u_char *dat)
 {
-       struct pptp_msg_iccn *ptr = (struct pptp_msg_iccn *)dat;
+       const struct pptp_msg_iccn *ptr = (const struct pptp_msg_iccn *)dat;
 
        ND_TCHECK(ptr->peer_call_id);
        pptp_peer_call_id_print(ndo, &ptr->peer_call_id);
@@ -812,7 +811,7 @@ static void
 pptp_ccrq_print(netdissect_options *ndo,
                 const u_char *dat)
 {
-       struct pptp_msg_ccrq *ptr = (struct pptp_msg_ccrq *)dat;
+       const struct pptp_msg_ccrq *ptr = (const struct pptp_msg_ccrq *)dat;
 
        ND_TCHECK(ptr->call_id);
        pptp_call_id_print(ndo, &ptr->call_id);
@@ -828,7 +827,7 @@ static void
 pptp_cdn_print(netdissect_options *ndo,
                const u_char *dat)
 {
-       struct pptp_msg_cdn *ptr = (struct pptp_msg_cdn *)dat;
+       const struct pptp_msg_cdn *ptr = (const struct pptp_msg_cdn *)dat;
 
        ND_TCHECK(ptr->call_id);
        pptp_call_id_print(ndo, &ptr->call_id);
@@ -852,7 +851,7 @@ static void
 pptp_wen_print(netdissect_options *ndo,
                const u_char *dat)
 {
-       struct pptp_msg_wen *ptr = (struct pptp_msg_wen *)dat;
+       const struct pptp_msg_wen *ptr = (const struct pptp_msg_wen *)dat;
 
        ND_TCHECK(ptr->peer_call_id);
        pptp_peer_call_id_print(ndo, &ptr->peer_call_id);
@@ -880,7 +879,7 @@ static void
 pptp_sli_print(netdissect_options *ndo,
                const u_char *dat)
 {
-       struct pptp_msg_sli *ptr = (struct pptp_msg_sli *)dat;
+       const struct pptp_msg_sli *ptr = (const struct pptp_msg_sli *)dat;
 
        ND_TCHECK(ptr->peer_call_id);
        pptp_peer_call_id_print(ndo, &ptr->peer_call_id);
@@ -906,7 +905,7 @@ pptp_print(netdissect_options *ndo,
 
        ND_PRINT((ndo, ": pptp"));
 
-       hdr = (struct pptp_hdr *)dat;
+       hdr = (const struct pptp_hdr *)dat;
 
        ND_TCHECK(hdr->length);
        if (ndo->ndo_vflag) {