Upgrade tcpdump to tcpdump-4.99.1
Test: make
Change-Id: I052ed8f5279c806e4d2ff925f581b71db3ac03c0
diff --git a/print-pptp.c b/print-pptp.c
index a4d713d..8e1b303 100644
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -23,16 +23,17 @@
/* \summary: Point-to-Point Tunnelling Protocol (PPTP) printer */
+/* 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 */
@@ -85,153 +86,153 @@
/* common for all PPTP control messages */
struct pptp_hdr {
- uint16_t length;
- uint16_t msg_type;
- uint32_t magic_cookie;
- uint16_t ctrl_msg_type;
- uint16_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 {
- uint16_t proto_ver;
- uint16_t reserved1;
- uint32_t framing_cap;
- uint32_t bearer_cap;
- uint16_t max_channel;
- uint16_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 {
- uint16_t proto_ver;
- uint8_t result_code;
- uint8_t err_code;
- uint32_t framing_cap;
- uint32_t bearer_cap;
- uint16_t max_channel;
- uint16_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 {
- uint8_t reason;
- uint8_t reserved1;
- uint16_t reserved2;
+ nd_uint8_t reason;
+ nd_uint8_t reserved1;
+ nd_uint16_t reserved2;
};
struct pptp_msg_stopccrp {
- uint8_t result_code;
- uint8_t err_code;
- uint16_t reserved1;
+ nd_uint8_t result_code;
+ nd_uint8_t err_code;
+ nd_uint16_t reserved1;
};
struct pptp_msg_echorq {
- uint32_t id;
+ nd_uint32_t id;
};
struct pptp_msg_echorp {
- uint32_t id;
- uint8_t result_code;
- uint8_t err_code;
- uint16_t reserved1;
+ nd_uint32_t id;
+ nd_uint8_t result_code;
+ nd_uint8_t err_code;
+ nd_uint16_t reserved1;
};
struct pptp_msg_ocrq {
- uint16_t call_id;
- uint16_t call_ser;
- uint32_t min_bps;
- uint32_t max_bps;
- uint32_t bearer_type;
- uint32_t framing_type;
- uint16_t recv_winsiz;
- uint16_t pkt_proc_delay;
- uint16_t phone_no_len;
- uint16_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 {
- uint16_t call_id;
- uint16_t peer_call_id;
- uint8_t result_code;
- uint8_t err_code;
- uint16_t cause_code;
- uint32_t conn_speed;
- uint16_t recv_winsiz;
- uint16_t pkt_proc_delay;
- uint32_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 {
- uint16_t call_id;
- uint16_t call_ser;
- uint32_t bearer_type;
- uint32_t phy_chan_id;
- uint16_t dialed_no_len;
- uint16_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 {
- uint16_t call_id;
- uint16_t peer_call_id;
- uint8_t result_code;
- uint8_t err_code;
- uint16_t recv_winsiz;
- uint16_t pkt_proc_delay;
- uint16_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 {
- uint16_t peer_call_id;
- uint16_t reserved1;
- uint32_t conn_speed;
- uint16_t recv_winsiz;
- uint16_t pkt_proc_delay;
- uint32_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 {
- uint16_t call_id;
- uint16_t reserved1;
+ nd_uint16_t call_id;
+ nd_uint16_t reserved1;
};
struct pptp_msg_cdn {
- uint16_t call_id;
- uint8_t result_code;
- uint8_t err_code;
- uint16_t cause_code;
- uint16_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 {
- uint16_t peer_call_id;
- uint16_t reserved1;
- uint32_t crc_err;
- uint32_t framing_err;
- uint32_t hardware_overrun;
- uint32_t buffer_overrun;
- uint32_t timeout_err;
- uint32_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 {
- uint16_t peer_call_id;
- uint16_t reserved1;
- uint32_t send_accm;
- uint32_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:
Number of
- occurence attributes
+ occurrence attributes
--------------------------------------
2 uint32_t bearer_cap;
2 uint32_t bearer_type;
@@ -261,21 +262,27 @@
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 */
/******************************************/
-/* In these attribute-specific print-out functions, it't not necessary
- to do ND_TCHECK because they are already checked in the caller of
- these functions. */
-
static void
pptp_bearer_cap_print(netdissect_options *ndo,
- const uint32_t *bearer_cap)
+ const nd_uint32_t bearer_cap)
{
- ND_PRINT((ndo, " BEARER_CAP(%s%s)",
- EXTRACT_32BITS(bearer_cap) & PPTP_BEARER_CAP_DIGITAL_MASK ? "D" : "",
- EXTRACT_32BITS(bearer_cap) & PPTP_BEARER_CAP_ANALOG_MASK ? "A" : ""));
+ 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[] = {
@@ -287,38 +294,38 @@
static void
pptp_bearer_type_print(netdissect_options *ndo,
- const uint32_t *bearer_type)
+ const nd_uint32_t bearer_type)
{
- ND_PRINT((ndo, " BEARER_TYPE(%s)",
- tok2str(pptp_btype_str, "?", EXTRACT_32BITS(bearer_type))));
+ ND_PRINT(" BEARER_TYPE(%s)",
+ tok2str(pptp_btype_str, "?", GET_BE_U_4(bearer_type)));
}
static void
pptp_call_id_print(netdissect_options *ndo,
- const uint16_t *call_id)
+ const nd_uint16_t call_id)
{
- ND_PRINT((ndo, " CALL_ID(%u)", EXTRACT_16BITS(call_id)));
+ ND_PRINT(" CALL_ID(%u)", GET_BE_U_2(call_id));
}
static void
pptp_call_ser_print(netdissect_options *ndo,
- const uint16_t *call_ser)
+ const nd_uint16_t call_ser)
{
- ND_PRINT((ndo, " CALL_SER_NUM(%u)", EXTRACT_16BITS(call_ser)));
+ ND_PRINT(" CALL_SER_NUM(%u)", GET_BE_U_2(call_ser));
}
static void
pptp_cause_code_print(netdissect_options *ndo,
- const uint16_t *cause_code)
+ const nd_uint16_t cause_code)
{
- ND_PRINT((ndo, " CAUSE_CODE(%u)", EXTRACT_16BITS(cause_code)));
+ ND_PRINT(" CAUSE_CODE(%u)", GET_BE_U_2(cause_code));
}
static void
pptp_conn_speed_print(netdissect_options *ndo,
- const uint32_t *conn_speed)
+ const nd_uint32_t conn_speed)
{
- ND_PRINT((ndo, " CONN_SPEED(%u)", EXTRACT_32BITS(conn_speed)));
+ ND_PRINT(" CONN_SPEED(%u)", GET_BE_U_4(conn_speed));
}
static const struct tok pptp_errcode_str[] = {
@@ -334,34 +341,35 @@
static void
pptp_err_code_print(netdissect_options *ndo,
- const uint8_t *err_code)
+ const nd_uint8_t err_code)
{
- ND_PRINT((ndo, " ERR_CODE(%u", *err_code));
+ ND_PRINT(" ERR_CODE(%u", GET_U_1(err_code));
if (ndo->ndo_vflag) {
- ND_PRINT((ndo, ":%s", tok2str(pptp_errcode_str, "?", *err_code)));
+ ND_PRINT(":%s",
+ tok2str(pptp_errcode_str, "?", GET_U_1(err_code)));
}
- ND_PRINT((ndo, ")"));
+ ND_PRINT(")");
}
static void
pptp_firm_rev_print(netdissect_options *ndo,
- const uint16_t *firm_rev)
+ const nd_uint16_t firm_rev)
{
- ND_PRINT((ndo, " FIRM_REV(%u)", EXTRACT_16BITS(firm_rev)));
+ ND_PRINT(" FIRM_REV(%u)", GET_BE_U_2(firm_rev));
}
static void
pptp_framing_cap_print(netdissect_options *ndo,
- const uint32_t *framing_cap)
+ const nd_uint32_t framing_cap)
{
- ND_PRINT((ndo, " FRAME_CAP("));
- if (EXTRACT_32BITS(framing_cap) & PPTP_FRAMING_CAP_ASYNC_MASK) {
- ND_PRINT((ndo, "A")); /* Async */
+ ND_PRINT(" FRAME_CAP(");
+ if (GET_BE_U_4(framing_cap) & PPTP_FRAMING_CAP_ASYNC_MASK) {
+ ND_PRINT("A"); /* Async */
}
- if (EXTRACT_32BITS(framing_cap) & PPTP_FRAMING_CAP_SYNC_MASK) {
- ND_PRINT((ndo, "S")); /* Sync */
+ if (GET_BE_U_4(framing_cap) & PPTP_FRAMING_CAP_SYNC_MASK) {
+ ND_PRINT("S"); /* Sync */
}
- ND_PRINT((ndo, ")"));
+ ND_PRINT(")");
}
static const struct tok pptp_ftype_str[] = {
@@ -373,68 +381,70 @@
static void
pptp_framing_type_print(netdissect_options *ndo,
- const uint32_t *framing_type)
+ const nd_uint32_t framing_type)
{
- ND_PRINT((ndo, " FRAME_TYPE(%s)",
- tok2str(pptp_ftype_str, "?", EXTRACT_32BITS(framing_type))));
+ ND_PRINT(" FRAME_TYPE(%s)",
+ tok2str(pptp_ftype_str, "?", GET_BE_U_4(framing_type)));
}
static void
pptp_hostname_print(netdissect_options *ndo,
const u_char *hostname)
{
- ND_PRINT((ndo, " HOSTNAME(%.64s)", hostname));
+ ND_PRINT(" HOSTNAME(");
+ nd_printjnp(ndo, hostname, 64);
+ ND_PRINT(")");
}
static void
pptp_id_print(netdissect_options *ndo,
- const uint32_t *id)
+ const nd_uint32_t id)
{
- ND_PRINT((ndo, " ID(%u)", EXTRACT_32BITS(id)));
+ ND_PRINT(" ID(%u)", GET_BE_U_4(id));
}
static void
pptp_max_channel_print(netdissect_options *ndo,
- const uint16_t *max_channel)
+ const nd_uint16_t max_channel)
{
- ND_PRINT((ndo, " MAX_CHAN(%u)", EXTRACT_16BITS(max_channel)));
+ ND_PRINT(" MAX_CHAN(%u)", GET_BE_U_2(max_channel));
}
static void
pptp_peer_call_id_print(netdissect_options *ndo,
- const uint16_t *peer_call_id)
+ const nd_uint16_t peer_call_id)
{
- ND_PRINT((ndo, " PEER_CALL_ID(%u)", EXTRACT_16BITS(peer_call_id)));
+ ND_PRINT(" PEER_CALL_ID(%u)", GET_BE_U_2(peer_call_id));
}
static void
pptp_phy_chan_id_print(netdissect_options *ndo,
- const uint32_t *phy_chan_id)
+ const nd_uint32_t phy_chan_id)
{
- ND_PRINT((ndo, " PHY_CHAN_ID(%u)", EXTRACT_32BITS(phy_chan_id)));
+ ND_PRINT(" PHY_CHAN_ID(%u)", GET_BE_U_4(phy_chan_id));
}
static void
pptp_pkt_proc_delay_print(netdissect_options *ndo,
- const uint16_t *pkt_proc_delay)
+ const nd_uint16_t pkt_proc_delay)
{
- ND_PRINT((ndo, " PROC_DELAY(%u)", EXTRACT_16BITS(pkt_proc_delay)));
+ ND_PRINT(" PROC_DELAY(%u)", GET_BE_U_2(pkt_proc_delay));
}
static void
pptp_proto_ver_print(netdissect_options *ndo,
- const uint16_t *proto_ver)
+ const nd_uint16_t proto_ver)
{
- ND_PRINT((ndo, " PROTO_VER(%u.%u)", /* Version.Revision */
- EXTRACT_16BITS(proto_ver) >> 8,
- EXTRACT_16BITS(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
pptp_recv_winsiz_print(netdissect_options *ndo,
- const uint16_t *recv_winsiz)
+ const nd_uint16_t recv_winsiz)
{
- ND_PRINT((ndo, " RECV_WIN(%u)", EXTRACT_16BITS(recv_winsiz)));
+ ND_PRINT(" RECV_WIN(%u)", GET_BE_U_2(recv_winsiz));
}
static const struct tok pptp_scrrp_str[] = {
@@ -480,9 +490,9 @@
static void
pptp_result_code_print(netdissect_options *ndo,
- const uint8_t *result_code, int ctrl_msg_type)
+ const nd_uint8_t result_code, int ctrl_msg_type)
{
- ND_PRINT((ndo, " RESULT_CODE(%u", *result_code));
+ 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 :
@@ -493,23 +503,28 @@
ctrl_msg_type == PPTP_CTRL_MSG_TYPE_CDN ? pptp_cdn_str :
NULL; /* assertion error */
if (dict != NULL)
- ND_PRINT((ndo, ":%s", tok2str(dict, "?", *result_code)));
+ ND_PRINT(":%s",
+ tok2str(dict, "?", GET_U_1(result_code)));
}
- ND_PRINT((ndo, ")"));
+ ND_PRINT(")");
}
static void
pptp_subaddr_print(netdissect_options *ndo,
const u_char *subaddr)
{
- ND_PRINT((ndo, " SUB_ADDR(%.64s)", subaddr));
+ ND_PRINT(" SUB_ADDR(");
+ nd_printjnp(ndo, subaddr, 64);
+ ND_PRINT(")");
}
static void
pptp_vendor_print(netdissect_options *ndo,
const u_char *vendor)
{
- ND_PRINT((ndo, " VENDOR(%.64s)", vendor));
+ ND_PRINT(" VENDOR(");
+ nd_printjnp(ndo, vendor, 64);
+ ND_PRINT(")");
}
/************************************/
@@ -521,26 +536,14 @@
{
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);
- ND_TCHECK(ptr->reserved1);
- ND_TCHECK(ptr->framing_cap);
- pptp_framing_cap_print(ndo, &ptr->framing_cap);
- ND_TCHECK(ptr->bearer_cap);
- pptp_bearer_cap_print(ndo, &ptr->bearer_cap);
- ND_TCHECK(ptr->max_channel);
- pptp_max_channel_print(ndo, &ptr->max_channel);
- ND_TCHECK(ptr->firm_rev);
- pptp_firm_rev_print(ndo, &ptr->firm_rev);
- ND_TCHECK(ptr->hostname);
- pptp_hostname_print(ndo, &ptr->hostname[0]);
- ND_TCHECK(ptr->vendor);
- pptp_vendor_print(ndo, &ptr->vendor[0]);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -549,29 +552,15 @@
{
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);
- ND_TCHECK(ptr->result_code);
- pptp_result_code_print(ndo, &ptr->result_code, PPTP_CTRL_MSG_TYPE_SCCRP);
- ND_TCHECK(ptr->err_code);
- pptp_err_code_print(ndo, &ptr->err_code);
- ND_TCHECK(ptr->framing_cap);
- pptp_framing_cap_print(ndo, &ptr->framing_cap);
- ND_TCHECK(ptr->bearer_cap);
- pptp_bearer_cap_print(ndo, &ptr->bearer_cap);
- ND_TCHECK(ptr->max_channel);
- pptp_max_channel_print(ndo, &ptr->max_channel);
- ND_TCHECK(ptr->firm_rev);
- pptp_firm_rev_print(ndo, &ptr->firm_rev);
- ND_TCHECK(ptr->hostname);
- pptp_hostname_print(ndo, &ptr->hostname[0]);
- ND_TCHECK(ptr->vendor);
- pptp_vendor_print(ndo, &ptr->vendor[0]);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -580,32 +569,26 @@
{
const struct pptp_msg_stopccrq *ptr = (const struct pptp_msg_stopccrq *)dat;
- ND_TCHECK(ptr->reason);
- ND_PRINT((ndo, " REASON(%u", ptr->reason));
+ ND_PRINT(" REASON(%u", GET_U_1(ptr->reason));
if (ndo->ndo_vflag) {
- switch (ptr->reason) {
+ switch (GET_U_1(ptr->reason)) {
case 1:
- ND_PRINT((ndo, ":None"));
+ ND_PRINT(":None");
break;
case 2:
- ND_PRINT((ndo, ":Stop-Protocol"));
+ ND_PRINT(":Stop-Protocol");
break;
case 3:
- ND_PRINT((ndo, ":Stop-Local-Shutdown"));
+ ND_PRINT(":Stop-Local-Shutdown");
break;
default:
- ND_PRINT((ndo, ":?"));
+ ND_PRINT(":?");
break;
}
}
- ND_PRINT((ndo, ")"));
- ND_TCHECK(ptr->reserved1);
- ND_TCHECK(ptr->reserved2);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ ND_PRINT(")");
+ PRINT_RESERVED_IF_NOT_ZERO_1(ptr->reserved1);
+ PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved2);
}
static void
@@ -614,16 +597,9 @@
{
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);
- ND_TCHECK(ptr->err_code);
- pptp_err_code_print(ndo, &ptr->err_code);
- ND_TCHECK(ptr->reserved1);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%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
@@ -632,13 +608,7 @@
{
const struct pptp_msg_echorq *ptr = (const struct pptp_msg_echorq *)dat;
- ND_TCHECK(ptr->id);
- pptp_id_print(ndo, &ptr->id);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ pptp_id_print(ndo, ptr->id);
}
static void
@@ -647,18 +617,10 @@
{
const struct pptp_msg_echorp *ptr = (const struct pptp_msg_echorp *)dat;
- ND_TCHECK(ptr->id);
- pptp_id_print(ndo, &ptr->id);
- ND_TCHECK(ptr->result_code);
- pptp_result_code_print(ndo, &ptr->result_code, PPTP_CTRL_MSG_TYPE_ECHORP);
- ND_TCHECK(ptr->err_code);
- pptp_err_code_print(ndo, &ptr->err_code);
- ND_TCHECK(ptr->reserved1);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -667,34 +629,21 @@
{
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);
- ND_TCHECK(ptr->call_ser);
- pptp_call_ser_print(ndo, &ptr->call_ser);
- ND_TCHECK(ptr->min_bps);
- ND_PRINT((ndo, " MIN_BPS(%u)", EXTRACT_32BITS(&ptr->min_bps)));
- ND_TCHECK(ptr->max_bps);
- ND_PRINT((ndo, " MAX_BPS(%u)", EXTRACT_32BITS(&ptr->max_bps)));
- ND_TCHECK(ptr->bearer_type);
- pptp_bearer_type_print(ndo, &ptr->bearer_type);
- ND_TCHECK(ptr->framing_type);
- pptp_framing_type_print(ndo, &ptr->framing_type);
- ND_TCHECK(ptr->recv_winsiz);
- pptp_recv_winsiz_print(ndo, &ptr->recv_winsiz);
- ND_TCHECK(ptr->pkt_proc_delay);
- pptp_pkt_proc_delay_print(ndo, &ptr->pkt_proc_delay);
- ND_TCHECK(ptr->phone_no_len);
- ND_PRINT((ndo, " PHONE_NO_LEN(%u)", EXTRACT_16BITS(&ptr->phone_no_len)));
- ND_TCHECK(ptr->reserved1);
- ND_TCHECK(ptr->phone_no);
- ND_PRINT((ndo, " PHONE_NO(%.64s)", ptr->phone_no));
- ND_TCHECK(ptr->subaddr);
- pptp_subaddr_print(ndo, &ptr->subaddr[0]);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -703,29 +652,15 @@
{
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);
- ND_TCHECK(ptr->peer_call_id);
- pptp_peer_call_id_print(ndo, &ptr->peer_call_id);
- ND_TCHECK(ptr->result_code);
- pptp_result_code_print(ndo, &ptr->result_code, PPTP_CTRL_MSG_TYPE_OCRP);
- ND_TCHECK(ptr->err_code);
- pptp_err_code_print(ndo, &ptr->err_code);
- ND_TCHECK(ptr->cause_code);
- pptp_cause_code_print(ndo, &ptr->cause_code);
- ND_TCHECK(ptr->conn_speed);
- pptp_conn_speed_print(ndo, &ptr->conn_speed);
- ND_TCHECK(ptr->recv_winsiz);
- pptp_recv_winsiz_print(ndo, &ptr->recv_winsiz);
- ND_TCHECK(ptr->pkt_proc_delay);
- pptp_pkt_proc_delay_print(ndo, &ptr->pkt_proc_delay);
- ND_TCHECK(ptr->phy_chan_id);
- pptp_phy_chan_id_print(ndo, &ptr->phy_chan_id);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -734,29 +669,21 @@
{
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);
- ND_TCHECK(ptr->call_ser);
- pptp_call_ser_print(ndo, &ptr->call_ser);
- ND_TCHECK(ptr->bearer_type);
- pptp_bearer_type_print(ndo, &ptr->bearer_type);
- ND_TCHECK(ptr->phy_chan_id);
- pptp_phy_chan_id_print(ndo, &ptr->phy_chan_id);
- ND_TCHECK(ptr->dialed_no_len);
- ND_PRINT((ndo, " DIALED_NO_LEN(%u)", EXTRACT_16BITS(&ptr->dialed_no_len)));
- ND_TCHECK(ptr->dialing_no_len);
- ND_PRINT((ndo, " DIALING_NO_LEN(%u)", EXTRACT_16BITS(&ptr->dialing_no_len)));
- ND_TCHECK(ptr->dialed_no);
- ND_PRINT((ndo, " DIALED_NO(%.64s)", ptr->dialed_no));
- ND_TCHECK(ptr->dialing_no);
- ND_PRINT((ndo, " DIALING_NO(%.64s)", ptr->dialing_no));
- ND_TCHECK(ptr->subaddr);
- pptp_subaddr_print(ndo, &ptr->subaddr[0]);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -765,24 +692,13 @@
{
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);
- ND_TCHECK(ptr->peer_call_id);
- pptp_peer_call_id_print(ndo, &ptr->peer_call_id);
- ND_TCHECK(ptr->result_code);
- pptp_result_code_print(ndo, &ptr->result_code, PPTP_CTRL_MSG_TYPE_ICRP);
- ND_TCHECK(ptr->err_code);
- pptp_err_code_print(ndo, &ptr->err_code);
- ND_TCHECK(ptr->recv_winsiz);
- pptp_recv_winsiz_print(ndo, &ptr->recv_winsiz);
- ND_TCHECK(ptr->pkt_proc_delay);
- pptp_pkt_proc_delay_print(ndo, &ptr->pkt_proc_delay);
- ND_TCHECK(ptr->reserved1);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -791,22 +707,12 @@
{
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);
- ND_TCHECK(ptr->reserved1);
- ND_TCHECK(ptr->conn_speed);
- pptp_conn_speed_print(ndo, &ptr->conn_speed);
- ND_TCHECK(ptr->recv_winsiz);
- pptp_recv_winsiz_print(ndo, &ptr->recv_winsiz);
- ND_TCHECK(ptr->pkt_proc_delay);
- pptp_pkt_proc_delay_print(ndo, &ptr->pkt_proc_delay);
- ND_TCHECK(ptr->framing_type);
- pptp_framing_type_print(ndo, &ptr->framing_type);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -815,14 +721,8 @@
{
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);
- ND_TCHECK(ptr->reserved1);
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ pptp_call_id_print(ndo, ptr->call_id);
+ PRINT_RESERVED_IF_NOT_ZERO_2(ptr->reserved1);
}
static void
@@ -831,22 +731,14 @@
{
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);
- ND_TCHECK(ptr->result_code);
- pptp_result_code_print(ndo, &ptr->result_code, PPTP_CTRL_MSG_TYPE_CDN);
- ND_TCHECK(ptr->err_code);
- pptp_err_code_print(ndo, &ptr->err_code);
- ND_TCHECK(ptr->cause_code);
- pptp_cause_code_print(ndo, &ptr->cause_code);
- ND_TCHECK(ptr->reserved1);
- ND_TCHECK(ptr->call_stats);
- ND_PRINT((ndo, " CALL_STATS(%.128s)", ptr->call_stats));
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -855,26 +747,14 @@
{
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);
- ND_TCHECK(ptr->reserved1);
- ND_TCHECK(ptr->crc_err);
- ND_PRINT((ndo, " CRC_ERR(%u)", EXTRACT_32BITS(&ptr->crc_err)));
- ND_TCHECK(ptr->framing_err);
- ND_PRINT((ndo, " FRAMING_ERR(%u)", EXTRACT_32BITS(&ptr->framing_err)));
- ND_TCHECK(ptr->hardware_overrun);
- ND_PRINT((ndo, " HARDWARE_OVERRUN(%u)", EXTRACT_32BITS(&ptr->hardware_overrun)));
- ND_TCHECK(ptr->buffer_overrun);
- ND_PRINT((ndo, " BUFFER_OVERRUN(%u)", EXTRACT_32BITS(&ptr->buffer_overrun)));
- ND_TCHECK(ptr->timeout_err);
- ND_PRINT((ndo, " TIMEOUT_ERR(%u)", EXTRACT_32BITS(&ptr->timeout_err)));
- ND_TCHECK(ptr->align_err);
- ND_PRINT((ndo, " ALIGN_ERR(%u)", EXTRACT_32BITS(&ptr->align_err)));
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
+ 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
@@ -883,18 +763,10 @@
{
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);
- ND_TCHECK(ptr->reserved1);
- ND_TCHECK(ptr->send_accm);
- ND_PRINT((ndo, " SEND_ACCM(0x%08x)", EXTRACT_32BITS(&ptr->send_accm)));
- ND_TCHECK(ptr->recv_accm);
- ND_PRINT((ndo, " RECV_ACCM(0x%08x)", EXTRACT_32BITS(&ptr->recv_accm)));
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%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
@@ -905,46 +777,44 @@
uint32_t mc;
uint16_t ctrl_msg_type;
- ND_PRINT((ndo, ": pptp"));
+ ndo->ndo_protocol = "pptp";
+ ND_PRINT(": ");
+ nd_print_protocol(ndo);
hdr = (const struct pptp_hdr *)dat;
- ND_TCHECK(hdr->length);
if (ndo->ndo_vflag) {
- ND_PRINT((ndo, " Length=%u", EXTRACT_16BITS(&hdr->length)));
+ ND_PRINT(" Length=%u", GET_BE_U_2(hdr->length));
}
- ND_TCHECK(hdr->msg_type);
if (ndo->ndo_vflag) {
- switch(EXTRACT_16BITS(&hdr->msg_type)) {
+ switch(GET_BE_U_2(hdr->msg_type)) {
case PPTP_MSG_TYPE_CTRL:
- ND_PRINT((ndo, " CTRL-MSG"));
+ ND_PRINT(" CTRL-MSG");
break;
case PPTP_MSG_TYPE_MGMT:
- ND_PRINT((ndo, " MGMT-MSG"));
+ ND_PRINT(" MGMT-MSG");
break;
default:
- ND_PRINT((ndo, " UNKNOWN-MSG-TYPE"));
+ ND_PRINT(" UNKNOWN-MSG-TYPE");
break;
}
}
- ND_TCHECK(hdr->magic_cookie);
- mc = EXTRACT_32BITS(&hdr->magic_cookie);
+ mc = GET_BE_U_4(hdr->magic_cookie);
if (mc != PPTP_MAGIC_COOKIE) {
- ND_PRINT((ndo, " UNEXPECTED Magic-Cookie!!(%08x)", mc));
+ ND_PRINT(" UNEXPECTED Magic-Cookie!!(%08x)", mc);
}
if (ndo->ndo_vflag || mc != PPTP_MAGIC_COOKIE) {
- ND_PRINT((ndo, " Magic-Cookie=%08x", mc));
+ ND_PRINT(" Magic-Cookie=%08x", mc);
}
- ND_TCHECK(hdr->ctrl_msg_type);
- ctrl_msg_type = EXTRACT_16BITS(&hdr->ctrl_msg_type);
+ ctrl_msg_type = GET_BE_U_2(hdr->ctrl_msg_type);
if (ctrl_msg_type < PPTP_MAX_MSGTYPE_INDEX) {
- ND_PRINT((ndo, " CTRL_MSGTYPE=%s",
- pptp_message_type_string[ctrl_msg_type]));
+ ND_PRINT(" CTRL_MSGTYPE=%s",
+ pptp_message_type_string[ctrl_msg_type]);
} else {
- ND_PRINT((ndo, " UNKNOWN_CTRL_MSGTYPE(%u)", ctrl_msg_type));
+ ND_PRINT(" UNKNOWN_CTRL_MSGTYPE(%u)", ctrl_msg_type);
}
- ND_TCHECK(hdr->reserved0);
+ PRINT_RESERVED_IF_NOT_ZERO_2(hdr->reserved0);
dat += 12;
@@ -998,9 +868,4 @@
/* do nothing */
break;
}
-
- return;
-
-trunc:
- ND_PRINT((ndo, "%s", tstr));
}