/* \summary: Ad hoc On-Demand Distance Vector (AODV) Routing printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include "netdissect.h"
#include "addrtoname.h"
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_uint32_t rreq_da; /* destination IPv4 address */
+ nd_ipv4 rreq_da; /* destination IPv4 address */
nd_uint32_t rreq_ds; /* destination sequence number */
- nd_uint32_t rreq_oa; /* originator IPv4 address */
+ nd_ipv4 rreq_oa; /* originator IPv4 address */
nd_uint32_t rreq_os; /* originator sequence number */
};
struct aodv_rreq6 {
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 */
- struct in6_addr rreq_da; /* destination IPv6 address */
+ nd_ipv6 rreq_da; /* destination IPv6 address */
nd_uint32_t rreq_ds; /* destination sequence number */
- struct in6_addr rreq_oa; /* originator IPv6 address */
+ nd_ipv6 rreq_oa; /* originator IPv6 address */
nd_uint32_t rreq_os; /* originator sequence number */
};
struct aodv_rreq6_draft_01 {
nd_uint32_t rreq_id; /* request ID */
nd_uint32_t rreq_ds; /* destination sequence number */
nd_uint32_t rreq_os; /* originator sequence number */
- struct in6_addr rreq_da; /* destination IPv6 address */
- struct in6_addr rreq_oa; /* originator IPv6 address */
+ nd_ipv6 rreq_da; /* destination IPv6 address */
+ nd_ipv6 rreq_oa; /* originator IPv6 address */
};
#define RREQ_JOIN 0x80 /* join (reserved for multicast */
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_uint32_t rrep_da; /* destination IPv4 address */
+ nd_ipv4 rrep_da; /* destination IPv4 address */
nd_uint32_t rrep_ds; /* destination sequence number */
- nd_uint32_t rrep_oa; /* originator IPv4 address */
+ nd_ipv4 rrep_oa; /* originator IPv4 address */
nd_uint32_t rrep_life; /* lifetime of this route */
};
struct aodv_rrep6 {
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 */
- struct in6_addr rrep_da; /* destination IPv6 address */
+ nd_ipv6 rrep_da; /* destination IPv6 address */
nd_uint32_t rrep_ds; /* destination sequence number */
- struct in6_addr rrep_oa; /* originator IPv6 address */
+ nd_ipv6 rrep_oa; /* originator IPv6 address */
nd_uint32_t rrep_life; /* lifetime of this route */
};
struct aodv_rrep6_draft_01 {
nd_uint8_t rrep_ps; /* prefix size */
nd_uint8_t rrep_hops; /* number of hops from o to d */
nd_uint32_t rrep_ds; /* destination sequence number */
- struct in6_addr rrep_da; /* destination IPv6 address */
- struct in6_addr rrep_oa; /* originator IPv6 address */
+ nd_ipv6 rrep_da; /* destination IPv6 address */
+ nd_ipv6 rrep_oa; /* originator IPv6 address */
nd_uint32_t rrep_life; /* lifetime of this route */
};
#define RREP_PREFIX_MASK 0x1F /* mask for prefix size */
struct rerr_unreach {
- nd_uint32_t u_da; /* IPv4 address */
+ nd_ipv4 u_da; /* IPv4 address */
nd_uint32_t u_ds; /* sequence number */
};
struct rerr_unreach6 {
- struct in6_addr u_da; /* IPv6 address */
+ nd_ipv6 u_da; /* IPv6 address */
nd_uint32_t u_ds; /* sequence number */
};
struct rerr_unreach6_draft_01 {
- struct in6_addr u_da; /* IPv6 address */
+ nd_ipv6 u_da; /* IPv6 address */
nd_uint32_t u_ds; /* sequence number */
};
{
const struct aodv_hello *ah;
- ND_TCHECK(*ep);
+ ND_TCHECK_SIZE(ep);
switch (EXTRACT_U_1(ep->type)) {
case AODV_EXT_HELLO:
ah = (const struct aodv_hello *)(const void *)ep;
- ND_TCHECK(*ah);
+ ND_TCHECK_SIZE(ah);
if (length < sizeof(struct aodv_hello))
goto trunc;
if (EXTRACT_U_1(ep->length) < 4) {
- ND_PRINT((ndo, "\n\text HELLO - bad length %u", EXTRACT_U_1(ep->length)));
+ ND_PRINT("\n\text HELLO - bad length %u", EXTRACT_U_1(ep->length));
break;
}
- ND_PRINT((ndo, "\n\text HELLO %u ms",
- EXTRACT_BE_U_4(ah->interval)));
+ ND_PRINT("\n\text HELLO %u ms",
+ EXTRACT_BE_U_4(ah->interval));
break;
default:
- ND_PRINT((ndo, "\n\text %u %u", EXTRACT_U_1(ep->type), EXTRACT_U_1(ep->length)));
+ ND_PRINT("\n\text %u %u", EXTRACT_U_1(ep->type), EXTRACT_U_1(ep->length));
break;
}
return;
trunc:
- ND_PRINT((ndo, " [|hello]"));
+ nd_print_trunc(ndo);
}
static void
u_int i;
const struct aodv_rreq *ap = (const struct aodv_rreq *)dat;
- ND_TCHECK(*ap);
+ ND_TCHECK_SIZE(ap);
if (length < sizeof(*ap))
goto trunc;
- ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08x\n"
+ ND_PRINT(" rreq %u %s%s%s%s%shops %u id 0x%08x\n"
"\tdst %s seq %u src %s seq %u", length,
EXTRACT_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "",
EXTRACT_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "",
EXTRACT_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ",
EXTRACT_U_1(ap->rreq_hops),
EXTRACT_BE_U_4(ap->rreq_id),
- ipaddr_string(ndo, &ap->rreq_da),
+ ipaddr_string(ndo, ap->rreq_da),
EXTRACT_BE_U_4(ap->rreq_ds),
- ipaddr_string(ndo, &ap->rreq_oa),
- EXTRACT_BE_U_4(ap->rreq_os)));
+ ipaddr_string(ndo, ap->rreq_oa),
+ EXTRACT_BE_U_4(ap->rreq_os));
i = length - sizeof(*ap);
if (i >= sizeof(struct aodv_ext))
aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
return;
trunc:
- ND_PRINT((ndo, " [|rreq"));
+ nd_print_trunc(ndo);
}
static void
u_int i;
const struct aodv_rrep *ap = (const struct aodv_rrep *)dat;
- ND_TCHECK(*ap);
+ ND_TCHECK_SIZE(ap);
if (length < sizeof(*ap))
goto trunc;
- ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
+ ND_PRINT(" rrep %u %s%sprefix %u hops %u\n"
"\tdst %s dseq %u src %s %u ms", length,
EXTRACT_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "",
EXTRACT_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ",
EXTRACT_U_1(ap->rrep_ps) & RREP_PREFIX_MASK,
EXTRACT_U_1(ap->rrep_hops),
- ipaddr_string(ndo, &ap->rrep_da),
+ ipaddr_string(ndo, ap->rrep_da),
EXTRACT_BE_U_4(ap->rrep_ds),
- ipaddr_string(ndo, &ap->rrep_oa),
- EXTRACT_BE_U_4(ap->rrep_life)));
+ ipaddr_string(ndo, ap->rrep_oa),
+ EXTRACT_BE_U_4(ap->rrep_life));
i = length - sizeof(*ap);
if (i >= sizeof(struct aodv_ext))
aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
return;
trunc:
- ND_PRINT((ndo, " [|rreq"));
+ nd_print_trunc(ndo);
}
static void
const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
const struct rerr_unreach *dp;
- ND_TCHECK(*ap);
+ ND_TCHECK_SIZE(ap);
if (length < sizeof(*ap))
goto trunc;
- ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
+ ND_PRINT(" rerr %s [items %u] [%u]:",
EXTRACT_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
- EXTRACT_U_1(ap->rerr_dc), length));
+ EXTRACT_U_1(ap->rerr_dc), length);
dp = (const struct rerr_unreach *)(dat + sizeof(*ap));
i = length - sizeof(*ap);
for (dc = EXTRACT_U_1(ap->rerr_dc); dc != 0; dc--) {
- ND_TCHECK(*dp);
+ ND_TCHECK_SIZE(dp);
if (i < sizeof(*dp))
goto trunc;
- ND_PRINT((ndo, " {%s}(%u)", ipaddr_string(ndo, &dp->u_da),
- EXTRACT_BE_U_4(dp->u_ds)));
+ ND_PRINT(" {%s}(%u)", ipaddr_string(ndo, dp->u_da),
+ EXTRACT_BE_U_4(dp->u_ds));
dp++;
i -= sizeof(*dp);
}
return;
trunc:
- ND_PRINT((ndo, "[|rerr]"));
+ nd_print_trunc(ndo);
}
static void
u_int i;
const struct aodv_rreq6 *ap = (const struct aodv_rreq6 *)dat;
- ND_TCHECK(*ap);
+ ND_TCHECK_SIZE(ap);
if (length < sizeof(*ap))
goto trunc;
- ND_PRINT((ndo, " v6 rreq %u %s%s%s%s%shops %u id 0x%08x\n"
+ ND_PRINT(" v6 rreq %u %s%s%s%s%shops %u id 0x%08x\n"
"\tdst %s seq %u src %s seq %u", length,
EXTRACT_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "",
EXTRACT_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "",
EXTRACT_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ",
EXTRACT_U_1(ap->rreq_hops),
EXTRACT_BE_U_4(ap->rreq_id),
- ip6addr_string(ndo, &ap->rreq_da),
+ ip6addr_string(ndo, ap->rreq_da),
EXTRACT_BE_U_4(ap->rreq_ds),
- ip6addr_string(ndo, &ap->rreq_oa),
- EXTRACT_BE_U_4(ap->rreq_os)));
+ ip6addr_string(ndo, ap->rreq_oa),
+ EXTRACT_BE_U_4(ap->rreq_os));
i = length - sizeof(*ap);
if (i >= sizeof(struct aodv_ext))
aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
return;
trunc:
- ND_PRINT((ndo, " [|rreq"));
+ nd_print_trunc(ndo);
}
static void
u_int i;
const struct aodv_rrep6 *ap = (const struct aodv_rrep6 *)dat;
- ND_TCHECK(*ap);
+ ND_TCHECK_SIZE(ap);
if (length < sizeof(*ap))
goto trunc;
- ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
+ ND_PRINT(" rrep %u %s%sprefix %u hops %u\n"
"\tdst %s dseq %u src %s %u ms", length,
EXTRACT_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "",
EXTRACT_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ",
EXTRACT_U_1(ap->rrep_ps) & RREP_PREFIX_MASK,
EXTRACT_U_1(ap->rrep_hops),
- ip6addr_string(ndo, &ap->rrep_da),
+ ip6addr_string(ndo, ap->rrep_da),
EXTRACT_BE_U_4(ap->rrep_ds),
- ip6addr_string(ndo, &ap->rrep_oa),
- EXTRACT_BE_U_4(ap->rrep_life)));
+ ip6addr_string(ndo, ap->rrep_oa),
+ EXTRACT_BE_U_4(ap->rrep_life));
i = length - sizeof(*ap);
if (i >= sizeof(struct aodv_ext))
aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
return;
trunc:
- ND_PRINT((ndo, " [|rreq"));
+ nd_print_trunc(ndo);
}
static void
const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
const struct rerr_unreach6 *dp6;
- ND_TCHECK(*ap);
+ ND_TCHECK_SIZE(ap);
if (length < sizeof(*ap))
goto trunc;
- ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
+ ND_PRINT(" rerr %s [items %u] [%u]:",
EXTRACT_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
- EXTRACT_U_1(ap->rerr_dc), length));
+ EXTRACT_U_1(ap->rerr_dc), length);
dp6 = (const struct rerr_unreach6 *)(const void *)(ap + 1);
i = length - sizeof(*ap);
for (dc = EXTRACT_U_1(ap->rerr_dc); dc != 0; dc--) {
- ND_TCHECK(*dp6);
+ ND_TCHECK_SIZE(dp6);
if (i < sizeof(*dp6))
goto trunc;
- ND_PRINT((ndo, " {%s}(%u)", ip6addr_string(ndo, &dp6->u_da),
- EXTRACT_BE_U_4(dp6->u_ds)));
+ ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, dp6->u_da),
+ EXTRACT_BE_U_4(dp6->u_ds));
dp6++;
i -= sizeof(*dp6);
}
return;
trunc:
- ND_PRINT((ndo, "[|rerr]"));
+ nd_print_trunc(ndo);
}
static void
u_int i;
const struct aodv_rreq6_draft_01 *ap = (const struct aodv_rreq6_draft_01 *)dat;
- ND_TCHECK(*ap);
+ ND_TCHECK_SIZE(ap);
if (length < sizeof(*ap))
goto trunc;
- ND_PRINT((ndo, " rreq %u %s%s%s%s%shops %u id 0x%08x\n"
+ ND_PRINT(" rreq %u %s%s%s%s%shops %u id 0x%08x\n"
"\tdst %s seq %u src %s seq %u", length,
EXTRACT_U_1(ap->rreq_type) & RREQ_JOIN ? "[J]" : "",
EXTRACT_U_1(ap->rreq_type) & RREQ_REPAIR ? "[R]" : "",
EXTRACT_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ",
EXTRACT_U_1(ap->rreq_hops),
EXTRACT_BE_U_4(ap->rreq_id),
- ip6addr_string(ndo, &ap->rreq_da),
+ ip6addr_string(ndo, ap->rreq_da),
EXTRACT_BE_U_4(ap->rreq_ds),
- ip6addr_string(ndo, &ap->rreq_oa),
- EXTRACT_BE_U_4(ap->rreq_os)));
+ ip6addr_string(ndo, ap->rreq_oa),
+ EXTRACT_BE_U_4(ap->rreq_os));
i = length - sizeof(*ap);
if (i >= sizeof(struct aodv_ext))
aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
return;
trunc:
- ND_PRINT((ndo, " [|rreq"));
+ nd_print_trunc(ndo);
}
static void
u_int i;
const struct aodv_rrep6_draft_01 *ap = (const struct aodv_rrep6_draft_01 *)dat;
- ND_TCHECK(*ap);
+ ND_TCHECK_SIZE(ap);
if (length < sizeof(*ap))
goto trunc;
- ND_PRINT((ndo, " rrep %u %s%sprefix %u hops %u\n"
+ ND_PRINT(" rrep %u %s%sprefix %u hops %u\n"
"\tdst %s dseq %u src %s %u ms", length,
EXTRACT_U_1(ap->rrep_type) & RREP_REPAIR ? "[R]" : "",
EXTRACT_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ",
EXTRACT_U_1(ap->rrep_ps) & RREP_PREFIX_MASK,
EXTRACT_U_1(ap->rrep_hops),
- ip6addr_string(ndo, &ap->rrep_da),
+ ip6addr_string(ndo, ap->rrep_da),
EXTRACT_BE_U_4(ap->rrep_ds),
- ip6addr_string(ndo, &ap->rrep_oa),
- EXTRACT_BE_U_4(ap->rrep_life)));
+ ip6addr_string(ndo, ap->rrep_oa),
+ EXTRACT_BE_U_4(ap->rrep_life));
i = length - sizeof(*ap);
if (i >= sizeof(struct aodv_ext))
aodv_extension(ndo, (const struct aodv_ext *)(dat + sizeof(*ap)), i);
return;
trunc:
- ND_PRINT((ndo, " [|rreq"));
+ nd_print_trunc(ndo);
}
static void
const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
const struct rerr_unreach6_draft_01 *dp6;
- ND_TCHECK(*ap);
+ ND_TCHECK_SIZE(ap);
if (length < sizeof(*ap))
goto trunc;
- ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
+ ND_PRINT(" rerr %s [items %u] [%u]:",
EXTRACT_U_1(ap->rerr_flags) & RERR_NODELETE ? "[D]" : "",
- EXTRACT_U_1(ap->rerr_dc), length));
+ EXTRACT_U_1(ap->rerr_dc), length);
dp6 = (const struct rerr_unreach6_draft_01 *)(const void *)(ap + 1);
i = length - sizeof(*ap);
for (dc = EXTRACT_U_1(ap->rerr_dc); dc != 0; dc--) {
- ND_TCHECK(*dp6);
+ ND_TCHECK_SIZE(dp6);
if (i < sizeof(*dp6))
goto trunc;
- ND_PRINT((ndo, " {%s}(%u)", ip6addr_string(ndo, &dp6->u_da),
- EXTRACT_BE_U_4(dp6->u_ds)));
+ ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, dp6->u_da),
+ EXTRACT_BE_U_4(dp6->u_ds));
dp6++;
i -= sizeof(*dp6);
}
return;
trunc:
- ND_PRINT((ndo, "[|rerr]"));
+ nd_print_trunc(ndo);
}
void
{
uint8_t msg_type;
+ ndo->ndo_protocol = "aodv";
/*
* The message type is the first byte; make sure we have it
* and then fetch it.
*/
ND_TCHECK_1(dat);
msg_type = EXTRACT_U_1(dat);
- ND_PRINT((ndo, " aodv"));
+ ND_PRINT(" aodv");
switch (msg_type) {
break;
case AODV_RREP_ACK:
- ND_PRINT((ndo, " rrep-ack %u", length));
+ ND_PRINT(" rrep-ack %u", length);
break;
case AODV_V6_DRAFT_01_RREQ:
break;
case AODV_V6_DRAFT_01_RREP_ACK:
- ND_PRINT((ndo, " rrep-ack %u", length));
+ ND_PRINT(" rrep-ack %u", length);
break;
default:
- ND_PRINT((ndo, " type %u %u", msg_type, length));
+ ND_PRINT(" type %u %u", msg_type, length);
}
return;
trunc:
- ND_PRINT((ndo, " [|aodv]"));
+ nd_print_trunc(ndo);
}
projects / tcpdump / blobdiff