X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/efe79869834e0fd2461ccab6350165c7a906d7c4..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-ntp.c diff --git a/print-ntp.c b/print-ntp.c index e30f8845..de6ec6d9 100644 --- a/print-ntp.c +++ b/print-ntp.c @@ -33,10 +33,10 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #ifdef HAVE_STRFTIME #include @@ -46,7 +46,6 @@ #include "addrtoname.h" #include "extract.h" -static const char tstr[] = " [|ntp]"; /* * Based on ntp.h from the U of MD implementation @@ -277,16 +276,16 @@ ntp_time_print(netdissect_options *ndo, ND_TCHECK_1(bp->ppoll); ND_PRINT(", poll %d", EXTRACT_S_1(bp->ppoll)); - p_poll(ndo, EXTRACT_U_1(bp->ppoll)); + p_poll(ndo, EXTRACT_S_1(bp->ppoll)); ND_TCHECK_1(bp->precision); ND_PRINT(", precision %d", EXTRACT_S_1(bp->precision)); - ND_TCHECK(bp->root_delay); + ND_TCHECK_SIZE(&bp->root_delay); ND_PRINT("\n\tRoot Delay: "); p_sfix(ndo, &bp->root_delay); - ND_TCHECK(bp->root_dispersion); + ND_TCHECK_SIZE(&bp->root_dispersion); ND_PRINT(", Root dispersion: "); p_sfix(ndo, &bp->root_dispersion); @@ -300,17 +299,17 @@ ntp_time_print(netdissect_options *ndo, break; case PRIM_REF: - if (fn_printn(ndo, (const u_char *)&(bp->refid), 4, ndo->ndo_snapend)) + if (nd_printn(ndo, (const u_char *)&(bp->refid), 4, ndo->ndo_snapend)) goto trunc; break; case INFO_QUERY: - ND_PRINT("%s INFO_QUERY", ipaddr_string(ndo, &(bp->refid))); + ND_PRINT("%s INFO_QUERY", ipaddr_string(ndo, bp->refid)); /* this doesn't have more content */ return; case INFO_REPLY: - ND_PRINT("%s INFO_REPLY", ipaddr_string(ndo, &(bp->refid))); + ND_PRINT("%s INFO_REPLY", ipaddr_string(ndo, bp->refid)); /* this is too complex to be worth printing */ return; @@ -321,19 +320,19 @@ ntp_time_print(netdissect_options *ndo, break; } - ND_TCHECK(bp->ref_timestamp); + ND_TCHECK_SIZE(&bp->ref_timestamp); ND_PRINT("\n\t Reference Timestamp: "); p_ntp_time(ndo, &(bp->ref_timestamp)); - ND_TCHECK(bp->org_timestamp); + ND_TCHECK_SIZE(&bp->org_timestamp); ND_PRINT("\n\t Originator Timestamp: "); p_ntp_time(ndo, &(bp->org_timestamp)); - ND_TCHECK(bp->rec_timestamp); + ND_TCHECK_SIZE(&bp->rec_timestamp); ND_PRINT("\n\t Receive Timestamp: "); p_ntp_time(ndo, &(bp->rec_timestamp)); - ND_TCHECK(bp->xmt_timestamp); + ND_TCHECK_SIZE(&bp->xmt_timestamp); ND_PRINT("\n\t Transmit Timestamp: "); p_ntp_time(ndo, &(bp->xmt_timestamp)); @@ -372,12 +371,12 @@ ntp_time_print(netdissect_options *ndo, return; invalid: - ND_PRINT(" %s", istr); + ND_PRINT("%s", istr); ND_TCHECK_LEN(bp, length); return; trunc: - ND_PRINT(" %s", tstr); + nd_print_trunc(ndo); } /* @@ -432,12 +431,12 @@ ntp_control_print(netdissect_options *ndo, return; invalid: - ND_PRINT(" %s", istr); + ND_PRINT("%s", istr); ND_TCHECK_LEN(cd, length); return; trunc: - ND_PRINT(" %s", tstr); + nd_print_trunc(ndo); } union ntpdata { @@ -453,14 +452,15 @@ ntp_print(netdissect_options *ndo, const u_char *cp, u_int length) { const union ntpdata *bp = (const union ntpdata *)cp; - int mode, version, leapind; + u_int mode, version, leapind; uint8_t status; + ndo->ndo_protocol = "ntp"; ND_TCHECK_1(bp->td.status); status = EXTRACT_U_1(bp->td.status); version = (status & VERSIONMASK) >> VERSIONSHIFT; - ND_PRINT("NTPv%d", version); + ND_PRINT("NTPv%u", version); mode = (status & MODEMASK) >> MODESHIFT; if (!ndo->ndo_vflag) { @@ -479,16 +479,28 @@ ntp_print(netdissect_options *ndo, tok2str(ntp_leapind_values, "Unknown", leapind), leapind); - if (mode >= MODE_UNSPEC && mode <= MODE_BROADCAST) + switch (mode) { + + case MODE_UNSPEC: + case MODE_SYM_ACT: + case MODE_SYM_PAS: + case MODE_CLIENT: + case MODE_SERVER: + case MODE_BROADCAST: ntp_time_print(ndo, &bp->td, length); - else if (mode == MODE_CONTROL) + break; + + case MODE_CONTROL: ntp_control_print(ndo, &bp->cd, length); - else - {;} /* XXX: not implemented! */ + break; + + default: + break; /* XXX: not implemented! */ + } return; trunc: - ND_PRINT(" %s", tstr); + nd_print_trunc(ndo); } static void @@ -524,7 +536,7 @@ p_ntp_time(netdissect_options *ndo, ff += FMAXINT; ff = ff / FMAXINT; /* shift radix point by 32 bits */ f = (uint32_t)(ff * 1000000000.0); /* treat fraction as parts per billion */ - ND_PRINT("%u.%09d", i, f); + ND_PRINT("%u.%09u", i, f); #ifdef HAVE_STRFTIME /* @@ -568,9 +580,9 @@ p_ntp_delta(netdissect_options *ndo, const struct l_fixedpt *olfp, const struct l_fixedpt *lfp) { - int32_t i; uint32_t u, uf; uint32_t ou, ouf; + uint32_t i; uint32_t f; double ff; int signbit; @@ -584,20 +596,20 @@ p_ntp_delta(netdissect_options *ndo, return; } - i = u - ou; - - if (i > 0) { /* new is definitely greater than old */ + if (u > ou) { /* new is definitely greater than old */ signbit = 0; + i = u - ou; f = uf - ouf; if (ouf > uf) /* must borrow from high-order bits */ i -= 1; - } else if (i < 0) { /* new is definitely less than old */ + } else if (u < ou) { /* new is definitely less than old */ signbit = 1; + i = ou - u; f = ouf - uf; - if (uf > ouf) /* must carry into the high-order bits */ - i += 1; - i = -i; + if (uf > ouf) /* must borrow from the high-order bits */ + i -= 1; } else { /* int_part is zero */ + i = 0; if (uf > ouf) { signbit = 0; f = uf - ouf; @@ -612,7 +624,7 @@ p_ntp_delta(netdissect_options *ndo, ff += FMAXINT; ff = ff / FMAXINT; /* shift radix point by 32 bits */ f = (uint32_t)(ff * 1000000000.0); /* treat fraction as parts per billion */ - ND_PRINT("%s%d.%09d", signbit ? "-" : "+", i, f); + ND_PRINT("%s%u.%09u", signbit ? "-" : "+", i, f); } /* Prints polling interval in log2 as seconds or fraction of second */