X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3e8a443c3671baa37ae7870f08fb9b4bf386fd24..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-aodv.c diff --git a/print-aodv.c b/print-aodv.c index da26473f..b014c49c 100644 --- a/print-aodv.c +++ b/print-aodv.c @@ -30,56 +30,41 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED +/* \summary: Ad hoc On-Demand Distance Vector (AODV) Routing printer */ +/* specification: RFC 3561 */ + #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include - -/* for offsetof */ -#include +#include "netdissect-stdinc.h" -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" -#include "extract.h" /* must come after interface.h */ - +#include "extract.h" struct aodv_rreq { - uint8_t rreq_type; /* AODV message type (1) */ - uint8_t rreq_flags; /* various flags */ - uint8_t rreq_zero0; /* reserved, set to zero */ - uint8_t rreq_hops; /* number of hops from originator */ - uint32_t rreq_id; /* request ID */ - uint32_t rreq_da; /* destination IPv4 address */ - uint32_t rreq_ds; /* destination sequence number */ - uint32_t rreq_oa; /* originator IPv4 address */ - uint32_t rreq_os; /* originator sequence number */ + nd_uint8_t rreq_type; /* AODV message type (1) */ + nd_uint8_t rreq_flags; /* various flags */ + nd_uint8_t rreq_zero0; /* reserved, set to zero */ + nd_uint8_t rreq_hops; /* number of hops from originator */ + nd_uint32_t rreq_id; /* request ID */ + nd_ipv4 rreq_da; /* destination IPv4 address */ + nd_uint32_t rreq_ds; /* destination sequence number */ + nd_ipv4 rreq_oa; /* originator IPv4 address */ + nd_uint32_t rreq_os; /* originator sequence number */ }; -#ifdef INET6 struct aodv_rreq6 { - uint8_t rreq_type; /* AODV message type (1) */ - uint8_t rreq_flags; /* various flags */ - uint8_t rreq_zero0; /* reserved, set to zero */ - uint8_t rreq_hops; /* number of hops from originator */ - uint32_t rreq_id; /* request ID */ - struct in6_addr rreq_da; /* destination IPv6 address */ - uint32_t rreq_ds; /* destination sequence number */ - struct in6_addr rreq_oa; /* originator IPv6 address */ - uint32_t rreq_os; /* originator sequence number */ + nd_uint8_t rreq_type; /* AODV message type (1) */ + nd_uint8_t rreq_flags; /* various flags */ + nd_uint8_t rreq_zero0; /* reserved, set to zero */ + nd_uint8_t rreq_hops; /* number of hops from originator */ + nd_uint32_t rreq_id; /* request ID */ + nd_ipv6 rreq_da; /* destination IPv6 address */ + nd_uint32_t rreq_ds; /* destination sequence number */ + nd_ipv6 rreq_oa; /* originator IPv6 address */ + nd_uint32_t rreq_os; /* originator sequence number */ }; -struct aodv_rreq6_draft_01 { - uint8_t rreq_type; /* AODV message type (16) */ - uint8_t rreq_flags; /* various flags */ - uint8_t rreq_zero0; /* reserved, set to zero */ - uint8_t rreq_hops; /* number of hops from originator */ - uint32_t rreq_id; /* request ID */ - uint32_t rreq_ds; /* destination sequence number */ - uint32_t rreq_os; /* originator sequence number */ - struct in6_addr rreq_da; /* destination IPv6 address */ - struct in6_addr rreq_oa; /* originator IPv6 address */ -}; -#endif #define RREQ_JOIN 0x80 /* join (reserved for multicast */ #define RREQ_REPAIR 0x40 /* repair (reserved for multicast */ @@ -89,37 +74,25 @@ struct aodv_rreq6_draft_01 { #define RREQ_FLAGS_MASK 0xF8 /* mask for rreq_flags */ struct aodv_rrep { - uint8_t rrep_type; /* AODV message type (2) */ - uint8_t rrep_flags; /* various flags */ - uint8_t rrep_ps; /* prefix size */ - uint8_t rrep_hops; /* number of hops from o to d */ - uint32_t rrep_da; /* destination IPv4 address */ - uint32_t rrep_ds; /* destination sequence number */ - uint32_t rrep_oa; /* originator IPv4 address */ - uint32_t rrep_life; /* lifetime of this route */ + nd_uint8_t rrep_type; /* AODV message type (2) */ + nd_uint8_t rrep_flags; /* various flags */ + nd_uint8_t rrep_ps; /* prefix size */ + nd_uint8_t rrep_hops; /* number of hops from o to d */ + nd_ipv4 rrep_da; /* destination IPv4 address */ + nd_uint32_t rrep_ds; /* destination sequence number */ + nd_ipv4 rrep_oa; /* originator IPv4 address */ + nd_uint32_t rrep_life; /* lifetime of this route */ }; -#ifdef INET6 struct aodv_rrep6 { - uint8_t rrep_type; /* AODV message type (2) */ - uint8_t rrep_flags; /* various flags */ - uint8_t rrep_ps; /* prefix size */ - uint8_t rrep_hops; /* number of hops from o to d */ - struct in6_addr rrep_da; /* destination IPv6 address */ - uint32_t rrep_ds; /* destination sequence number */ - struct in6_addr rrep_oa; /* originator IPv6 address */ - uint32_t rrep_life; /* lifetime of this route */ -}; -struct aodv_rrep6_draft_01 { - uint8_t rrep_type; /* AODV message type (17) */ - uint8_t rrep_flags; /* various flags */ - uint8_t rrep_ps; /* prefix size */ - uint8_t rrep_hops; /* number of hops from o to d */ - uint32_t rrep_ds; /* destination sequence number */ - struct in6_addr rrep_da; /* destination IPv6 address */ - struct in6_addr rrep_oa; /* originator IPv6 address */ - uint32_t rrep_life; /* lifetime of this route */ + nd_uint8_t rrep_type; /* AODV message type (2) */ + nd_uint8_t rrep_flags; /* various flags */ + nd_uint8_t rrep_ps; /* prefix size */ + nd_uint8_t rrep_hops; /* number of hops from o to d */ + nd_ipv6 rrep_da; /* destination IPv6 address */ + nd_uint32_t rrep_ds; /* destination sequence number */ + nd_ipv6 rrep_oa; /* originator IPv6 address */ + nd_uint32_t rrep_life; /* lifetime of this route */ }; -#endif #define RREP_REPAIR 0x80 /* repair (reserved for multicast */ #define RREP_ACK 0x40 /* acknowledgement required */ @@ -127,53 +100,49 @@ struct aodv_rrep6_draft_01 { #define RREP_PREFIX_MASK 0x1F /* mask for prefix size */ struct rerr_unreach { - uint32_t u_da; /* IPv4 address */ - uint32_t u_ds; /* sequence number */ + nd_ipv4 u_da; /* IPv4 address */ + nd_uint32_t u_ds; /* sequence number */ }; -#ifdef INET6 struct rerr_unreach6 { - struct in6_addr u_da; /* IPv6 address */ - uint32_t u_ds; /* sequence number */ -}; -struct rerr_unreach6_draft_01 { - struct in6_addr u_da; /* IPv6 address */ - uint32_t u_ds; /* sequence number */ + nd_ipv6 u_da; /* IPv6 address */ + nd_uint32_t u_ds; /* sequence number */ }; -#endif struct aodv_rerr { - uint8_t rerr_type; /* AODV message type (3 or 18) */ - uint8_t rerr_flags; /* various flags */ - uint8_t rerr_zero0; /* reserved, set to zero */ - uint8_t rerr_dc; /* destination count */ + nd_uint8_t rerr_type; /* AODV message type (3 or 18) */ + nd_uint8_t rerr_flags; /* various flags */ + nd_uint8_t rerr_zero0; /* reserved, set to zero */ + nd_uint8_t rerr_dc; /* destination count */ }; #define RERR_NODELETE 0x80 /* don't delete the link */ #define RERR_FLAGS_MASK 0x80 /* mask for rerr_flags */ struct aodv_rrep_ack { - uint8_t ra_type; - uint8_t ra_zero0; + nd_uint8_t ra_type; + nd_uint8_t ra_zero0; }; #define AODV_RREQ 1 /* route request */ #define AODV_RREP 2 /* route response */ #define AODV_RERR 3 /* error report */ #define AODV_RREP_ACK 4 /* route response acknowledgement */ - -#define AODV_V6_DRAFT_01_RREQ 16 /* IPv6 route request */ -#define AODV_V6_DRAFT_01_RREP 17 /* IPv6 route response */ -#define AODV_V6_DRAFT_01_RERR 18 /* IPv6 error report */ -#define AODV_V6_DRAFT_01_RREP_ACK 19 /* IPV6 route response acknowledgment */ +static const struct tok msg_type_str[] = { + { AODV_RREQ, "rreq" }, + { AODV_RREP, "rrep" }, + { AODV_RERR, "rerr" }, + { AODV_RREP_ACK, "rrep-ack" }, + { 0, NULL } +}; struct aodv_ext { - uint8_t type; /* extension type */ - uint8_t length; /* extension length */ + nd_uint8_t type; /* extension type */ + nd_uint8_t length; /* extension length */ }; struct aodv_hello { struct aodv_ext eh; /* extension header */ - uint8_t interval[4]; /* expect my next hello in + nd_uint32_t interval; /* expect my next hello in * (n) ms * NOTE: this is not aligned */ }; @@ -184,363 +153,194 @@ static void aodv_extension(netdissect_options *ndo, const struct aodv_ext *ep, u_int length) { - u_int i; const struct aodv_hello *ah; + uint8_t ext_type, ext_length; - switch (ep->type) { + ext_type = GET_U_1(ep->type); + ext_length = GET_U_1(ep->length); + switch (ext_type) { case AODV_EXT_HELLO: - if (ndo->ndo_snapend < (u_char *) ep) { - ND_PRINT((ndo, " [|hello]")); - return; + ah = (const struct aodv_hello *)(const void *)ep; + ND_ICHECKMSG_ZU("ext data length", length, <, + sizeof(struct aodv_hello)); + if (ext_length < 4) { + ND_PRINT("\n\text HELLO - bad length %u", ext_length); + goto invalid; } - i = min(length, (u_int)(ndo->ndo_snapend - (u_char *)ep)); - if (i < sizeof(struct aodv_hello)) { - ND_PRINT((ndo, " [|hello]")); - return; - } - i -= sizeof(struct aodv_hello); - ah = (void *)ep; - ND_PRINT((ndo, "\n\text HELLO %ld ms", - (unsigned long)EXTRACT_32BITS(&ah->interval))); + ND_PRINT("\n\text HELLO %u ms", + GET_BE_U_4(ah->interval)); break; default: - ND_PRINT((ndo, "\n\text %u %u", ep->type, ep->length)); + ND_PRINT("\n\text %u %u", ext_type, ext_length); break; } + return; + +invalid: + nd_print_invalid(ndo); } static void -aodv_rreq(netdissect_options *ndo, - const struct aodv_rreq *ap, const u_char *dat, u_int length) +aodv_rreq(netdissect_options *ndo, const u_char *dat, u_int length) { u_int i; - - if (ndo->ndo_snapend < dat) { - ND_PRINT((ndo, " [|aodv]")); - return; - } - i = min(length, (u_int)(ndo->ndo_snapend - dat)); - if (i < sizeof(*ap)) { - ND_PRINT((ndo, " [|rreq]")); - return; - } - i -= sizeof(*ap); - ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08lx\n" - "\tdst %s seq %lu src %s seq %lu", length, - ap->rreq_type & RREQ_JOIN ? "[J]" : "", - ap->rreq_type & RREQ_REPAIR ? "[R]" : "", - ap->rreq_type & RREQ_GRAT ? "[G]" : "", - ap->rreq_type & RREQ_DEST ? "[D]" : "", - ap->rreq_type & RREQ_UNKNOWN ? "[U] " : " ", - ap->rreq_hops, - (unsigned long)EXTRACT_32BITS(&ap->rreq_id), - ipaddr_string(ndo, &ap->rreq_da), - (unsigned long)EXTRACT_32BITS(&ap->rreq_ds), - ipaddr_string(ndo, &ap->rreq_oa), - (unsigned long)EXTRACT_32BITS(&ap->rreq_os))); + const struct aodv_rreq *ap = (const struct aodv_rreq *)dat; + + ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap)); + ND_PRINT(" %u %s%s%s%s%shops %u id 0x%08x\n" + "\tdst %s seq %u src %s seq %u", length, + GET_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "", + GET_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "", + GET_U_1(ap->rreq_type) & RREQ_GRAT ? "[G]" : "", + GET_U_1(ap->rreq_type) & RREQ_DEST ? "[D]" : "", + GET_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ", + GET_U_1(ap->rreq_hops), + GET_BE_U_4(ap->rreq_id), + GET_IPADDR_STRING(ap->rreq_da), + GET_BE_U_4(ap->rreq_ds), + GET_IPADDR_STRING(ap->rreq_oa), + GET_BE_U_4(ap->rreq_os)); + i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) - aodv_extension(ndo, (void *)(ap + 1), i); + aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i); + return; + +invalid: + nd_print_invalid(ndo); } static void -aodv_rrep(netdissect_options *ndo, - const struct aodv_rrep *ap, const u_char *dat, u_int length) +aodv_rrep(netdissect_options *ndo, const u_char *dat, u_int length) { u_int i; - - if (ndo->ndo_snapend < dat) { - ND_PRINT((ndo, " [|aodv]")); - return; - } - i = min(length, (u_int)(ndo->ndo_snapend - dat)); - if (i < sizeof(*ap)) { - ND_PRINT((ndo, " [|rrep]")); - return; - } - i -= sizeof(*ap); - ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n" - "\tdst %s dseq %lu src %s %lu ms", length, - ap->rrep_type & RREP_REPAIR ? "[R]" : "", - ap->rrep_type & RREP_ACK ? "[A] " : " ", - ap->rrep_ps & RREP_PREFIX_MASK, - ap->rrep_hops, - ipaddr_string(ndo, &ap->rrep_da), - (unsigned long)EXTRACT_32BITS(&ap->rrep_ds), - ipaddr_string(ndo, &ap->rrep_oa), - (unsigned long)EXTRACT_32BITS(&ap->rrep_life))); + const struct aodv_rrep *ap = (const struct aodv_rrep *)dat; + + ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap)); + ND_PRINT(" %u %s%sprefix %u hops %u\n" + "\tdst %s dseq %u src %s %u ms", length, + GET_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "", + GET_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ", + GET_U_1(ap->rrep_ps) & RREP_PREFIX_MASK, + GET_U_1(ap->rrep_hops), + GET_IPADDR_STRING(ap->rrep_da), + GET_BE_U_4(ap->rrep_ds), + GET_IPADDR_STRING(ap->rrep_oa), + GET_BE_U_4(ap->rrep_life)); + i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) - aodv_extension(ndo, (void *)(ap + 1), i); + aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i); + return; + +invalid: + nd_print_invalid(ndo); } static void -aodv_rerr(netdissect_options *ndo, - const struct aodv_rerr *ap, const u_char *dat, u_int length) +aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length) { u_int i, dc; + const struct aodv_rerr *ap = (const struct aodv_rerr *)dat; const struct rerr_unreach *dp; - if (ndo->ndo_snapend < dat) { - ND_PRINT((ndo, " [|aodv]")); - return; - } - i = min(length, (u_int)(ndo->ndo_snapend - dat)); - if (i < sizeof(*ap)) { - ND_PRINT((ndo, " [|rerr]")); - return; + ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap)); + ND_PRINT(" %s [items %u] [%u]:", + GET_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "", + GET_U_1(ap->rerr_dc), length); + dp = (const struct rerr_unreach *)(dat + sizeof(*ap)); + i = length - sizeof(*ap); + for (dc = GET_U_1(ap->rerr_dc); dc != 0; dc--) { + ND_ICHECKMSG_ZU("remaining length", i, <, sizeof(*dp)); + ND_PRINT(" {%s}(%u)", GET_IPADDR_STRING(dp->u_da), + GET_BE_U_4(dp->u_ds)); + dp++; + i -= sizeof(*dp); } - i -= sizeof(*ap); - ND_PRINT((ndo, " rerr %s [items %u] [%u]:", - ap->rerr_flags & RERR_NODELETE ? "[D]" : "", - ap->rerr_dc, length)); - dp = (struct rerr_unreach *)(void *)(ap + 1); - for (dc = ap->rerr_dc; dc != 0 && i >= sizeof(*dp); - ++dp, --dc, i -= sizeof(*dp)) { - ND_PRINT((ndo, " {%s}(%ld)", ipaddr_string(ndo, &dp->u_da), - (unsigned long)EXTRACT_32BITS(&dp->u_ds))); - } - if ((i % sizeof(*dp)) != 0) - ND_PRINT((ndo, "[|rerr]")); -} - -static void -#ifdef INET6 -aodv_v6_rreq(netdissect_options *ndo, - const struct aodv_rreq6 *ap, const u_char *dat, u_int length) -#else -aodv_v6_rreq(netdissect_options *ndo, - const struct aodv_rreq6 *ap _U_, const u_char *dat _U_, u_int length) -#endif -{ -#ifdef INET6 - u_int i; + return; - if (ndo->ndo_snapend < dat) { - ND_PRINT((ndo, " [|aodv]")); - return; - } - i = min(length, (u_int)(ndo->ndo_snapend - dat)); - if (i < sizeof(*ap)) { - ND_PRINT((ndo, " [|rreq6]")); - return; - } - i -= sizeof(*ap); - ND_PRINT((ndo, " v6 rreq %u %s%s%s%s%shops %u id 0x%08lx\n" - "\tdst %s seq %lu src %s seq %lu", length, - ap->rreq_type & RREQ_JOIN ? "[J]" : "", - ap->rreq_type & RREQ_REPAIR ? "[R]" : "", - ap->rreq_type & RREQ_GRAT ? "[G]" : "", - ap->rreq_type & RREQ_DEST ? "[D]" : "", - ap->rreq_type & RREQ_UNKNOWN ? "[U] " : " ", - ap->rreq_hops, - (unsigned long)EXTRACT_32BITS(&ap->rreq_id), - ip6addr_string(ndo, &ap->rreq_da), - (unsigned long)EXTRACT_32BITS(&ap->rreq_ds), - ip6addr_string(ndo, &ap->rreq_oa), - (unsigned long)EXTRACT_32BITS(&ap->rreq_os))); - if (i >= sizeof(struct aodv_ext)) - aodv_extension(ndo, (void *)(ap + 1), i); -#else - ND_PRINT((ndo, " v6 rreq %u", length)); -#endif +invalid: + nd_print_invalid(ndo); } static void -#ifdef INET6 -aodv_v6_rrep(netdissect_options *ndo, - const struct aodv_rrep6 *ap, const u_char *dat, u_int length) -#else -aodv_v6_rrep(netdissect_options *ndo, - const struct aodv_rrep6 *ap _U_, const u_char *dat _U_, u_int length) -#endif +aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length) { -#ifdef INET6 u_int i; - - if (ndo->ndo_snapend < dat) { - ND_PRINT((ndo, " [|aodv]")); - return; - } - i = min(length, (u_int)(ndo->ndo_snapend - dat)); - if (i < sizeof(*ap)) { - ND_PRINT((ndo, " [|rrep6]")); - return; - } - i -= sizeof(*ap); - ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n" - "\tdst %s dseq %lu src %s %lu ms", length, - ap->rrep_type & RREP_REPAIR ? "[R]" : "", - ap->rrep_type & RREP_ACK ? "[A] " : " ", - ap->rrep_ps & RREP_PREFIX_MASK, - ap->rrep_hops, - ip6addr_string(ndo, &ap->rrep_da), - (unsigned long)EXTRACT_32BITS(&ap->rrep_ds), - ip6addr_string(ndo, &ap->rrep_oa), - (unsigned long)EXTRACT_32BITS(&ap->rrep_life))); + const struct aodv_rreq6 *ap = (const struct aodv_rreq6 *)dat; + + ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap)); + ND_PRINT(" %u %s%s%s%s%shops %u id 0x%08x\n" + "\tdst %s seq %u src %s seq %u", length, + GET_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "", + GET_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "", + GET_U_1(ap->rreq_type) & RREQ_GRAT ? "[G]" : "", + GET_U_1(ap->rreq_type) & RREQ_DEST ? "[D]" : "", + GET_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ", + GET_U_1(ap->rreq_hops), + GET_BE_U_4(ap->rreq_id), + GET_IP6ADDR_STRING(ap->rreq_da), + GET_BE_U_4(ap->rreq_ds), + GET_IP6ADDR_STRING(ap->rreq_oa), + GET_BE_U_4(ap->rreq_os)); + i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) - aodv_extension(ndo, (void *)(ap + 1), i); -#else - ND_PRINT((ndo, " rrep %u", length)); -#endif -} - -static void -#ifdef INET6 -aodv_v6_rerr(netdissect_options *ndo, - const struct aodv_rerr *ap, const u_char *dat, u_int length) -#else -aodv_v6_rerr(netdissect_options *ndo, - const struct aodv_rerr *ap _U_, const u_char *dat, u_int length) -#endif -{ -#ifdef INET6 - u_int i, dc; - const struct rerr_unreach6 *dp6; + aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i); + return; - if (ndo->ndo_snapend < dat) { - ND_PRINT((ndo, " [|aodv]")); - return; - } - i = min(length, (u_int)(ndo->ndo_snapend - dat)); - if (i < sizeof(*ap)) { - ND_PRINT((ndo, " [|rerr]")); - return; - } - i -= sizeof(*ap); - ND_PRINT((ndo, " rerr %s [items %u] [%u]:", - ap->rerr_flags & RERR_NODELETE ? "[D]" : "", - ap->rerr_dc, length)); - dp6 = (struct rerr_unreach6 *)(void *)(ap + 1); - for (dc = ap->rerr_dc; dc != 0 && i >= sizeof(*dp6); - ++dp6, --dc, i -= sizeof(*dp6)) { - ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da), - (unsigned long)EXTRACT_32BITS(&dp6->u_ds))); - } - if ((i % sizeof(*dp6)) != 0) - ND_PRINT((ndo, "[|rerr]")); -#else - ND_PRINT((ndo, " rerr %u", length)); -#endif +invalid: + nd_print_invalid(ndo); } static void -#ifdef INET6 -aodv_v6_draft_01_rreq(netdissect_options *ndo, - const struct aodv_rreq6_draft_01 *ap, const u_char *dat, u_int length) -#else -aodv_v6_draft_01_rreq(netdissect_options *ndo, - const struct aodv_rreq6_draft_01 *ap _U_, const u_char *dat _U_, u_int length) -#endif +aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length) { -#ifdef INET6 u_int i; - - if (ndo->ndo_snapend < dat) { - ND_PRINT((ndo, " [|aodv]")); - return; - } - i = min(length, (u_int)(ndo->ndo_snapend - dat)); - if (i < sizeof(*ap)) { - ND_PRINT((ndo, " [|rreq6]")); - return; - } - i -= sizeof(*ap); - ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08lx\n" - "\tdst %s seq %lu src %s seq %lu", length, - ap->rreq_type & RREQ_JOIN ? "[J]" : "", - ap->rreq_type & RREQ_REPAIR ? "[R]" : "", - ap->rreq_type & RREQ_GRAT ? "[G]" : "", - ap->rreq_type & RREQ_DEST ? "[D]" : "", - ap->rreq_type & RREQ_UNKNOWN ? "[U] " : " ", - ap->rreq_hops, - (unsigned long)EXTRACT_32BITS(&ap->rreq_id), - ip6addr_string(ndo, &ap->rreq_da), - (unsigned long)EXTRACT_32BITS(&ap->rreq_ds), - ip6addr_string(ndo, &ap->rreq_oa), - (unsigned long)EXTRACT_32BITS(&ap->rreq_os))); + const struct aodv_rrep6 *ap = (const struct aodv_rrep6 *)dat; + + ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap)); + ND_PRINT(" %u %s%sprefix %u hops %u\n" + "\tdst %s dseq %u src %s %u ms", length, + GET_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "", + GET_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ", + GET_U_1(ap->rrep_ps) & RREP_PREFIX_MASK, + GET_U_1(ap->rrep_hops), + GET_IP6ADDR_STRING(ap->rrep_da), + GET_BE_U_4(ap->rrep_ds), + GET_IP6ADDR_STRING(ap->rrep_oa), + GET_BE_U_4(ap->rrep_life)); + i = length - sizeof(*ap); if (i >= sizeof(struct aodv_ext)) - aodv_extension(ndo, (void *)(ap + 1), i); -#else - ND_PRINT((ndo, " rreq %u", length)); -#endif -} - -static void -#ifdef INET6 -aodv_v6_draft_01_rrep(netdissect_options *ndo, - const struct aodv_rrep6_draft_01 *ap, const u_char *dat, u_int length) -#else -aodv_v6_draft_01_rrep(netdissect_options *ndo, - const struct aodv_rrep6_draft_01 *ap _U_, const u_char *dat _U_, u_int length) -#endif -{ -#ifdef INET6 - u_int i; + aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i); + return; - if (ndo->ndo_snapend < dat) { - ND_PRINT((ndo, " [|aodv]")); - return; - } - i = min(length, (u_int)(ndo->ndo_snapend - dat)); - if (i < sizeof(*ap)) { - ND_PRINT((ndo, " [|rrep6]")); - return; - } - i -= sizeof(*ap); - ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n" - "\tdst %s dseq %lu src %s %lu ms", length, - ap->rrep_type & RREP_REPAIR ? "[R]" : "", - ap->rrep_type & RREP_ACK ? "[A] " : " ", - ap->rrep_ps & RREP_PREFIX_MASK, - ap->rrep_hops, - ip6addr_string(ndo, &ap->rrep_da), - (unsigned long)EXTRACT_32BITS(&ap->rrep_ds), - ip6addr_string(ndo, &ap->rrep_oa), - (unsigned long)EXTRACT_32BITS(&ap->rrep_life))); - if (i >= sizeof(struct aodv_ext)) - aodv_extension(ndo, (void *)(ap + 1), i); -#else - ND_PRINT((ndo, " rrep %u", length)); -#endif +invalid: + nd_print_invalid(ndo); } static void -#ifdef INET6 -aodv_v6_draft_01_rerr(netdissect_options *ndo, - const struct aodv_rerr *ap, const u_char *dat, u_int length) -#else -aodv_v6_draft_01_rerr(netdissect_options *ndo, - const struct aodv_rerr *ap _U_, const u_char *dat, u_int length) -#endif +aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length) { -#ifdef INET6 u_int i, dc; - const struct rerr_unreach6_draft_01 *dp6; + const struct aodv_rerr *ap = (const struct aodv_rerr *)dat; + const struct rerr_unreach6 *dp6; - if (ndo->ndo_snapend < dat) { - ND_PRINT((ndo, " [|aodv]")); - return; + ND_ICHECKMSG_ZU("message length", length, <, sizeof(*ap)); + ND_PRINT(" %s [items %u] [%u]:", + GET_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "", + GET_U_1(ap->rerr_dc), length); + dp6 = (const struct rerr_unreach6 *)(const void *)(ap + 1); + i = length - sizeof(*ap); + for (dc = GET_U_1(ap->rerr_dc); dc != 0; dc--) { + ND_ICHECKMSG_ZU("remaining length", i, <, sizeof(*dp6)); + ND_PRINT(" {%s}(%u)", GET_IP6ADDR_STRING(dp6->u_da), + GET_BE_U_4(dp6->u_ds)); + dp6++; + i -= sizeof(*dp6); } - i = min(length, (u_int)(ndo->ndo_snapend - dat)); - if (i < sizeof(*ap)) { - ND_PRINT((ndo, " [|rerr]")); - return; - } - i -= sizeof(*ap); - ND_PRINT((ndo, " rerr %s [items %u] [%u]:", - ap->rerr_flags & RERR_NODELETE ? "[D]" : "", - ap->rerr_dc, length)); - dp6 = (struct rerr_unreach6_draft_01 *)(void *)(ap + 1); - for (dc = ap->rerr_dc; dc != 0 && i >= sizeof(*dp6); - ++dp6, --dc, i -= sizeof(*dp6)) { - ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da), - (unsigned long)EXTRACT_32BITS(&dp6->u_ds))); - } - if ((i % sizeof(*dp6)) != 0) - ND_PRINT((ndo, "[|rerr]")); -#else - ND_PRINT((ndo, " rerr %u", length)); -#endif + return; + +invalid: + nd_print_invalid(ndo); } void @@ -549,62 +349,44 @@ aodv_print(netdissect_options *ndo, { uint8_t msg_type; + ndo->ndo_protocol = "aodv"; + ND_PRINT(" aodv"); + /* * The message type is the first byte; make sure we have it * and then fetch it. */ - ND_TCHECK(*dat); - msg_type = *dat; - ND_PRINT((ndo, " aodv")); + msg_type = GET_U_1(dat); + ND_PRINT(" %s", tok2str(msg_type_str, "type %u", msg_type)); switch (msg_type) { case AODV_RREQ: if (is_ip6) - aodv_v6_rreq(ndo, (const struct aodv_rreq6 *)dat, dat, length); + aodv_v6_rreq(ndo, dat, length); else - aodv_rreq(ndo, (const struct aodv_rreq *)dat, dat, length); + aodv_rreq(ndo, dat, length); break; case AODV_RREP: if (is_ip6) - aodv_v6_rrep(ndo, (const struct aodv_rrep6 *)dat, dat, length); + aodv_v6_rrep(ndo, dat, length); else - aodv_rrep(ndo, (const struct aodv_rrep *)dat, dat, length); + aodv_rrep(ndo, dat, length); break; case AODV_RERR: if (is_ip6) - aodv_v6_rerr(ndo, (const struct aodv_rerr *)dat, dat, length); + aodv_v6_rerr(ndo, dat, length); else - aodv_rerr(ndo, (const struct aodv_rerr *)dat, dat, length); + aodv_rerr(ndo, dat, length); break; case AODV_RREP_ACK: - ND_PRINT((ndo, " rrep-ack %u", length)); - break; - - case AODV_V6_DRAFT_01_RREQ: - aodv_v6_draft_01_rreq(ndo, (const struct aodv_rreq6_draft_01 *)dat, dat, length); - break; - - case AODV_V6_DRAFT_01_RREP: - aodv_v6_draft_01_rrep(ndo, (const struct aodv_rrep6_draft_01 *)dat, dat, length); - break; - - case AODV_V6_DRAFT_01_RERR: - aodv_v6_draft_01_rerr(ndo, (const struct aodv_rerr *)dat, dat, length); - break; - - case AODV_V6_DRAFT_01_RREP_ACK: - ND_PRINT((ndo, " rrep-ack %u", length)); + ND_PRINT(" %u", length); break; default: - ND_PRINT((ndo, " type %u %u", msg_type, length)); + ND_PRINT(" %u", length); } - return; - -trunc: - ND_PRINT((ndo, " [|aodv]")); }