X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ad7a38341c19e71e3595c17368ac18f08b71482d..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-ripng.c diff --git a/print-ripng.c b/print-ripng.c index f16212bb..15a9aff7 100644 --- a/print-ripng.c +++ b/print-ripng.c @@ -19,21 +19,15 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.18 2005-01-04 00:15:54 guy Exp $"; -#endif +/* \summary: IPv6 Routing Information Protocol (RIPng) printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#ifdef INET6 - -#include -#include +#include "netdissect-stdinc.h" -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" @@ -71,19 +65,19 @@ static const char rcsid[] _U_ = #define RIP6_RESPONSE 2 struct netinfo6 { - struct in6_addr rip6_dest; - u_int16_t rip6_tag; - u_int8_t rip6_plen; - u_int8_t rip6_metric; + nd_ipv6 rip6_dest; + nd_uint16_t rip6_tag; + nd_uint8_t rip6_plen; + nd_uint8_t rip6_metric; }; struct rip6 { - u_int8_t rip6_cmd; - u_int8_t rip6_vers; - u_int8_t rip6_res1[2]; + nd_uint8_t rip6_cmd; + nd_uint8_t rip6_vers; + nd_byte rip6_res1[2]; union { struct netinfo6 ru6_nets[1]; - char ru6_tracefile[1]; + nd_byte ru6_tracefile[1]; } rip6un; #define rip6_nets rip6un.ru6_nets #define rip6_tracefile rip6un.ru6_tracefile @@ -91,93 +85,104 @@ struct rip6 { #define HOPCNT_INFINITY6 16 -#define RIP6_PORT 521 - -#if !defined(IN6_IS_ADDR_UNSPECIFIED) && !defined(_MSC_VER) /* MSVC inline */ -static int IN6_IS_ADDR_UNSPECIFIED(const struct in6_addr *addr) +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); } -#endif static int -rip6_entry_print(register const struct netinfo6 *ni, int metric) +rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metric) { int l; - l = printf("%s/%d", ip6addr_string(&ni->rip6_dest), ni->rip6_plen); - if (ni->rip6_tag) - l += printf(" [%d]", EXTRACT_16BITS(&ni->rip6_tag)); + uint16_t tag; + + 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); if (metric) - l += printf(" (%d)", ni->rip6_metric); + l += ND_PRINT(" (%u)", metric); return l; } void -ripng_print(const u_char *dat, unsigned int length) +ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length) { - register const struct rip6 *rp = (struct rip6 *)dat; - register const struct netinfo6 *ni; - register u_int amt; - register u_int i; - int j; - int trunc; - - if (snapend < dat) - return; - amt = snapend - dat; - i = min(length, amt); - if (i < (sizeof(struct rip6) - sizeof(struct netinfo6))) - return; - i -= (sizeof(struct rip6) - sizeof(struct netinfo6)); - - switch (rp->rip6_cmd) { + const struct rip6 *rp = (const struct rip6 *)dat; + uint8_t cmd; + const struct netinfo6 *ni; + 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) { case RIP6_REQUEST: - j = length / sizeof(*ni); - if (j == 1 - && rp->rip6_nets->rip6_metric == HOPCNT_INFINITY6 - && IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) { - printf(" ripng-req dump"); - break; + length_left = length; + if (length_left < (sizeof(struct rip6) - sizeof(struct netinfo6))) + goto trunc; + length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6)); + j = length_left / sizeof(*ni); + if (j == 1) { + ND_TCHECK_SIZE(rp->rip6_nets); + if (EXTRACT_U_1(rp->rip6_nets->rip6_metric) == HOPCNT_INFINITY6 + && ND_IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) { + ND_PRINT(" ripng-req dump"); + break; + } } - if (j * sizeof(*ni) != length - 4) - printf(" ripng-req %d[%u]:", j, length); + if (j * sizeof(*ni) != length_left) + ND_PRINT(" ripng-req %u[%u]:", j, length); else - printf(" ripng-req %d:", j); - trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i); - for (ni = rp->rip6_nets; i >= sizeof(*ni); - i -= sizeof(*ni), ++ni) { - if (vflag > 1) - printf("\n\t"); + ND_PRINT(" ripng-req %u:", j); + for (ni = rp->rip6_nets; length_left >= sizeof(*ni); + length_left -= sizeof(*ni), ++ni) { + ND_TCHECK_SIZE(ni); + if (ndo->ndo_vflag > 1) + ND_PRINT("\n\t"); else - printf(" "); - rip6_entry_print(ni, 0); + ND_PRINT(" "); + rip6_entry_print(ndo, ni, 0); } + if (length_left != 0) + goto trunc; break; case RIP6_RESPONSE: - j = length / sizeof(*ni); - if (j * sizeof(*ni) != length - 4) - printf(" ripng-resp %d[%u]:", j, length); + length_left = length; + if (length_left < (sizeof(struct rip6) - sizeof(struct netinfo6))) + goto trunc; + length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6)); + j = length_left / sizeof(*ni); + if (j * sizeof(*ni) != length_left) + ND_PRINT(" ripng-resp %u[%u]:", j, length); else - printf(" ripng-resp %d:", j); - trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i); - for (ni = rp->rip6_nets; i >= sizeof(*ni); - i -= sizeof(*ni), ++ni) { - if (vflag > 1) - printf("\n\t"); + ND_PRINT(" ripng-resp %u:", j); + for (ni = rp->rip6_nets; length_left >= sizeof(*ni); + length_left -= sizeof(*ni), ++ni) { + ND_TCHECK_SIZE(ni); + if (ndo->ndo_vflag > 1) + ND_PRINT("\n\t"); else - printf(" "); - rip6_entry_print(ni, ni->rip6_metric); + ND_PRINT(" "); + rip6_entry_print(ndo, ni, EXTRACT_U_1(ni->rip6_metric)); } - if (trunc) - printf("[|ripng]"); + if (length_left != 0) + goto trunc; break; default: - printf(" ripng-%d ?? %u", rp->rip6_cmd, length); + ND_PRINT(" ripng-%u ?? %u", cmd, length); break; } - if (rp->rip6_vers != RIP6_VERSION) - printf(" [vers %d]", rp->rip6_vers); + ND_TCHECK_1(rp->rip6_vers); + if (EXTRACT_U_1(rp->rip6_vers) != RIP6_VERSION) + ND_PRINT(" [vers %u]", EXTRACT_U_1(rp->rip6_vers)); + return; + +trunc: + nd_print_trunc(ndo); + return; } -#endif /* INET6 */