Skip to content

P
PPSi
Commit 9e7692c8 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

diag: msg.c: mask remaining messages under if(pp_verbose_dump) 

The big dumping stanzas are already conditional under
if(pp_verbose_dump), so they only exists if VERB_DUMP or VERB_LOG_MSGS
is defined at build time.

This commit adds the same build-time protection to other messages
related to packet dumps (all of them rely on a build-time protected
subfunction anyways).
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent ae445876
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 30 deletions
proto-standard/msg.c
View file @ 9e7692c8
......@@ -196,9 +196,11 @@ void msg_unpack_sync(void *buf, MsgSync *sync)
sync->originTimestamp.nanosecondsField =
htonl(*(UInteger32 *) (buf + 40));
PP_VPRINTF("Message SYNC\n");
timestamp_display("Origin Timestamp", &sync->originTimestamp);
PP_VPRINTF("\n");
if (pp_verbose_dump) {
PP_VPRINTF("Message SYNC\n");
timestamp_display("Origin Timestamp", &sync->originTimestamp);
PP_VPRINTF("\n");
}
}
/* Pack Announce message into out buffer of ppi */
......@@ -306,10 +308,12 @@ void msg_unpack_follow_up(void *buf, MsgFollowUp *flwup)
flwup->preciseOriginTimestamp.nanosecondsField =
htonl(*(UInteger32 *) (buf + 40));
PP_VPRINTF("Message FOLLOW_UP\n");
timestamp_display("Precise Origin Timestamp",
&flwup->preciseOriginTimestamp);
PP_VPRINTF("\n");
if (pp_verbose_dump) {
PP_VPRINTF("Message FOLLOW_UP\n");
timestamp_display("Precise Origin Timestamp",
&flwup->preciseOriginTimestamp);
PP_VPRINTF("\n");
}
}
/* pack PdelayReq message into out buffer of ppi */
......@@ -461,10 +465,12 @@ void msg_unpack_delay_req(void *buf, MsgDelayReq *delay_req)
delay_req->originTimestamp.nanosecondsField =
htonl(*(UInteger32 *) (buf + 40));
PP_VPRINTF("Message DELAY_REQ\n");
timestamp_display("Origin Timestamp",
&delay_req->originTimestamp);
PP_VPRINTF("\n");
if (pp_verbose_dump) {
PP_VPRINTF("Message DELAY_REQ\n");
timestamp_display("Origin Timestamp",
&delay_req->originTimestamp);
PP_VPRINTF("\n");
}
}
/* Unpack PdelayReq message from IN buffer of ppi to msgtmp.req */
......@@ -477,10 +483,12 @@ void msg_unpack_pdelay_req(void *buf, MsgPDelayReq *pdelay_req)
pdelay_req->originTimestamp.nanosecondsField =
htonl(*(UInteger32 *) (buf + 40));
PP_VPRINTF("Message PDELAY_REQ\n");
timestamp_display("Origin Timestamp",
&pdelay_req->originTimestamp);
PP_VPRINTF("\n");
if (pp_verbose_dump) {
PP_VPRINTF("Message PDELAY_REQ\n");
timestamp_display("Origin Timestamp",
&pdelay_req->originTimestamp);
PP_VPRINTF("\n");
}
}
/* Unpack delayResp message from IN buffer of ppi to msgtmp.presp */
......@@ -497,11 +505,13 @@ void msg_unpack_delay_resp(void *buf, MsgDelayResp *resp)
resp->requestingPortIdentity.portNumber =
htons(*(UInteger16 *) (buf + 52));
PP_VPRINTF("Message DELAY_RESP\n");
timestamp_display("Receive Timestamp",
&resp->receiveTimestamp);
/* FIXME diag display requestingPortIdentity */
PP_VPRINTF("\n");
if (pp_verbose_dump) {
PP_VPRINTF("Message DELAY_RESP\n");
timestamp_display("Receive Timestamp",
&resp->receiveTimestamp);
/* FIXME diag display requestingPortIdentity */
PP_VPRINTF("\n");
}
}
/* Unpack PdelayResp message from IN buffer of ppi to msgtmp.presp */
......@@ -518,11 +528,13 @@ void msg_unpack_pdelay_resp(void *buf, MsgPDelayResp *presp)
presp->requestingPortIdentity.portNumber =
htons(*(UInteger16 *) (buf + 52));
PP_VPRINTF("Message PDELAY_RESP\n");
timestamp_display("Request Receipt Timestamp",
&presp->requestReceiptTimestamp);
/* FIXME diag display requestingPortIdentity */
PP_VPRINTF("\n");
if (pp_verbose_dump) {
PP_VPRINTF("Message PDELAY_RESP\n");
timestamp_display("Request Receipt Timestamp",
&presp->requestReceiptTimestamp);
/* FIXME diag display requestingPortIdentity */
PP_VPRINTF("\n");
}
}
/* Pack PdelayRespFollowUp message into out buffer of ppi */
......@@ -581,11 +593,13 @@ void msg_unpack_pdelay_resp_followup(void *buf,
presp_follow->requestingPortIdentity.portNumber =
htons(*(UInteger16 *) (buf + 52));
PP_VPRINTF("Message PDELAY_RESP_FOLLOW_UP\n");
timestamp_display("Response Origin Timestamp",
&presp_follow->responseOriginTimestamp);
/* FIXME diag display requestingPortIdentity */
PP_VPRINTF("\n");
if (pp_verbose_dump) {
PP_VPRINTF("Message PDELAY_RESP_FOLLOW_UP\n");
timestamp_display("Response Origin Timestamp",
&presp_follow->responseOriginTimestamp);
/* FIXME diag display requestingPortIdentity */
PP_VPRINTF("\n");
}
}
const char const *pp_msg_names[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment