X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/0dad1934af3db3f97d4371463089c8725dbfa26d..f34af1aa63da301ae7ee91e2300dff31702001f0:/print-ripng.c diff --git a/print-ripng.c b/print-ripng.c index 3ff43dc7..15a9aff7 100644 --- a/print-ripng.c +++ b/print-ripng.c @@ -87,8 +87,8 @@ struct rip6 { static int ND_IN6_IS_ADDR_UNSPECIFIED(const nd_ipv6 *addr) { - static const struct in6_addr in6addr_any; /* :: */ - return (memcmp(addr, &in6addr_any, sizeof(*addr)) == 0); + static const struct in6_addr in6addr_any_val; /* :: */ + return (memcmp(addr, &in6addr_any_val, sizeof(*addr)) == 0); } static int @@ -97,7 +97,8 @@ rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metri int l; uint16_t tag; - l = ND_PRINT("%s/%u", ip6addr_string(ndo, ni->rip6_dest), EXTRACT_U_1(ni->rip6_plen)); + l = ND_PRINT("%s/%u", ip6addr_string(ndo, ni->rip6_dest), + EXTRACT_U_1(ni->rip6_plen)); tag = EXTRACT_BE_U_2(ni->rip6_tag); if (tag) l += ND_PRINT(" [%u]", tag); @@ -115,6 +116,7 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length) unsigned int length_left; u_int j; + ndo->ndo_protocol = "ripng"; ND_TCHECK_1(rp->rip6_cmd); cmd = EXTRACT_U_1(rp->rip6_cmd); switch (cmd) { @@ -181,6 +183,6 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length) return; trunc: - ND_PRINT("[|ripng]"); + nd_print_trunc(ndo); return; }