]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-pptp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10
[tcpdump] / print-pptp.c
diff --git a/print-pptp.c b/print-pptp.c
index 685c1c0d3fd117fc614034bfa4f73a3e01b20455..8666e505bbc71ab97adda9ef22bab64e1a3ebcca 100644 (file)
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -21,33 +21,17 @@
  * PPTP support contributed by Motonori Shindo ([email protected])
  */
 
  * PPTP support contributed by Motonori Shindo ([email protected])
  */
 
+/* \summary: Point-to-Point Tunnelling Protocol (PPTP) printer */
 
 
-#ifndef lint
-static const char rcsid[] = 
-     "@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.3 2001-10-31 08:54:31 guy Exp $";
-#endif
+/* specification: RFC 2637 */
 
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include "netdissect-stdinc.h"
 
 
-#include "interface.h"
+#include "netdissect.h"
+#include "extract.h"
 
 
-static char tstr[] = " [|pptp]";
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
 
 #define PPTP_MSG_TYPE_CTRL     1       /* Control Message */
 #define PPTP_MSG_TYPE_MGMT     2       /* Management Message (currently not used */
 
 #define PPTP_MSG_TYPE_CTRL     1       /* Control Message */
 #define PPTP_MSG_TYPE_MGMT     2       /* Management Message (currently not used */
@@ -55,7 +39,7 @@ static char tstr[] = " [|pptp]";
 
 #define PPTP_CTRL_MSG_TYPE_SCCRQ       1
 #define PPTP_CTRL_MSG_TYPE_SCCRP       2
 
 #define PPTP_CTRL_MSG_TYPE_SCCRQ       1
 #define PPTP_CTRL_MSG_TYPE_SCCRP       2
-#define PPTP_CTRL_MSG_TYPE_StopCCRQ    3 
+#define PPTP_CTRL_MSG_TYPE_StopCCRQ    3
 #define PPTP_CTRL_MSG_TYPE_StopCCRP    4
 #define PPTP_CTRL_MSG_TYPE_ECHORQ      5
 #define PPTP_CTRL_MSG_TYPE_ECHORP      6
 #define PPTP_CTRL_MSG_TYPE_StopCCRP    4
 #define PPTP_CTRL_MSG_TYPE_ECHORQ      5
 #define PPTP_CTRL_MSG_TYPE_ECHORP      6
@@ -69,13 +53,13 @@ static char tstr[] = " [|pptp]";
 #define PPTP_CTRL_MSG_TYPE_WEN         14
 #define PPTP_CTRL_MSG_TYPE_SLI         15
 
 #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 */
 #define PPTP_BEARER_CAP_DIGITAL_MASK   0x00000002      /* Digital */
 
 #define PPTP_FRAMING_CAP_SYNC_MASK     0x00000002      /* Synchronous */
 
 #define PPTP_BEARER_CAP_ANALOG_MASK    0x00000001      /* Analog */
 #define PPTP_BEARER_CAP_DIGITAL_MASK   0x00000002      /* Digital */
 
-static char *pptp_message_type_string[] = {
+static const char *pptp_message_type_string[] = {
        "NOT_DEFINED",          /* 0  Not defined in the RFC2637 */
        "SCCRQ",                /* 1  Start-Control-Connection-Request */
        "SCCRP",                /* 2  Start-Control-Connection-Reply */
        "NOT_DEFINED",          /* 0  Not defined in the RFC2637 */
        "SCCRQ",                /* 1  Start-Control-Connection-Request */
        "SCCRP",                /* 2  Start-Control-Connection-Reply */
@@ -100,971 +84,786 @@ static char *pptp_message_type_string[] = {
 
 /* common for all PPTP control messages */
 struct pptp_hdr {
 
 /* common for all PPTP control messages */
 struct pptp_hdr {
-       u_int16_t length;
-       u_int16_t msg_type;
-       u_int32_t magic_cookie;
-       u_int16_t ctrl_msg_type;
-       u_int16_t reserved0;
+       nd_uint16_t length;
+       nd_uint16_t msg_type;
+       nd_uint32_t magic_cookie;
+       nd_uint16_t ctrl_msg_type;
+       nd_uint16_t reserved0;
 };
 
 struct pptp_msg_sccrq {
 };
 
 struct pptp_msg_sccrq {
-       u_int16_t proto_ver;
-       u_int16_t reserved1;
-       u_int32_t framing_cap;
-       u_int32_t bearer_cap;
-       u_int16_t max_channel;
-       u_int16_t firm_rev;
-       u_char hostname[64];
-       u_char vendor[64];
+       nd_uint16_t proto_ver;
+       nd_uint16_t reserved1;
+       nd_uint32_t framing_cap;
+       nd_uint32_t bearer_cap;
+       nd_uint16_t max_channel;
+       nd_uint16_t firm_rev;
+       nd_byte     hostname[64];
+       nd_byte     vendor[64];
 };
 
 struct pptp_msg_sccrp {
 };
 
 struct pptp_msg_sccrp {
-       u_int16_t proto_ver;
-       u_int8_t result_code;
-       u_int8_t err_code;
-       u_int32_t framing_cap;
-       u_int32_t bearer_cap;
-       u_int16_t max_channel;
-       u_int16_t firm_rev;
-       u_char hostname[64];
-       u_char vendor[64];
+       nd_uint16_t proto_ver;
+       nd_uint8_t  result_code;
+       nd_uint8_t  err_code;
+       nd_uint32_t framing_cap;
+       nd_uint32_t bearer_cap;
+       nd_uint16_t max_channel;
+       nd_uint16_t firm_rev;
+       nd_byte     hostname[64];
+       nd_byte     vendor[64];
 };
 
 struct pptp_msg_stopccrq {
 };
 
 struct pptp_msg_stopccrq {
-       u_int8_t reason;
-       u_int8_t reserved1;
-       u_int16_t reserved2;
+       nd_uint8_t  reason;
+       nd_uint8_t  reserved1;
+       nd_uint16_t reserved2;
 };
 
 struct pptp_msg_stopccrp {
 };
 
 struct pptp_msg_stopccrp {
-       u_int8_t result_code;
-       u_int8_t err_code;
-       u_int16_t reserved1;
+       nd_uint8_t  result_code;
+       nd_uint8_t  err_code;
+       nd_uint16_t reserved1;
 };
 
 struct pptp_msg_echorq {
 };
 
 struct pptp_msg_echorq {
-       u_int32_t id;
+       nd_uint32_t id;
 };
 
 struct pptp_msg_echorp {
 };
 
 struct pptp_msg_echorp {
-       u_int32_t id;
-       u_int8_t result_code;
-       u_int8_t err_code;
-       u_int16_t reserved1;
+       nd_uint32_t id;
+       nd_uint8_t  result_code;
+       nd_uint8_t  err_code;
+       nd_uint16_t reserved1;
 };
 
 struct pptp_msg_ocrq {
 };
 
 struct pptp_msg_ocrq {
-       u_int16_t call_id;
-       u_int16_t call_ser;
-       u_int32_t min_bps;
-       u_int32_t max_bps;
-       u_int32_t bearer_type;
-       u_int32_t framing_type;
-       u_int16_t recv_winsiz;
-       u_int16_t pkt_proc_delay;
-       u_int16_t phone_no_len;
-       u_int16_t reserved1;
-       u_char phone_no[64];
-       u_char subaddr[64];
+       nd_uint16_t call_id;
+       nd_uint16_t call_ser;
+       nd_uint32_t min_bps;
+       nd_uint32_t max_bps;
+       nd_uint32_t bearer_type;
+       nd_uint32_t framing_type;
+       nd_uint16_t recv_winsiz;
+       nd_uint16_t pkt_proc_delay;
+       nd_uint16_t phone_no_len;
+       nd_uint16_t reserved1;
+       nd_byte     phone_no[64];
+       nd_byte     subaddr[64];
 };
 
 struct pptp_msg_ocrp {
 };
 
 struct pptp_msg_ocrp {
-       u_int16_t call_id;
-       u_int16_t peer_call_id;
-       u_int8_t result_code;
-       u_int8_t err_code;
-       u_int16_t cause_code;
-       u_int32_t conn_speed;
-       u_int16_t recv_winsiz;
-       u_int16_t pkt_proc_delay;
-       u_int32_t phy_chan_id;
+       nd_uint16_t call_id;
+       nd_uint16_t peer_call_id;
+       nd_uint8_t  result_code;
+       nd_uint8_t  err_code;
+       nd_uint16_t cause_code;
+       nd_uint32_t conn_speed;
+       nd_uint16_t recv_winsiz;
+       nd_uint16_t pkt_proc_delay;
+       nd_uint32_t phy_chan_id;
 };
 
 struct pptp_msg_icrq {
 };
 
 struct pptp_msg_icrq {
-       u_int16_t call_id;
-       u_int16_t call_ser;
-       u_int32_t bearer_type;
-       u_int32_t phy_chan_id;
-       u_int16_t dialed_no_len;                
-       u_int16_t dialing_no_len;               
-       u_char dialed_no[64];           /* DNIS */
-       u_char dialing_no[64];          /* CLID */
-       u_char subaddr[64];
+       nd_uint16_t call_id;
+       nd_uint16_t call_ser;
+       nd_uint32_t bearer_type;
+       nd_uint32_t phy_chan_id;
+       nd_uint16_t dialed_no_len;
+       nd_uint16_t dialing_no_len;
+       nd_byte     dialed_no[64];              /* DNIS */
+       nd_byte     dialing_no[64];             /* CLID */
+       nd_byte     subaddr[64];
 };
 
 struct pptp_msg_icrp {
 };
 
 struct pptp_msg_icrp {
-       u_int16_t call_id;
-       u_int16_t peer_call_id;
-       u_int8_t result_code;
-       u_int8_t err_code;
-       u_int16_t recv_winsiz;
-       u_int16_t pkt_proc_delay;
-       u_int16_t reserved1;
+       nd_uint16_t call_id;
+       nd_uint16_t peer_call_id;
+       nd_uint8_t  result_code;
+       nd_uint8_t  err_code;
+       nd_uint16_t recv_winsiz;
+       nd_uint16_t pkt_proc_delay;
+       nd_uint16_t reserved1;
 };
 
 struct pptp_msg_iccn {
 };
 
 struct pptp_msg_iccn {
-       u_int16_t peer_call_id;
-       u_int16_t reserved1;
-       u_int32_t conn_speed;
-       u_int16_t recv_winsiz;
-       u_int16_t pkt_proc_delay;
-       u_int32_t framing_type;
+       nd_uint16_t peer_call_id;
+       nd_uint16_t reserved1;
+       nd_uint32_t conn_speed;
+       nd_uint16_t recv_winsiz;
+       nd_uint16_t pkt_proc_delay;
+       nd_uint32_t framing_type;
 };
 
 struct pptp_msg_ccrq {
 };
 
 struct pptp_msg_ccrq {
-       u_int16_t call_id;
-       u_int16_t reserved1;
+       nd_uint16_t call_id;
+       nd_uint16_t reserved1;
 };
 
 struct pptp_msg_cdn {
 };
 
 struct pptp_msg_cdn {
-       u_int16_t call_id;
-       u_int8_t result_code;
-       u_int8_t err_code;
-       u_int16_t cause_code;
-       u_int16_t reserved1;
-       u_char call_stats[128];
+       nd_uint16_t call_id;
+       nd_uint8_t  result_code;
+       nd_uint8_t  err_code;
+       nd_uint16_t cause_code;
+       nd_uint16_t reserved1;
+       nd_byte     call_stats[128];
 };
 
 struct pptp_msg_wen {
 };
 
 struct pptp_msg_wen {
-       u_int16_t peer_call_id;
-       u_int16_t reserved1;
-       u_int32_t crc_err;
-       u_int32_t framing_err;
-       u_int32_t hardware_overrun;
-       u_int32_t buffer_overrun;
-       u_int32_t timeout_err;
-       u_int32_t align_err;
+       nd_uint16_t peer_call_id;
+       nd_uint16_t reserved1;
+       nd_uint32_t crc_err;
+       nd_uint32_t framing_err;
+       nd_uint32_t hardware_overrun;
+       nd_uint32_t buffer_overrun;
+       nd_uint32_t timeout_err;
+       nd_uint32_t align_err;
 };
 
 struct pptp_msg_sli {
 };
 
 struct pptp_msg_sli {
-       u_int16_t peer_call_id;
-       u_int16_t reserved1;
-       u_int32_t send_accm;
-       u_int32_t recv_accm;
+       nd_uint16_t peer_call_id;
+       nd_uint16_t reserved1;
+       nd_uint32_t send_accm;
+       nd_uint32_t recv_accm;
 };
 
 /* attributes that appear more than once in above messages:
 
 };
 
 /* attributes that appear more than once in above messages:
 
-   Number of         
-   occurence    attributes
+   Number of
+   occurrence    attributes
   --------------------------------------
   --------------------------------------
-      2         u_int32_t bearer_cap;
-      2         u_int32_t bearer_type;
-      6         u_int16_t call_id;
-      2         u_int16_t call_ser;
-      2         u_int16_t cause_code;
-      2         u_int32_t conn_speed;
-      6         u_int8_t err_code;
-      2         u_int16_t firm_rev;
-      2         u_int32_t framing_cap;
-      2         u_int32_t framing_type;
+      2         uint32_t bearer_cap;
+      2         uint32_t bearer_type;
+      6         uint16_t call_id;
+      2         uint16_t call_ser;
+      2         uint16_t cause_code;
+      2         uint32_t conn_speed;
+      6         uint8_t err_code;
+      2         uint16_t firm_rev;
+      2         uint32_t framing_cap;
+      2         uint32_t framing_type;
       2         u_char hostname[64];
       2         u_char hostname[64];
-      2         u_int32_t id;
-      2         u_int16_t max_channel;
-      5         u_int16_t peer_call_id;
-      2         u_int32_t phy_chan_id;
-      4         u_int16_t pkt_proc_delay;
-      2         u_int16_t proto_ver;
-      4         u_int16_t recv_winsiz;
-      2         u_int8_t reserved1;
-      9         u_int16_t reserved1;
-      6         u_int8_t result_code;
+      2         uint32_t id;
+      2         uint16_t max_channel;
+      5         uint16_t peer_call_id;
+      2         uint32_t phy_chan_id;
+      4         uint16_t pkt_proc_delay;
+      2         uint16_t proto_ver;
+      4         uint16_t recv_winsiz;
+      2         uint8_t reserved1;
+      9         uint16_t reserved1;
+      6         uint8_t result_code;
       2         u_char subaddr[64];
       2         u_char vendor[64];
 
       2         u_char subaddr[64];
       2         u_char vendor[64];
 
-  so I will prepare print out functions for these attributes (except for 
+  so I will prepare print out functions for these attributes (except for
   reserved*).
 */
 
   reserved*).
 */
 
+#define PRINT_RESERVED_IF_NOT_ZERO_1(reserved) \
+        if (GET_U_1(reserved)) \
+               ND_PRINT(" [ERROR: reserved=%u must be zero]", \
+                        GET_U_1(reserved));
+
+#define PRINT_RESERVED_IF_NOT_ZERO_2(reserved) \
+        if (GET_BE_U_2(reserved)) \
+               ND_PRINT(" [ERROR: reserved=%u must be zero]", \
+                        GET_BE_U_2(reserved));
+
 /******************************************/
 /* Attribute-specific print out functions */
 /******************************************/
 
 /******************************************/
 /* Attribute-specific print out functions */
 /******************************************/
 
-/* In these attribute-specific print-out functions, it't not necessary
-   to do TCHECK because they are already checked in the caller of
-   these functions. */
-
 static void
 static void
-pptp_bearer_cap_print(const u_int32_t *bearer_cap)
+pptp_bearer_cap_print(netdissect_options *ndo,
+                      const nd_uint32_t bearer_cap)
 {
 {
-       printf(" BEARER_CAP(");
-       if (ntohl(*bearer_cap) & PPTP_BEARER_CAP_DIGITAL_MASK) {
-                printf("D");
-        }
-        if (ntohl(*bearer_cap) & PPTP_BEARER_CAP_ANALOG_MASK) {
-                printf("A");
-        }
-       printf(")");
+       ND_PRINT(" BEARER_CAP(%s%s)",
+                 GET_BE_U_4(bearer_cap) & PPTP_BEARER_CAP_DIGITAL_MASK ? "D" : "",
+                 GET_BE_U_4(bearer_cap) & PPTP_BEARER_CAP_ANALOG_MASK ? "A" : "");
 }
 
 }
 
+static const struct tok pptp_btype_str[] = {
+       { 1, "A"   }, /* Analog */
+       { 2, "D"   }, /* Digital */
+       { 3, "Any" },
+       { 0, NULL }
+};
+
 static void
 static void
-pptp_bearer_type_print(const u_int32_t *bearer_type)
+pptp_bearer_type_print(netdissect_options *ndo,
+                       const nd_uint32_t bearer_type)
 {
 {
-       printf(" BEARER_TYPE(");
-       switch (ntohl(*bearer_type)) {
-       case 1:
-               printf("A");    /* Analog */
-               break;
-       case 2:
-               printf("D");    /* Digital */
-               break;
-       case 3: 
-               printf("Any");
-               break;
-       default:
-               printf("?");
-               break;
-        }
-       printf(")");
+       ND_PRINT(" BEARER_TYPE(%s)",
+                 tok2str(pptp_btype_str, "?", GET_BE_U_4(bearer_type)));
 }
 
 static void
 }
 
 static void
-pptp_call_id_print(const u_int16_t *call_id)
+pptp_call_id_print(netdissect_options *ndo,
+                   const nd_uint16_t call_id)
 {
 {
-       printf(" CALL_ID(%u)", ntohs(*call_id));
+       ND_PRINT(" CALL_ID(%u)", GET_BE_U_2(call_id));
 }
 
 static void
 }
 
 static void
-pptp_call_ser_print(const u_int16_t *call_ser)
+pptp_call_ser_print(netdissect_options *ndo,
+                    const nd_uint16_t call_ser)
 {
 {
-       printf(" CALL_SER_NUM(%u)", ntohs(*call_ser));
+       ND_PRINT(" CALL_SER_NUM(%u)", GET_BE_U_2(call_ser));
 }
 
 static void
 }
 
 static void
-pptp_cause_code_print(const u_int16_t *cause_code)
+pptp_cause_code_print(netdissect_options *ndo,
+                      const nd_uint16_t cause_code)
 {
 {
-       printf(" CAUSE_CODE(%u)", ntohs(*cause_code));
+       ND_PRINT(" CAUSE_CODE(%u)", GET_BE_U_2(cause_code));
 }
 
 static void
 }
 
 static void
-pptp_conn_speed_print(const u_int32_t *conn_speed)
+pptp_conn_speed_print(netdissect_options *ndo,
+                      const nd_uint32_t conn_speed)
 {
 {
-       printf(" CONN_SPEED(%lu)", (unsigned long)ntohl(*conn_speed));
+       ND_PRINT(" CONN_SPEED(%u)", GET_BE_U_4(conn_speed));
 }
 
 }
 
+static const struct tok pptp_errcode_str[] = {
+       { 0, "None"          },
+       { 1, "Not-Connected" },
+       { 2, "Bad-Format"    },
+       { 3, "Bad-Value"     },
+       { 4, "No-Resource"   },
+       { 5, "Bad-Call-ID"   },
+       { 6, "PAC-Error"     },
+       { 0, NULL }
+};
+
 static void
 static void
-pptp_err_code_print(const u_int8_t *err_code)
+pptp_err_code_print(netdissect_options *ndo,
+                    const nd_uint8_t err_code)
 {
 {
-       printf(" ERR_CODE(%u", *err_code);
-       if (vflag) {
-               switch (*err_code) {
-               case 0:
-                       printf(":None");
-                       break;
-               case 1:
-                       printf(":Not-Connected");
-                       break;
-               case 2:
-                       printf(":Bad-Format");
-                       break;
-               case 3:
-                       printf(":Bad-Valude");
-                       break;
-               case 4:
-                       printf(":No-Resource");
-                       break;
-               case 5:
-                       printf(":Bad-Call-ID");
-                       break;
-               case 6:
-                       printf(":PAC-Error");
-                       break;
-               default:
-                       printf(":?");
-                       break;
-               }
+       ND_PRINT(" ERR_CODE(%u", GET_U_1(err_code));
+       if (ndo->ndo_vflag) {
+               ND_PRINT(":%s",
+                        tok2str(pptp_errcode_str, "?", GET_U_1(err_code)));
        }
        }
-       printf(")");
+       ND_PRINT(")");
 }
 
 static void
 }
 
 static void
-pptp_firm_rev_print(const u_int16_t *firm_rev)
+pptp_firm_rev_print(netdissect_options *ndo,
+                    const nd_uint16_t firm_rev)
 {
 {
-       printf(" FIRM_REV(%u)", ntohs(*firm_rev));
+       ND_PRINT(" FIRM_REV(%u)", GET_BE_U_2(firm_rev));
 }
 
 static void
 }
 
 static void
-pptp_framing_cap_print(const u_int32_t *framing_cap)
+pptp_framing_cap_print(netdissect_options *ndo,
+                       const nd_uint32_t framing_cap)
 {
 {
-       printf(" FRAME_CAP(");
-       if (ntohl(*framing_cap) & PPTP_FRAMING_CAP_ASYNC_MASK) {
-                printf("A");           /* Async */
+       ND_PRINT(" FRAME_CAP(");
+       if (GET_BE_U_4(framing_cap) & PPTP_FRAMING_CAP_ASYNC_MASK) {
+                ND_PRINT("A");         /* Async */
         }
         }
-        if (ntohl(*framing_cap) & PPTP_FRAMING_CAP_SYNC_MASK) {
-                printf("S");           /* Sync */
+        if (GET_BE_U_4(framing_cap) & PPTP_FRAMING_CAP_SYNC_MASK) {
+                ND_PRINT("S");         /* Sync */
         }
         }
-       printf(")");
+       ND_PRINT(")");
 }
 
 }
 
+static const struct tok pptp_ftype_str[] = {
+       { 1, "A" }, /* Async */
+       { 2, "S" }, /* Sync */
+       { 3, "E" }, /* Either */
+       { 0, NULL }
+};
+
 static void
 static void
-pptp_framing_type_print(const u_int32_t *framing_type)
+pptp_framing_type_print(netdissect_options *ndo,
+                        const nd_uint32_t framing_type)
 {
 {
-       printf(" FRAME_TYPE(");
-       switch (ntohl(*framing_type)) {
-       case 1:
-               printf("A");            /* Async */
-               break;
-       case 2:
-               printf("S");            /* Sync */
-               break;
-       case 3:
-               printf("E");            /* Either */
-               break;
-       default:
-               printf("?");
-               break;
-       }
-       printf(")");
+       ND_PRINT(" FRAME_TYPE(%s)",
+                 tok2str(pptp_ftype_str, "?", GET_BE_U_4(framing_type)));
 }
 
 static void
 }
 
 static void
-pptp_hostname_print(const u_char *hostname)
+pptp_hostname_print(netdissect_options *ndo,
+                    const u_char *hostname)
 {
 {
-       printf(" HOSTNAME(%.64s)", hostname);
+       ND_PRINT(" HOSTNAME(");
+       nd_printjnp(ndo, hostname, 64);
+       ND_PRINT(")");
 }
 
 static void
 }
 
 static void
-pptp_id_print(const u_int32_t *id)
+pptp_id_print(netdissect_options *ndo,
+              const nd_uint32_t id)
 {
 {
-       printf(" ID(%lu)", (unsigned long)ntohl(*id));
+       ND_PRINT(" ID(%u)", GET_BE_U_4(id));
 }
 
 static void
 }
 
 static void
-pptp_max_channel_print(const u_int16_t *max_channel)
+pptp_max_channel_print(netdissect_options *ndo,
+                       const nd_uint16_t max_channel)
 {
 {
-       printf(" MAX_CHAN(%u)", ntohs(*max_channel));
+       ND_PRINT(" MAX_CHAN(%u)", GET_BE_U_2(max_channel));
 }
 
 static void
 }
 
 static void
-pptp_peer_call_id_print(const u_int16_t *peer_call_id)
+pptp_peer_call_id_print(netdissect_options *ndo,
+                        const nd_uint16_t peer_call_id)
 {
 {
-       printf(" PEER_CALL_ID(%u)", ntohs(*peer_call_id));
+       ND_PRINT(" PEER_CALL_ID(%u)", GET_BE_U_2(peer_call_id));
 }
 
 static void
 }
 
 static void
-pptp_phy_chan_id_print(const u_int32_t *phy_chan_id)
+pptp_phy_chan_id_print(netdissect_options *ndo,
+                       const nd_uint32_t phy_chan_id)
 {
 {
-       printf(" PHY_CHAN_ID(%lu)", (unsigned long)ntohl(*phy_chan_id));
+       ND_PRINT(" PHY_CHAN_ID(%u)", GET_BE_U_4(phy_chan_id));
 }
 
 static void
 }
 
 static void
-pptp_pkt_proc_delay_print(const u_int16_t *pkt_proc_delay)
+pptp_pkt_proc_delay_print(netdissect_options *ndo,
+                          const nd_uint16_t pkt_proc_delay)
 {
 {
-       printf(" PROC_DELAY(%u)", ntohs(*pkt_proc_delay));
+       ND_PRINT(" PROC_DELAY(%u)", GET_BE_U_2(pkt_proc_delay));
 }
 
 static void
 }
 
 static void
-pptp_proto_ver_print(const u_int16_t *proto_ver)
+pptp_proto_ver_print(netdissect_options *ndo,
+                     const nd_uint16_t proto_ver)
 {
 {
-       printf(" PROTO_VER(%u.%u)",     /* Version.Revision */
-              ntohs(*proto_ver) >> 8, ntohs(*proto_ver) & 0xff);
+       ND_PRINT(" PROTO_VER(%u.%u)",   /* Version.Revision */
+              GET_BE_U_2(proto_ver) >> 8,
+              GET_BE_U_2(proto_ver) & 0xff);
 }
 
 static void
 }
 
 static void
-pptp_recv_winsiz_print(const u_int16_t *recv_winsiz)
+pptp_recv_winsiz_print(netdissect_options *ndo,
+                       const nd_uint16_t recv_winsiz)
 {
 {
-       printf(" RECV_WIN(%u)", ntohs(*recv_winsiz));
+       ND_PRINT(" RECV_WIN(%u)", GET_BE_U_2(recv_winsiz));
 }
 
 }
 
+static const struct tok pptp_scrrp_str[] = {
+       { 1, "Successful channel establishment"                           },
+       { 2, "General error"                                              },
+       { 3, "Command channel already exists"                             },
+       { 4, "Requester is not authorized to establish a command channel" },
+       { 5, "The protocol version of the requester is not supported"     },
+       { 0, NULL }
+};
+
+static const struct tok pptp_echorp_str[] = {
+       { 1, "OK" },
+       { 2, "General Error" },
+       { 0, NULL }
+};
+
+static const struct tok pptp_ocrp_str[] = {
+       { 1, "Connected"     },
+       { 2, "General Error" },
+       { 3, "No Carrier"    },
+       { 4, "Busy"          },
+       { 5, "No Dial Tone"  },
+       { 6, "Time-out"      },
+       { 7, "Do Not Accept" },
+       { 0, NULL }
+};
+
+static const struct tok pptp_icrp_str[] = {
+       { 1, "Connect"       },
+       { 2, "General Error" },
+       { 3, "Do Not Accept" },
+       { 0, NULL }
+};
+
+static const struct tok pptp_cdn_str[] = {
+       { 1, "Lost Carrier"   },
+       { 2, "General Error"  },
+       { 3, "Admin Shutdown" },
+       { 4, "Request"        },
+       { 0, NULL }
+};
+
 static void
 static void
-pptp_result_code_print(const u_int8_t *result_code, int ctrl_msg_type)
-{
-       printf(" RESULT_CODE(%u", *result_code);
-       if (vflag) {
-               switch (ctrl_msg_type) {
-               case PPTP_CTRL_MSG_TYPE_SCCRP:
-                       switch (*result_code) {
-                       case 1:
-                               printf(":Successful channel establishment");
-                               break;
-                       case 2:
-                               printf(":General error");
-                               break;
-                       case 3:
-                               printf(":Command channel already exists");
-                               break;
-                       case 4:
-                               printf(":Requester is not authorized to establish a command channel");
-                               break;
-                       case 5:
-                               printf(":The protocol version of the requester is not supported");
-                               break;
-                       default:
-                               printf(":?");
-                               break;
-                       }
-                       break;
-               case PPTP_CTRL_MSG_TYPE_StopCCRP:
-               case PPTP_CTRL_MSG_TYPE_ECHORP:
-                       switch (*result_code) {
-                       case 1:
-                               printf(":OK");
-                               break;
-                       case 2:
-                               printf(":General Error");
-                               break;
-                       default:
-                               printf(":?");
-                               break;
-                       }
-                       break;
-               case PPTP_CTRL_MSG_TYPE_OCRP:
-                       switch (*result_code) {
-                       case 1:
-                               printf(":Connected");
-                               break;
-                       case 2:
-                               printf(":General Error");
-                               break;
-                       case 3:
-                               printf(":No Carrier");
-                               break;
-                       case 4:
-                               printf(":Busy");
-                               break;
-                       case 5:
-                               printf(":No Dial Tone");
-                               break;
-                       case 6:
-                               printf(":Time-out");
-                               break;
-                       case 7:
-                               printf(":Do Not Accept");
-                               break;
-                       default:
-                               printf(":?");
-                               break;
-                       }
-                       break;
-               case PPTP_CTRL_MSG_TYPE_ICRP:
-                       switch (*result_code) {
-                       case 1:
-                               printf(":Connect");
-                               break;
-                       case 2:
-                               printf(":General Error");
-                               break;
-                       case 3:
-                               printf(":Do Not Accept");
-                               break;
-                       default:
-                               printf(":?");
-                               break;
-                       }
-                       break;
-               case PPTP_CTRL_MSG_TYPE_CDN:
-                       switch (*result_code) {
-                       case 1:
-                               printf(":Lost Carrier");
-                               break;
-                       case 2:
-                               printf(":General Error");
-                               break;
-                       case 3:
-                               printf(":Admin Shutdown");
-                               break;
-                       case 4:
-                               printf(":Request");
-                       default:
-                               printf(":?");
-                               break;
-                       break;
-                       }
-               default:
-                       /* assertion error */
-                       break;
-               }
+pptp_result_code_print(netdissect_options *ndo,
+                       const nd_uint8_t result_code, int ctrl_msg_type)
+{
+       ND_PRINT(" RESULT_CODE(%u", GET_U_1(result_code));
+       if (ndo->ndo_vflag) {
+               const struct tok *dict =
+                       ctrl_msg_type == PPTP_CTRL_MSG_TYPE_SCCRP    ? pptp_scrrp_str :
+                       ctrl_msg_type == PPTP_CTRL_MSG_TYPE_StopCCRP ? pptp_echorp_str :
+                       ctrl_msg_type == PPTP_CTRL_MSG_TYPE_ECHORP   ? pptp_echorp_str :
+                       ctrl_msg_type == PPTP_CTRL_MSG_TYPE_OCRP     ? pptp_ocrp_str :
+                       ctrl_msg_type == PPTP_CTRL_MSG_TYPE_ICRP     ? pptp_icrp_str :
+                       ctrl_msg_type == PPTP_CTRL_MSG_TYPE_CDN      ? pptp_cdn_str :
+                       NULL; /* assertion error */
+               if (dict != NULL)
+                       ND_PRINT(":%s",
+                                tok2str(dict, "?", GET_U_1(result_code)));
        }
        }
-       printf(")");
+       ND_PRINT(")");
 }
 
 static void
 }
 
 static void
-pptp_subaddr_print(const u_char *subaddr)
+pptp_subaddr_print(netdissect_options *ndo,
+                   const u_char *subaddr)
 {
 {
-       printf(" SUB_ADDR(%.64s)", subaddr);
+       ND_PRINT(" SUB_ADDR(");
+       nd_printjnp(ndo, subaddr, 64);
+       ND_PRINT(")");
 }
 
 static void
 }
 
 static void
-pptp_vendor_print(const u_char *vendor)
+pptp_vendor_print(netdissect_options *ndo,
+                  const u_char *vendor)
 {
 {
-       printf(" VENDOR(%.64s)", vendor);
+       ND_PRINT(" VENDOR(");
+       nd_printjnp(ndo, vendor, 64);
+       ND_PRINT(")");
 }
 
 /************************************/
 /* PPTP message print out functions */
 /************************************/
 static void
 }
 
 /************************************/
 /* PPTP message print out functions */
 /************************************/
 static void
-pptp_sccrq_print(const u_char *dat)
+pptp_sccrq_print(netdissect_options *ndo,
+                 const u_char *dat)
 {
 {
-       struct pptp_msg_sccrq *ptr = (struct pptp_msg_sccrq *)dat;
-
-       TCHECK(ptr->proto_ver);
-       pptp_proto_ver_print(&ptr->proto_ver);
-       TCHECK(ptr->reserved1);
-       TCHECK(ptr->framing_cap);
-       pptp_framing_cap_print(&ptr->framing_cap);
-       TCHECK(ptr->bearer_cap);
-       pptp_bearer_cap_print(&ptr->bearer_cap);
-       TCHECK(ptr->max_channel);
-       pptp_max_channel_print(&ptr->max_channel);
-       TCHECK(ptr->firm_rev);
-       pptp_firm_rev_print(&ptr->firm_rev);
-       TCHECK(ptr->hostname);
-       pptp_hostname_print(&ptr->hostname[0]);
-       TCHECK(ptr->vendor);
-       pptp_vendor_print(&ptr->vendor[0]);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_sccrq *ptr = (const struct pptp_msg_sccrq *)dat;
+
+       pptp_proto_ver_print(ndo, ptr->proto_ver);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
+       pptp_framing_cap_print(ndo, ptr->framing_cap);
+       pptp_bearer_cap_print(ndo, ptr->bearer_cap);
+       pptp_max_channel_print(ndo, ptr->max_channel);
+       pptp_firm_rev_print(ndo, ptr->firm_rev);
+       pptp_hostname_print(ndo, ptr->hostname);
+       pptp_vendor_print(ndo, ptr->vendor);
 }
 
 static void
 }
 
 static void
-pptp_sccrp_print(const u_char *dat)
+pptp_sccrp_print(netdissect_options *ndo,
+                 const u_char *dat)
 {
 {
-       struct pptp_msg_sccrp *ptr = (struct pptp_msg_sccrp *)dat;
-
-       TCHECK(ptr->proto_ver);
-       pptp_proto_ver_print(&ptr->proto_ver);
-       TCHECK(ptr->result_code);
-       pptp_result_code_print(&ptr->result_code, PPTP_CTRL_MSG_TYPE_SCCRP);
-       TCHECK(ptr->err_code);
-       pptp_err_code_print(&ptr->err_code);
-       TCHECK(ptr->framing_cap);
-       pptp_framing_cap_print(&ptr->framing_cap);
-       TCHECK(ptr->bearer_cap);
-       pptp_bearer_cap_print(&ptr->bearer_cap);
-       TCHECK(ptr->max_channel);
-       pptp_max_channel_print(&ptr->max_channel);
-       TCHECK(ptr->firm_rev);
-       pptp_firm_rev_print(&ptr->firm_rev);
-       TCHECK(ptr->hostname);
-       pptp_hostname_print(&ptr->hostname[0]);
-       TCHECK(ptr->vendor);
-       pptp_vendor_print(&ptr->vendor[0]);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_sccrp *ptr = (const struct pptp_msg_sccrp *)dat;
+
+       pptp_proto_ver_print(ndo, ptr->proto_ver);
+       pptp_result_code_print(ndo, ptr->result_code, PPTP_CTRL_MSG_TYPE_SCCRP);
+       pptp_err_code_print(ndo, ptr->err_code);
+       pptp_framing_cap_print(ndo, ptr->framing_cap);
+       pptp_bearer_cap_print(ndo, ptr->bearer_cap);
+       pptp_max_channel_print(ndo, ptr->max_channel);
+       pptp_firm_rev_print(ndo, ptr->firm_rev);
+       pptp_hostname_print(ndo, ptr->hostname);
+       pptp_vendor_print(ndo, ptr->vendor);
 }
 
 static void
 }
 
 static void
-pptp_stopccrq_print(const u_char *dat)
+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;
 
 
-       TCHECK(ptr->reason);
-       printf(" REASON(%u", ptr->reason);
-       if (vflag) {
-               switch (ptr->reason) {
+       ND_PRINT(" REASON(%u", GET_U_1(ptr->reason));
+       if (ndo->ndo_vflag) {
+               switch (GET_U_1(ptr->reason)) {
                case 1:
                case 1:
-                       printf(":None");
+                       ND_PRINT(":None");
                        break;
                case 2:
                        break;
                case 2:
-                       printf(":Stop-Protocol");
+                       ND_PRINT(":Stop-Protocol");
                        break;
                case 3:
                        break;
                case 3:
-                       printf(":Stop-Local-Shutdown");
+                       ND_PRINT(":Stop-Local-Shutdown");
                        break;
                default:
                        break;
                default:
-                       printf(":?");
+                       ND_PRINT(":?");
                        break;
                }
        }
                        break;
                }
        }
-       printf(")");
-       TCHECK(ptr->reserved1);
-       TCHECK(ptr->reserved2);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       ND_PRINT(")");
+       PRINT_RESERVED_IF_NOT_ZERO_1(ptr->reserved1);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved2);
 }
 
 static void
 }
 
 static void
-pptp_stopccrp_print(const u_char *dat)
+pptp_stopccrp_print(netdissect_options *ndo,
+                    const u_char *dat)
 {
 {
-       struct pptp_msg_stopccrp *ptr = (struct pptp_msg_stopccrp *)dat;
-
-       TCHECK(ptr->result_code);
-       pptp_result_code_print(&ptr->result_code, PPTP_CTRL_MSG_TYPE_StopCCRP);
-       TCHECK(ptr->err_code);
-       pptp_err_code_print(&ptr->err_code);
-       TCHECK(ptr->reserved1);
-
-       return;
+       const struct pptp_msg_stopccrp *ptr = (const struct pptp_msg_stopccrp *)dat;
 
 
-trunc:
-       printf("%s", tstr);
+       pptp_result_code_print(ndo, ptr->result_code, PPTP_CTRL_MSG_TYPE_StopCCRP);
+       pptp_err_code_print(ndo, ptr->err_code);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
 }
 
 static void
 }
 
 static void
-pptp_echorq_print(const u_char *dat)
+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;
 
 
-       TCHECK(ptr->id);
-       pptp_id_print(&ptr->id);
-       
-       return;
-
-trunc:
-       printf("%s", tstr);
+       pptp_id_print(ndo, ptr->id);
 }
 
 static void
 }
 
 static void
-pptp_echorp_print(const u_char *dat)
+pptp_echorp_print(netdissect_options *ndo,
+                  const u_char *dat)
 {
 {
-       struct pptp_msg_echorp *ptr = (struct pptp_msg_echorp *)dat;
-
-       TCHECK(ptr->id);
-       pptp_id_print(&ptr->id);
-       TCHECK(ptr->result_code);
-       pptp_result_code_print(&ptr->result_code, PPTP_CTRL_MSG_TYPE_ECHORP);
-       TCHECK(ptr->err_code);
-       pptp_err_code_print(&ptr->err_code);
-       TCHECK(ptr->reserved1);
-       
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_echorp *ptr = (const struct pptp_msg_echorp *)dat;
+
+       pptp_id_print(ndo, ptr->id);
+       pptp_result_code_print(ndo, ptr->result_code, PPTP_CTRL_MSG_TYPE_ECHORP);
+       pptp_err_code_print(ndo, ptr->err_code);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
 }
 
 static void
 }
 
 static void
-pptp_ocrq_print(const u_char *dat)
+pptp_ocrq_print(netdissect_options *ndo,
+                const u_char *dat)
 {
 {
-       struct pptp_msg_ocrq *ptr = (struct pptp_msg_ocrq *)dat;
-
-       TCHECK(ptr->call_id);
-       pptp_call_id_print(&ptr->call_id);
-       TCHECK(ptr->call_ser);
-       pptp_call_ser_print(&ptr->call_ser);
-       TCHECK(ptr->min_bps);
-       printf(" MIN_BPS(%lu)", (unsigned long)ntohl(ptr->min_bps));
-       TCHECK(ptr->max_bps);
-       printf(" MAX_BPS(%lu)", (unsigned long)ntohl(ptr->max_bps));
-       TCHECK(ptr->bearer_type);
-       pptp_bearer_type_print(&ptr->bearer_type);
-       TCHECK(ptr->framing_type);
-       pptp_framing_type_print(&ptr->framing_type);
-       TCHECK(ptr->recv_winsiz);
-       pptp_recv_winsiz_print(&ptr->recv_winsiz);
-       TCHECK(ptr->pkt_proc_delay);
-       pptp_pkt_proc_delay_print(&ptr->pkt_proc_delay);
-       TCHECK(ptr->phone_no_len);
-       printf(" PHONE_NO_LEN(%u)", ntohs(ptr->phone_no_len));
-       TCHECK(ptr->reserved1);
-       TCHECK(ptr->phone_no);
-       printf(" PHONE_NO(%.64s)", ptr->phone_no);
-       TCHECK(ptr->subaddr);
-       pptp_subaddr_print(&ptr->subaddr[0]);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_ocrq *ptr = (const struct pptp_msg_ocrq *)dat;
+
+       pptp_call_id_print(ndo, ptr->call_id);
+       pptp_call_ser_print(ndo, ptr->call_ser);
+       ND_PRINT(" MIN_BPS(%u)", GET_BE_U_4(ptr->min_bps));
+       ND_PRINT(" MAX_BPS(%u)", GET_BE_U_4(ptr->max_bps));
+       pptp_bearer_type_print(ndo, ptr->bearer_type);
+       pptp_framing_type_print(ndo, ptr->framing_type);
+       pptp_recv_winsiz_print(ndo, ptr->recv_winsiz);
+       pptp_pkt_proc_delay_print(ndo, ptr->pkt_proc_delay);
+       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_printjnp(ndo, ptr->phone_no,
+                   ND_MIN(64, GET_BE_U_2(ptr->phone_no_len)));
+       ND_PRINT(")");
+       pptp_subaddr_print(ndo, ptr->subaddr);
 }
 
 static void
 }
 
 static void
-pptp_ocrp_print(const u_char *dat)
+pptp_ocrp_print(netdissect_options *ndo,
+                const u_char *dat)
 {
 {
-       struct pptp_msg_ocrp *ptr = (struct pptp_msg_ocrp *)dat;
-
-       TCHECK(ptr->call_id);
-       pptp_call_id_print(&ptr->call_id);
-       TCHECK(ptr->peer_call_id);
-       pptp_peer_call_id_print(&ptr->peer_call_id);
-       TCHECK(ptr->result_code);
-       pptp_result_code_print(&ptr->result_code, PPTP_CTRL_MSG_TYPE_OCRP);
-       TCHECK(ptr->err_code);
-       pptp_err_code_print(&ptr->err_code);
-       TCHECK(ptr->cause_code);
-       pptp_cause_code_print(&ptr->cause_code);
-       TCHECK(ptr->conn_speed);
-       pptp_conn_speed_print(&ptr->conn_speed);
-       TCHECK(ptr->recv_winsiz);
-       pptp_recv_winsiz_print(&ptr->recv_winsiz);
-       TCHECK(ptr->pkt_proc_delay);
-       pptp_pkt_proc_delay_print(&ptr->pkt_proc_delay);
-       TCHECK(ptr->phy_chan_id);
-       pptp_phy_chan_id_print(&ptr->phy_chan_id);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_ocrp *ptr = (const struct pptp_msg_ocrp *)dat;
+
+       pptp_call_id_print(ndo, ptr->call_id);
+       pptp_peer_call_id_print(ndo, ptr->peer_call_id);
+       pptp_result_code_print(ndo, ptr->result_code, PPTP_CTRL_MSG_TYPE_OCRP);
+       pptp_err_code_print(ndo, ptr->err_code);
+       pptp_cause_code_print(ndo, ptr->cause_code);
+       pptp_conn_speed_print(ndo, ptr->conn_speed);
+       pptp_recv_winsiz_print(ndo, ptr->recv_winsiz);
+       pptp_pkt_proc_delay_print(ndo, ptr->pkt_proc_delay);
+       pptp_phy_chan_id_print(ndo, ptr->phy_chan_id);
 }
 
 static void
 }
 
 static void
-pptp_icrq_print(const u_char *dat)
+pptp_icrq_print(netdissect_options *ndo,
+                const u_char *dat)
 {
 {
-       struct pptp_msg_icrq *ptr = (struct pptp_msg_icrq *)dat;
-
-       TCHECK(ptr->call_id);
-       pptp_call_id_print(&ptr->call_id);
-       TCHECK(ptr->call_ser);
-       pptp_call_ser_print(&ptr->call_ser);
-       TCHECK(ptr->bearer_type);
-       pptp_bearer_type_print(&ptr->bearer_type);
-       TCHECK(ptr->phy_chan_id);
-       pptp_phy_chan_id_print(&ptr->phy_chan_id);
-       TCHECK(ptr->dialed_no_len);
-       printf(" DIALED_NO_LEN(%u)", ntohs(ptr->dialed_no_len));
-       TCHECK(ptr->dialing_no_len);
-       printf(" DIALING_NO_LEN(%u)", ntohs(ptr->dialing_no_len));
-       TCHECK(ptr->dialed_no);
-       printf(" DIALED_NO(%.64s)", ptr->dialed_no);
-       TCHECK(ptr->dialing_no);
-       printf(" DIALING_NO(%.64s)", ptr->dialing_no);
-       TCHECK(ptr->subaddr);
-       pptp_subaddr_print(&ptr->subaddr[0]);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_icrq *ptr = (const struct pptp_msg_icrq *)dat;
+
+       pptp_call_id_print(ndo, ptr->call_id);
+       pptp_call_ser_print(ndo, ptr->call_ser);
+       pptp_bearer_type_print(ndo, ptr->bearer_type);
+       pptp_phy_chan_id_print(ndo, ptr->phy_chan_id);
+       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_printjnp(ndo, ptr->dialed_no,
+                   ND_MIN(64, GET_BE_U_2(ptr->dialed_no_len)));
+       ND_PRINT(")");
+       ND_PRINT(" DIALING_NO(");
+       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);
 }
 
 static void
 }
 
 static void
-pptp_icrp_print(const u_char *dat)
+pptp_icrp_print(netdissect_options *ndo,
+                const u_char *dat)
 {
 {
-       struct pptp_msg_icrp *ptr = (struct pptp_msg_icrp *)dat;
-       
-       TCHECK(ptr->call_id);
-       pptp_call_id_print(&ptr->call_id);
-       TCHECK(ptr->peer_call_id);
-       pptp_peer_call_id_print(&ptr->peer_call_id);
-       TCHECK(ptr->result_code);
-       pptp_result_code_print(&ptr->result_code, PPTP_CTRL_MSG_TYPE_ICRP);
-       TCHECK(ptr->err_code);
-       pptp_err_code_print(&ptr->err_code);
-       TCHECK(ptr->recv_winsiz);
-       pptp_recv_winsiz_print(&ptr->recv_winsiz);
-       TCHECK(ptr->pkt_proc_delay);
-       pptp_pkt_proc_delay_print(&ptr->pkt_proc_delay);
-       TCHECK(ptr->reserved1);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_icrp *ptr = (const struct pptp_msg_icrp *)dat;
+
+       pptp_call_id_print(ndo, ptr->call_id);
+       pptp_peer_call_id_print(ndo, ptr->peer_call_id);
+       pptp_result_code_print(ndo, ptr->result_code, PPTP_CTRL_MSG_TYPE_ICRP);
+       pptp_err_code_print(ndo, ptr->err_code);
+       pptp_recv_winsiz_print(ndo, ptr->recv_winsiz);
+       pptp_pkt_proc_delay_print(ndo, ptr->pkt_proc_delay);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
 }
 
 static void
 }
 
 static void
-pptp_iccn_print(const u_char *dat)
+pptp_iccn_print(netdissect_options *ndo,
+                const u_char *dat)
 {
 {
-       struct pptp_msg_iccn *ptr = (struct pptp_msg_iccn *)dat;
-
-       TCHECK(ptr->peer_call_id);
-       pptp_peer_call_id_print(&ptr->peer_call_id);
-       TCHECK(ptr->reserved1);
-       TCHECK(ptr->conn_speed);
-       pptp_conn_speed_print(&ptr->conn_speed);
-       TCHECK(ptr->recv_winsiz);
-       pptp_recv_winsiz_print(&ptr->recv_winsiz);
-       TCHECK(ptr->pkt_proc_delay);
-       pptp_pkt_proc_delay_print(&ptr->pkt_proc_delay);
-       TCHECK(ptr->framing_type);
-       pptp_framing_type_print(&ptr->framing_type);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_iccn *ptr = (const struct pptp_msg_iccn *)dat;
+
+       pptp_peer_call_id_print(ndo, ptr->peer_call_id);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
+       pptp_conn_speed_print(ndo, ptr->conn_speed);
+       pptp_recv_winsiz_print(ndo, ptr->recv_winsiz);
+       pptp_pkt_proc_delay_print(ndo, ptr->pkt_proc_delay);
+       pptp_framing_type_print(ndo, ptr->framing_type);
 }
 
 static void
 }
 
 static void
-pptp_ccrq_print(const u_char *dat)
+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;
 
 
-       TCHECK(ptr->call_id);
-       pptp_call_id_print(&ptr->call_id);
-       TCHECK(ptr->reserved1);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       pptp_call_id_print(ndo, ptr->call_id);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
 }
 
 static void
 }
 
 static void
-pptp_cdn_print(const u_char *dat)
+pptp_cdn_print(netdissect_options *ndo,
+               const u_char *dat)
 {
 {
-       struct pptp_msg_cdn *ptr = (struct pptp_msg_cdn *)dat;
-
-       TCHECK(ptr->call_id);
-       pptp_call_id_print(&ptr->call_id);
-       TCHECK(ptr->result_code);
-       pptp_result_code_print(&ptr->result_code, PPTP_CTRL_MSG_TYPE_CDN);
-       TCHECK(ptr->err_code);
-       pptp_err_code_print(&ptr->err_code);
-       TCHECK(ptr->cause_code);
-       pptp_cause_code_print(&ptr->cause_code);
-       TCHECK(ptr->reserved1);
-       TCHECK(ptr->call_stats);
-       printf(" CALL_STATS(%.128s)", ptr->call_stats);
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_cdn *ptr = (const struct pptp_msg_cdn *)dat;
+
+       pptp_call_id_print(ndo, ptr->call_id);
+       pptp_result_code_print(ndo, ptr->result_code, PPTP_CTRL_MSG_TYPE_CDN);
+       pptp_err_code_print(ndo, ptr->err_code);
+       pptp_cause_code_print(ndo, ptr->cause_code);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
+       ND_PRINT(" CALL_STATS(");
+       nd_printjnp(ndo, ptr->call_stats, 128);
+       ND_PRINT(")");
 }
 
 static void
 }
 
 static void
-pptp_wen_print(const u_char *dat)
+pptp_wen_print(netdissect_options *ndo,
+               const u_char *dat)
 {
 {
-       struct pptp_msg_wen *ptr = (struct pptp_msg_wen *)dat;
-
-       TCHECK(ptr->peer_call_id);
-       pptp_peer_call_id_print(&ptr->peer_call_id);
-       TCHECK(ptr->reserved1);
-       TCHECK(ptr->crc_err);
-       printf(" CRC_ERR(%lu)", (unsigned long)ntohl(ptr->crc_err));
-       TCHECK(ptr->framing_err);
-       printf(" FRAMING_ERR(%lu)", (unsigned long)ntohl(ptr->framing_err));
-       TCHECK(ptr->hardware_overrun);
-       printf(" HARDWARE_OVERRUN(%lu)", 
-              (unsigned long)ntohl(ptr->hardware_overrun));
-       TCHECK(ptr->buffer_overrun);
-       printf(" BUFFER_OVERRUN(%lu)", 
-              (unsigned long)ntohl(ptr->buffer_overrun));
-       TCHECK(ptr->timeout_err);
-       printf(" TIMEOUT_ERR(%lu)", (unsigned long)ntohl(ptr->timeout_err));
-       TCHECK(ptr->align_err);
-       printf(" ALIGN_ERR(%lu)", (unsigned long)ntohl(ptr->align_err));
-
-       return;
-
-trunc:
-       printf("%s", tstr);
+       const struct pptp_msg_wen *ptr = (const struct pptp_msg_wen *)dat;
+
+       pptp_peer_call_id_print(ndo, ptr->peer_call_id);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
+       ND_PRINT(" CRC_ERR(%u)", GET_BE_U_4(ptr->crc_err));
+       ND_PRINT(" FRAMING_ERR(%u)", GET_BE_U_4(ptr->framing_err));
+       ND_PRINT(" HARDWARE_OVERRUN(%u)", GET_BE_U_4(ptr->hardware_overrun));
+       ND_PRINT(" BUFFER_OVERRUN(%u)", GET_BE_U_4(ptr->buffer_overrun));
+       ND_PRINT(" TIMEOUT_ERR(%u)", GET_BE_U_4(ptr->timeout_err));
+       ND_PRINT(" ALIGN_ERR(%u)", GET_BE_U_4(ptr->align_err));
 }
 
 static void
 }
 
 static void
-pptp_sli_print(const u_char *dat)
+pptp_sli_print(netdissect_options *ndo,
+               const u_char *dat)
 {
 {
-       struct pptp_msg_sli *ptr = (struct pptp_msg_sli *)dat;
-
-       TCHECK(ptr->peer_call_id);
-       pptp_peer_call_id_print(&ptr->peer_call_id);
-       TCHECK(ptr->reserved1);
-       TCHECK(ptr->send_accm);
-       printf(" SEND_ACCM(0x%08lx)", (unsigned long)ntohl(ptr->send_accm));
-       TCHECK(ptr->recv_accm);
-       printf(" RECV_ACCM(0x%08lx)", (unsigned long)ntohl(ptr->recv_accm));
+       const struct pptp_msg_sli *ptr = (const struct pptp_msg_sli *)dat;
 
 
-       return;
-
-trunc:
-       printf("%s", tstr);
+       pptp_peer_call_id_print(ndo, ptr->peer_call_id);
+       PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
+       ND_PRINT(" SEND_ACCM(0x%08x)", GET_BE_U_4(ptr->send_accm));
+       ND_PRINT(" RECV_ACCM(0x%08x)", GET_BE_U_4(ptr->recv_accm));
 }
 
 void
 }
 
 void
-pptp_print(const u_char *dat, u_int length)
+pptp_print(netdissect_options *ndo,
+           const u_char *dat)
 {
        const struct pptp_hdr *hdr;
 {
        const struct pptp_hdr *hdr;
-       u_int32_t mc;
-       u_int16_t ctrl_msg_type;
+       uint32_t mc;
+       uint16_t ctrl_msg_type;
 
 
-       printf(": pptp");
+       ndo->ndo_protocol = "pptp";
+       ND_PRINT(": ");
+       nd_print_protocol(ndo);
 
 
-       hdr = (struct pptp_hdr *)dat;
+       hdr = (const struct pptp_hdr *)dat;
 
 
-       TCHECK(hdr->length);
-       if (vflag) {
-               printf(" Length=%u", ntohs(hdr->length));
+       if (ndo->ndo_vflag) {
+               ND_PRINT(" Length=%u", GET_BE_U_2(hdr->length));
        }
        }
-       TCHECK(hdr->msg_type);
-       if (vflag) {
-               switch(ntohs(hdr->msg_type)) {
+       if (ndo->ndo_vflag) {
+               switch(GET_BE_U_2(hdr->msg_type)) {
                case PPTP_MSG_TYPE_CTRL:
                case PPTP_MSG_TYPE_CTRL:
-                       printf(" CTRL-MSG");
+                       ND_PRINT(" CTRL-MSG");
                        break;
                case PPTP_MSG_TYPE_MGMT:
                        break;
                case PPTP_MSG_TYPE_MGMT:
-                       printf(" MGMT-MSG");
+                       ND_PRINT(" MGMT-MSG");
                        break;
                default:
                        break;
                default:
-                       printf(" UNKNOWN-MSG-TYPE");
+                       ND_PRINT(" UNKNOWN-MSG-TYPE");
                        break;
                }
        }
 
                        break;
                }
        }
 
-       TCHECK(hdr->magic_cookie);
-       mc = ntohl(hdr->magic_cookie);
+       mc = GET_BE_U_4(hdr->magic_cookie);
        if (mc != PPTP_MAGIC_COOKIE) {
        if (mc != PPTP_MAGIC_COOKIE) {
-               printf(" UNEXPECTED Magic-Cookie!!(%08x)", mc);
+               ND_PRINT(" UNEXPECTED Magic-Cookie!!(%08x)", mc);
        }
        }
-       if (vflag || mc != PPTP_MAGIC_COOKIE) {
-               printf(" Magic-Cookie=%08x", mc);
+       if (ndo->ndo_vflag || mc != PPTP_MAGIC_COOKIE) {
+               ND_PRINT(" Magic-Cookie=%08x", mc);
        }
        }
-       TCHECK(hdr->ctrl_msg_type);
-       ctrl_msg_type = ntohs(hdr->ctrl_msg_type);
+       ctrl_msg_type = GET_BE_U_2(hdr->ctrl_msg_type);
        if (ctrl_msg_type < PPTP_MAX_MSGTYPE_INDEX) {
        if (ctrl_msg_type < PPTP_MAX_MSGTYPE_INDEX) {
-               printf(" CTRL_MSGTYPE=%s", 
+               ND_PRINT(" CTRL_MSGTYPE=%s",
                       pptp_message_type_string[ctrl_msg_type]);
        } else {
                       pptp_message_type_string[ctrl_msg_type]);
        } else {
-               printf(" UNKNOWN_CTRL_MSGTYPE(%u)", ctrl_msg_type);
+               ND_PRINT(" UNKNOWN_CTRL_MSGTYPE(%u)", ctrl_msg_type);
        }
        }
-       TCHECK(hdr->reserved0);
+       PRINT_RESERVED_IF_NOT_ZERO_2(hdr->reserved0);
 
        dat += 12;
 
        switch(ctrl_msg_type) {
        case PPTP_CTRL_MSG_TYPE_SCCRQ:
 
        dat += 12;
 
        switch(ctrl_msg_type) {
        case PPTP_CTRL_MSG_TYPE_SCCRQ:
-               pptp_sccrq_print(dat);
+               pptp_sccrq_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_SCCRP:
                break;
        case PPTP_CTRL_MSG_TYPE_SCCRP:
-               pptp_sccrp_print(dat);
+               pptp_sccrp_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_StopCCRQ:
                break;
        case PPTP_CTRL_MSG_TYPE_StopCCRQ:
-               pptp_stopccrq_print(dat);
+               pptp_stopccrq_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_StopCCRP:
                break;
        case PPTP_CTRL_MSG_TYPE_StopCCRP:
-               pptp_stopccrp_print(dat);
+               pptp_stopccrp_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_ECHORQ:
                break;
        case PPTP_CTRL_MSG_TYPE_ECHORQ:
-               pptp_echorq_print(dat);
+               pptp_echorq_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_ECHORP:
                break;
        case PPTP_CTRL_MSG_TYPE_ECHORP:
-               pptp_echorp_print(dat);
+               pptp_echorp_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_OCRQ:
                break;
        case PPTP_CTRL_MSG_TYPE_OCRQ:
-               pptp_ocrq_print(dat);
+               pptp_ocrq_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_OCRP:
                break;
        case PPTP_CTRL_MSG_TYPE_OCRP:
-               pptp_ocrp_print(dat);
+               pptp_ocrp_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_ICRQ:
                break;
        case PPTP_CTRL_MSG_TYPE_ICRQ:
-               pptp_icrq_print(dat);
+               pptp_icrq_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_ICRP:
                break;
        case PPTP_CTRL_MSG_TYPE_ICRP:
-               pptp_icrp_print(dat);
+               pptp_icrp_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_ICCN:
                break;
        case PPTP_CTRL_MSG_TYPE_ICCN:
-               pptp_iccn_print(dat);
+               pptp_iccn_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_CCRQ:
                break;
        case PPTP_CTRL_MSG_TYPE_CCRQ:
-               pptp_ccrq_print(dat);
+               pptp_ccrq_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_CDN:
                break;
        case PPTP_CTRL_MSG_TYPE_CDN:
-               pptp_cdn_print(dat);
+               pptp_cdn_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_WEN:
                break;
        case PPTP_CTRL_MSG_TYPE_WEN:
-               pptp_wen_print(dat);
+               pptp_wen_print(ndo, dat);
                break;
        case PPTP_CTRL_MSG_TYPE_SLI:
                break;
        case PPTP_CTRL_MSG_TYPE_SLI:
-               pptp_sli_print(dat);
+               pptp_sli_print(ndo, dat);
                break;
        default:
                /* do nothing */
                break;
        }
                break;
        default:
                /* do nothing */
                break;
        }
-
-       return;
-
-trunc:
-       printf("%s", tstr);
-}      
+}
[mirror] the TCPdump network dissector