X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/09822d484b0f26d197a1ea8fdf81ca6e0d698634..a37ced67021c5f4afb14cfc26dd5fee115c78d33:/print-sflow.c diff --git a/print-sflow.c b/print-sflow.c index f17f1ce9..ba79e6a6 100644 --- a/print-sflow.c +++ b/print-sflow.c @@ -19,7 +19,7 @@ /* \summary: sFlow protocol printer */ -/* specification: http://www.sflow.org/developers/specifications.php */ +/* specification: https://sflow.org/developers/specifications.php */ #ifdef HAVE_CONFIG_H #include @@ -874,8 +874,7 @@ sflow_print(netdissect_options *ndo, sflow_datagram = (const struct sflow_datagram_t *)pptr; if (len < sizeof(struct sflow_datagram_t)) { ND_PRINT("sFlowv%u", GET_BE_U_4(sflow_datagram->version)); - ND_PRINT(" [length %u < %" PRIsize "]", - len, sizeof(struct sflow_datagram_t)); + ND_PRINT(" [length %u < %zu]", len, sizeof(struct sflow_datagram_t)); nd_print_invalid(ndo); return; } @@ -894,7 +893,7 @@ sflow_print(netdissect_options *ndo, ND_PRINT("sFlowv%u, %s agent %s, agent-id %u, length %u", GET_BE_U_4(sflow_datagram->version), GET_BE_U_4(sflow_datagram->ip_version) == 1 ? "IPv4" : "IPv6", - ipaddr_string(ndo, sflow_datagram->agent), + GET_IPADDR_STRING(sflow_datagram->agent), GET_BE_U_4(sflow_datagram->agent_id), len); return; @@ -905,7 +904,7 @@ sflow_print(netdissect_options *ndo, ND_PRINT("sFlowv%u, %s agent %s, agent-id %u, seqnum %u, uptime %u, samples %u, length %u", GET_BE_U_4(sflow_datagram->version), GET_BE_U_4(sflow_datagram->ip_version) == 1 ? "IPv4" : "IPv6", - ipaddr_string(ndo, sflow_datagram->agent), + GET_IPADDR_STRING(sflow_datagram->agent), GET_BE_U_4(sflow_datagram->agent_id), GET_BE_U_4(sflow_datagram->seqnum), GET_BE_U_4(sflow_datagram->uptime),