#include "udp.h"
#include "ah.h"
-/* NetBSD: icmp6.h,v 1.13 2000/08/03 16:30:37 itojun Exp */
+/* NetBSD: icmp6.h,v 1.13 2000/08/03 16:30:37 itojun Exp */
/* $KAME: icmp6.h,v 1.22 2000/08/03 15:25:16 jinmei Exp $ */
/*
#define ICMP6_ECHO_REQUEST 128 /* echo service */
#define ICMP6_ECHO_REPLY 129 /* echo reply */
#define ICMP6_MEMBERSHIP_QUERY 130 /* group membership query */
-#define MLD6_LISTENER_QUERY 130 /* multicast listener query */
+#define MLD6_LISTENER_QUERY 130 /* multicast listener query */
#define ICMP6_MEMBERSHIP_REPORT 131 /* group membership report */
#define MLD6_LISTENER_REPORT 131 /* multicast listener report */
#define ICMP6_MEMBERSHIP_REDUCTION 132 /* group membership termination */
#define ICMP6_MAXTYPE 201
#define ICMP6_DST_UNREACH_NOROUTE 0 /* no route to destination */
-#define ICMP6_DST_UNREACH_ADMIN 1 /* administratively prohibited */
+#define ICMP6_DST_UNREACH_ADMIN 1 /* administratively prohibited */
#define ICMP6_DST_UNREACH_NOTNEIGHBOR 2 /* not a neighbor(obsolete) */
#define ICMP6_DST_UNREACH_BEYONDSCOPE 2 /* beyond scope of source address */
#define ICMP6_DST_UNREACH_ADDR 3 /* address unreachable */
#define ICMP6_DST_UNREACH_NOPORT 4 /* port unreachable */
-#define ICMP6_TIME_EXCEED_TRANSIT 0 /* ttl==0 in transit */
+#define ICMP6_TIME_EXCEED_TRANSIT 0 /* ttl==0 in transit */
#define ICMP6_TIME_EXCEED_REASSEMBLY 1 /* ttl==0 in reass */
-#define ICMP6_PARAMPROB_HEADER 0 /* erroneous header field */
+#define ICMP6_PARAMPROB_HEADER 0 /* erroneous header field */
#define ICMP6_PARAMPROB_NEXTHEADER 1 /* unrecognized next header */
#define ICMP6_PARAMPROB_OPTION 2 /* unrecognized option */
+#define ICMP6_PARAMPROB_FRAGHDRCHAIN 3 /* incomplete header chain */
#define ICMP6_INFOMSG_MASK 0x80 /* all informational messages */
*/
struct nd_router_solicit { /* router solicitation */
- struct icmp6_hdr nd_rs_hdr;
+ struct icmp6_hdr nd_rs_hdr;
/* could be followed by options */
};
#define ND_RA_FLAG_MANAGED 0x80
#define ND_RA_FLAG_OTHER 0x40
#define ND_RA_FLAG_HOME_AGENT 0x20
+#define ND_RA_FLAG_IPV6ONLY 0x02
/*
* Router preference values based on draft-draves-ipngwg-router-selection-01.
nd_uint8_t nd_opt_rdnss_len;
nd_uint16_t nd_opt_rdnss_reserved;
nd_uint32_t nd_opt_rdnss_lifetime;
- nd_ipv6 nd_opt_rdnss_addr[1]; /* variable-length */
+ nd_ipv6 nd_opt_rdnss_addr[1]; /* variable-length */
};
struct nd_opt_dnssl { /* DNSSL RFC 6106 5.2 */
#define NI_QTYPE_NODEADDR 3 /* Node Addresses */
#define NI_QTYPE_IPV4ADDR 4 /* IPv4 Addresses */
-/* network endian */
-#define NI_SUPTYPE_FLAG_COMPRESS ((uint16_t)htons(0x1))
-#define NI_FQDN_FLAG_VALIDTTL ((uint16_t)htons(0x1))
-
-/* network endian */
-#define NI_NODEADDR_FLAG_TRUNCATE ((uint16_t)htons(0x1))
-#define NI_NODEADDR_FLAG_ALL ((uint16_t)htons(0x2))
-#define NI_NODEADDR_FLAG_COMPAT ((uint16_t)htons(0x4))
-#define NI_NODEADDR_FLAG_LINKLOCAL ((uint16_t)htons(0x8))
-#define NI_NODEADDR_FLAG_SITELOCAL ((uint16_t)htons(0x10))
-#define NI_NODEADDR_FLAG_GLOBAL ((uint16_t)htons(0x20))
-#define NI_NODEADDR_FLAG_ANYCAST ((uint16_t)htons(0x40)) /* just experimental. not in spec */
+#define NI_NODEADDR_FLAG_TRUNCATE 0x0001
+#define NI_NODEADDR_FLAG_ALL 0x0002
+#define NI_NODEADDR_FLAG_COMPAT 0x0004
+#define NI_NODEADDR_FLAG_LINKLOCAL 0x0008
+#define NI_NODEADDR_FLAG_SITELOCAL 0x0010
+#define NI_NODEADDR_FLAG_GLOBAL 0x0020
+#define NI_NODEADDR_FLAG_ANYCAST 0x0040 /* just experimental. not in spec */
struct ni_reply_fqdn {
nd_uint32_t ni_fqdn_ttl; /* TTL */
#define rr_type rr_hdr.icmp6_type
#define rr_code rr_hdr.icmp6_code
#define rr_cksum rr_hdr.icmp6_cksum
-#define rr_seqnum rr_hdr.icmp6_data32[0]
+#define rr_seqnum rr_hdr.icmp6_data32[0]
struct rr_pco_match { /* match prefix part */
nd_uint8_t rpm_code;
static const char *get_rtpref(u_int);
static const char *get_lifetime(uint32_t);
static void print_lladdr(netdissect_options *ndo, const u_char *, size_t);
-static void icmp6_opt_print(netdissect_options *ndo, const u_char *, int);
+static int icmp6_opt_print(netdissect_options *ndo, const u_char *, int);
static void mld6_print(netdissect_options *ndo, const u_char *);
static void mldv2_report_print(netdissect_options *ndo, const u_char *, u_int);
static void mldv2_query_print(netdissect_options *ndo, const u_char *, u_int);
static void icmp6_nodeinfo_print(netdissect_options *ndo, u_int, const u_char *, const u_char *);
static void icmp6_rrenum_print(netdissect_options *ndo, const u_char *, const u_char *);
-#ifndef abs
-#define abs(a) ((0 < (a)) ? (a) : -(a))
-#endif
-
/*
* DIO: Updated to RFC6550, as published in 2012: section 6. (page 30)
*/
{ ND_RA_FLAG_MANAGED, "managed" },
{ ND_RA_FLAG_OTHER, "other stateful"},
{ ND_RA_FLAG_HOME_AGENT, "home agent"},
+ { ND_RA_FLAG_IPV6ONLY, "ipv6 only"},
{ 0, NULL }
};
{ 0, NULL }
};
-
static const struct tok icmp6_opt_values[] = {
{ ND_OPT_SOURCE_LINKADDR, "source link-address"},
{ ND_OPT_TARGET_LINKADDR, "destination link-address"},
if (v == (uint32_t)~0UL)
return "infinity";
else {
- nd_snprintf(buf, sizeof(buf), "%us", v);
+ snprintf(buf, sizeof(buf), "%us", v);
return buf;
}
}
while (l > 0 && q < ep) {
if (q > p)
ND_PRINT(":");
- ND_PRINT("%02x", EXTRACT_U_1(q));
+ ND_PRINT("%02x", GET_U_1(q));
q++;
l--;
}
}
-static int icmp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
+static uint16_t icmp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
const struct icmp6_hdr *icp, u_int len)
{
return nextproto6_cksum(ndo, ip6, (const uint8_t *)(const void *)icp, len, len,
while (length != 0) {
opt = (const struct rpl_genoption *)opts;
- ND_TCHECK_1(opt->rpl_dio_type);
- dio_type = EXTRACT_U_1(opt->rpl_dio_type);
+ dio_type = GET_U_1(opt->rpl_dio_type);
if (dio_type == RPL_OPT_PAD1) {
optlen = 1;
ND_PRINT(" opt:pad1");
} else {
- if (length < RPL_GENOPTION_LEN)
- goto trunc;
- optlen = EXTRACT_U_1(opt->rpl_dio_len)+RPL_GENOPTION_LEN;
+ if (length < RPL_GENOPTION_LEN)
+ goto trunc;
+ optlen = GET_U_1(opt->rpl_dio_len)+RPL_GENOPTION_LEN;
ND_PRINT(" opt:%s len:%u ",
tok2str(rpl_subopt_values, "subopt:%u", dio_type),
optlen);
ND_TCHECK_LEN(opt, optlen);
if (length < optlen)
- goto trunc;
+ goto trunc;
if (ndo->ndo_vflag > 2) {
hex_print(ndo,
" ",
}
return;
trunc:
- ND_PRINT(" [|truncated]");
- return;
+ nd_print_trunc(ndo);
}
static void
const u_char *bp, u_int length)
{
const struct nd_rpl_dio *dio = (const struct nd_rpl_dio *)bp;
- const char *dagid_str;
-
- ND_TCHECK_SIZE(dio);
- dagid_str = ip6addr_string (ndo, dio->rpl_dagid);
+ ND_ICHECK_ZU(length, <, sizeof(struct nd_rpl_dio));
ND_PRINT(" [dagid:%s,seq:%u,instance:%u,rank:%u,%smop:%s,prf:%u]",
- dagid_str,
- EXTRACT_U_1(dio->rpl_dtsn),
- EXTRACT_U_1(dio->rpl_instanceid),
- EXTRACT_BE_U_2(dio->rpl_dagrank),
- RPL_DIO_GROUNDED(EXTRACT_U_1(dio->rpl_mopprf)) ? "grounded,":"",
- tok2str(rpl_mop_values, "mop%u", RPL_DIO_MOP(EXTRACT_U_1(dio->rpl_mopprf))),
- RPL_DIO_PRF(EXTRACT_U_1(dio->rpl_mopprf)));
+ GET_IP6ADDR_STRING(dio->rpl_dagid),
+ GET_U_1(dio->rpl_dtsn),
+ GET_U_1(dio->rpl_instanceid),
+ GET_BE_U_2(dio->rpl_dagrank),
+ RPL_DIO_GROUNDED(GET_U_1(dio->rpl_mopprf)) ? "grounded,":"",
+ tok2str(rpl_mop_values, "mop%u",
+ RPL_DIO_MOP(GET_U_1(dio->rpl_mopprf))),
+ RPL_DIO_PRF(GET_U_1(dio->rpl_mopprf)));
if(ndo->ndo_vflag > 1) {
rpl_printopts(ndo, bp + sizeof(struct nd_rpl_dio),
length - sizeof(struct nd_rpl_dio));
}
- return;
-trunc:
- ND_PRINT(" [|truncated]");
- return;
+ return;
+invalid:
+ nd_print_invalid(ndo);
}
static void
const char *dagid_str = "<elided>";
uint8_t rpl_flags;
- ND_TCHECK_SIZE(dao);
- if (length < ND_RPL_DAO_MIN_LEN)
- goto tooshort;
+ ND_ICHECK_U(length, <, ND_RPL_DAO_MIN_LEN);
bp += ND_RPL_DAO_MIN_LEN;
length -= ND_RPL_DAO_MIN_LEN;
- rpl_flags = EXTRACT_U_1(dao->rpl_flags);
+ rpl_flags = GET_U_1(dao->rpl_flags);
if(RPL_DAO_D(rpl_flags)) {
- ND_TCHECK_LEN(dao->rpl_dagid, DAGID_LEN);
- if (length < DAGID_LEN)
- goto tooshort;
- dagid_str = ip6addr_string (ndo, dao->rpl_dagid);
+ ND_ICHECK_U(length, <, DAGID_LEN);
+ dagid_str = GET_IP6ADDR_STRING(dao->rpl_dagid);
bp += DAGID_LEN;
length -= DAGID_LEN;
}
- ND_PRINT(" [dagid:%s,seq:%u,instance:%u%s%s,%02x]",
+ ND_PRINT(" [dagid:%s,seq:%u,instance:%u%s%s,flags:%02x]",
dagid_str,
- EXTRACT_U_1(dao->rpl_daoseq),
- EXTRACT_U_1(dao->rpl_instanceid),
+ GET_U_1(dao->rpl_daoseq),
+ GET_U_1(dao->rpl_instanceid),
RPL_DAO_K(rpl_flags) ? ",acK":"",
RPL_DAO_D(rpl_flags) ? ",Dagid":"",
rpl_flags);
if(ndo->ndo_vflag > 1) {
rpl_printopts(ndo, bp, length);
}
- return;
-
-trunc:
- ND_PRINT(" [|truncated]");
- return;
-
-tooshort:
- ND_PRINT(" [|length too short]");
- return;
+ return;
+invalid:
+ nd_print_invalid(ndo);
}
static void
const struct nd_rpl_daoack *daoack = (const struct nd_rpl_daoack *)bp;
const char *dagid_str = "<elided>";
- ND_TCHECK_LEN(daoack, ND_RPL_DAOACK_MIN_LEN);
- if (length < ND_RPL_DAOACK_MIN_LEN)
- goto tooshort;
+ ND_ICHECK_U(length, <, ND_RPL_DAOACK_MIN_LEN);
bp += ND_RPL_DAOACK_MIN_LEN;
length -= ND_RPL_DAOACK_MIN_LEN;
- if(RPL_DAOACK_D(EXTRACT_U_1(daoack->rpl_flags))) {
- ND_TCHECK_LEN(daoack->rpl_dagid, DAGID_LEN);
- if (length < DAGID_LEN)
- goto tooshort;
- dagid_str = ip6addr_string (ndo, daoack->rpl_dagid);
+ if(RPL_DAOACK_D(GET_U_1(daoack->rpl_flags))) {
+ ND_ICHECK_U(length, <, DAGID_LEN);
+ dagid_str = GET_IP6ADDR_STRING(daoack->rpl_dagid);
bp += DAGID_LEN;
length -= DAGID_LEN;
}
ND_PRINT(" [dagid:%s,seq:%u,instance:%u,status:%u]",
dagid_str,
- EXTRACT_U_1(daoack->rpl_daoseq),
- EXTRACT_U_1(daoack->rpl_instanceid),
- EXTRACT_U_1(daoack->rpl_status));
+ GET_U_1(daoack->rpl_daoseq),
+ GET_U_1(daoack->rpl_instanceid),
+ GET_U_1(daoack->rpl_status));
/* no officially defined options for DAOACK, but print any we find */
if(ndo->ndo_vflag > 1) {
rpl_printopts(ndo, bp, length);
}
- return;
-
-trunc:
- ND_PRINT(" [|dao-truncated]");
- return;
-
-tooshort:
- ND_PRINT(" [|dao-length too short]");
- return;
+ return;
+invalid:
+ nd_print_invalid(ndo);
}
static void
#if 0
trunc:
- ND_PRINT(" [|truncated]");
+ nd_print_trunc(ndo);
return;
#endif
}
-
void
icmp6_print(netdissect_options *ndo,
const u_char *bp, u_int length, const u_char *bp2, int fragmented)
const struct ip6_hdr *ip;
const struct ip6_hdr *oip;
const struct udphdr *ouh;
- u_int dport;
+ uint16_t dport;
const u_char *ep;
u_int prot;
oip = (const struct ip6_hdr *)(dp + 1);
/* 'ep' points to the end of available data. */
ep = ndo->ndo_snapend;
+ if (length == 0) {
+ ND_PRINT("ICMP6, length 0");
+ nd_print_invalid(ndo);
+ return;
+ }
if (ndo->ndo_vflag && !fragmented) {
uint16_t sum, udp_sum;
if (ND_TTEST_LEN(bp, length)) {
- ND_TCHECK_2(dp->icmp6_cksum);
- udp_sum = EXTRACT_BE_U_2(dp->icmp6_cksum);
+ udp_sum = GET_BE_U_2(dp->icmp6_cksum);
sum = icmp6_cksum(ndo, ip, dp, length);
if (sum != 0)
ND_PRINT("[bad icmp6 cksum 0x%04x -> 0x%04x!] ",
}
}
- ND_TCHECK_1(dp->icmp6_type);
- icmp6_type = EXTRACT_U_1(dp->icmp6_type);
+ icmp6_type = GET_U_1(dp->icmp6_type);
ND_PRINT("ICMP6, %s", tok2str(icmp6_type_values,"unknown icmp6 type (%u)",icmp6_type));
/* display cosmetics: print the packet length for printer that use the vflag now */
icmp6_type == ICMP6_MOBILEPREFIX_ADVERT ))
ND_PRINT(", length %u", length);
- ND_TCHECK_1(dp->icmp6_code);
- icmp6_code = EXTRACT_U_1(dp->icmp6_code);
+ icmp6_code = GET_U_1(dp->icmp6_code);
switch (icmp6_type) {
case ICMP6_DST_UNREACH:
- ND_TCHECK_16(oip->ip6_dst);
ND_PRINT(", %s", tok2str(icmp6_dst_unreach_code_values,"unknown unreach code (%u)",icmp6_code));
switch (icmp6_code) {
case ICMP6_DST_UNREACH_NOROUTE: /* fall through */
case ICMP6_DST_UNREACH_ADMIN:
case ICMP6_DST_UNREACH_ADDR:
- ND_PRINT(" %s",ip6addr_string(ndo, oip->ip6_dst));
+ ND_PRINT(" %s",GET_IP6ADDR_STRING(oip->ip6_dst));
break;
case ICMP6_DST_UNREACH_BEYONDSCOPE:
ND_PRINT(" %s, source address %s",
- ip6addr_string(ndo, oip->ip6_dst),
- ip6addr_string(ndo, oip->ip6_src));
+ GET_IP6ADDR_STRING(oip->ip6_dst),
+ GET_IP6ADDR_STRING(oip->ip6_src));
break;
case ICMP6_DST_UNREACH_NOPORT:
if ((ouh = get_upperlayer(ndo, (const u_char *)oip, &prot))
== NULL)
goto trunc;
- dport = EXTRACT_BE_U_2(ouh->uh_dport);
+ dport = GET_BE_U_2(ouh->uh_dport);
switch (prot) {
case IPPROTO_TCP:
ND_PRINT(", %s tcp port %s",
- ip6addr_string(ndo, oip->ip6_dst),
+ GET_IP6ADDR_STRING(oip->ip6_dst),
tcpport_string(ndo, dport));
break;
case IPPROTO_UDP:
ND_PRINT(", %s udp port %s",
- ip6addr_string(ndo, oip->ip6_dst),
+ GET_IP6ADDR_STRING(oip->ip6_dst),
udpport_string(ndo, dport));
break;
default:
ND_PRINT(", %s protocol %u port %u unreachable",
- ip6addr_string(ndo, oip->ip6_dst),
+ GET_IP6ADDR_STRING(oip->ip6_dst),
prot, dport);
break;
}
}
break;
case ICMP6_PACKET_TOO_BIG:
- ND_TCHECK_4(dp->icmp6_mtu);
- ND_PRINT(", mtu %u", EXTRACT_BE_U_4(dp->icmp6_mtu));
+ ND_PRINT(", mtu %u", GET_BE_U_4(dp->icmp6_mtu));
break;
case ICMP6_TIME_EXCEEDED:
- ND_TCHECK_16(oip->ip6_dst);
switch (icmp6_code) {
case ICMP6_TIME_EXCEED_TRANSIT:
ND_PRINT(" for %s",
- ip6addr_string(ndo, oip->ip6_dst));
+ GET_IP6ADDR_STRING(oip->ip6_dst));
break;
case ICMP6_TIME_EXCEED_REASSEMBLY:
ND_PRINT(" (reassembly)");
ND_TCHECK_16(oip->ip6_dst);
switch (icmp6_code) {
case ICMP6_PARAMPROB_HEADER:
- ND_PRINT(", erroneous - octet %u", EXTRACT_BE_U_4(dp->icmp6_pptr));
+ ND_PRINT(", erroneous - octet %u",
+ GET_BE_U_4(dp->icmp6_pptr));
break;
case ICMP6_PARAMPROB_NEXTHEADER:
- ND_PRINT(", next header - octet %u", EXTRACT_BE_U_4(dp->icmp6_pptr));
+ ND_PRINT(", next header - octet %u",
+ GET_BE_U_4(dp->icmp6_pptr));
break;
case ICMP6_PARAMPROB_OPTION:
- ND_PRINT(", option - octet %u", EXTRACT_BE_U_4(dp->icmp6_pptr));
+ ND_PRINT(", option - octet %u",
+ GET_BE_U_4(dp->icmp6_pptr));
+ break;
+ case ICMP6_PARAMPROB_FRAGHDRCHAIN:
+ ND_PRINT(", incomplete header chain - octet %u",
+ GET_BE_U_4(dp->icmp6_pptr));
break;
default:
ND_PRINT(", code-#%u",
break;
case ICMP6_ECHO_REQUEST:
case ICMP6_ECHO_REPLY:
- ND_TCHECK_2(dp->icmp6_seq);
- ND_PRINT(", seq %u", EXTRACT_BE_U_2(dp->icmp6_seq));
+ ND_PRINT(", id %u, seq %u", GET_BE_U_2(dp->icmp6_id),
+ GET_BE_U_2(dp->icmp6_seq));
break;
case ICMP6_MEMBERSHIP_QUERY:
if (length == MLD_MINLEN) {
case ND_ROUTER_SOLICIT:
#define RTSOLLEN 8
if (ndo->ndo_vflag) {
- icmp6_opt_print(ndo, (const u_char *)dp + RTSOLLEN,
- length - RTSOLLEN);
+ if (icmp6_opt_print(ndo, (const u_char *)dp + RTSOLLEN,
+ length - RTSOLLEN) == -1)
+ goto trunc;
}
break;
case ND_ROUTER_ADVERT:
const struct nd_router_advert *p;
p = (const struct nd_router_advert *)dp;
- ND_TCHECK_4(p->nd_ra_retransmit);
ND_PRINT("\n\thop limit %u, Flags [%s]"
- ", pref %s, router lifetime %us, reachable time %us, retrans time %us",
- EXTRACT_U_1(p->nd_ra_curhoplimit),
- bittok2str(icmp6_opt_ra_flag_values,"none",EXTRACT_U_1(p->nd_ra_flags_reserved)),
- get_rtpref(EXTRACT_U_1(p->nd_ra_flags_reserved)),
- EXTRACT_BE_U_2(p->nd_ra_router_lifetime),
- EXTRACT_BE_U_4(p->nd_ra_reachable),
- EXTRACT_BE_U_4(p->nd_ra_retransmit));
-
- icmp6_opt_print(ndo, (const u_char *)dp + RTADVLEN,
- length - RTADVLEN);
+ ", pref %s, router lifetime %us, reachable time %ums, retrans timer %ums",
+ GET_U_1(p->nd_ra_curhoplimit),
+ bittok2str(icmp6_opt_ra_flag_values,"none",GET_U_1(p->nd_ra_flags_reserved)),
+ get_rtpref(GET_U_1(p->nd_ra_flags_reserved)),
+ GET_BE_U_2(p->nd_ra_router_lifetime),
+ GET_BE_U_4(p->nd_ra_reachable),
+ GET_BE_U_4(p->nd_ra_retransmit));
+
+ if (icmp6_opt_print(ndo, (const u_char *)dp + RTADVLEN,
+ length - RTADVLEN) == -1)
+ goto trunc;
}
break;
case ND_NEIGHBOR_SOLICIT:
{
const struct nd_neighbor_solicit *p;
p = (const struct nd_neighbor_solicit *)dp;
- ND_TCHECK_16(p->nd_ns_target);
- ND_PRINT(", who has %s", ip6addr_string(ndo, p->nd_ns_target));
+ ND_PRINT(", who has %s", GET_IP6ADDR_STRING(p->nd_ns_target));
if (ndo->ndo_vflag) {
#define NDSOLLEN 24
- icmp6_opt_print(ndo, (const u_char *)dp + NDSOLLEN,
- length - NDSOLLEN);
+ if (icmp6_opt_print(ndo, (const u_char *)dp + NDSOLLEN,
+ length - NDSOLLEN) == -1)
+ goto trunc;
}
}
break;
const struct nd_neighbor_advert *p;
p = (const struct nd_neighbor_advert *)dp;
- ND_TCHECK_16(p->nd_na_target);
ND_PRINT(", tgt is %s",
- ip6addr_string(ndo, p->nd_na_target));
+ GET_IP6ADDR_STRING(p->nd_na_target));
if (ndo->ndo_vflag) {
ND_PRINT(", Flags [%s]",
bittok2str(icmp6_nd_na_flag_values,
"none",
- EXTRACT_BE_U_4(p->nd_na_flags_reserved)));
+ GET_BE_U_4(p->nd_na_flags_reserved)));
#define NDADVLEN 24
- icmp6_opt_print(ndo, (const u_char *)dp + NDADVLEN,
- length - NDADVLEN);
+ if (icmp6_opt_print(ndo, (const u_char *)dp + NDADVLEN,
+ length - NDADVLEN) == -1)
+ goto trunc;
#undef NDADVLEN
}
}
const struct nd_redirect *p;
p = (const struct nd_redirect *)dp;
- ND_TCHECK_16(p->nd_rd_dst);
- ND_PRINT(", %s", ip6addr_string(ndo, p->nd_rd_dst));
- ND_TCHECK_16(p->nd_rd_target);
- ND_PRINT(" to %s", ip6addr_string(ndo, p->nd_rd_target));
+ ND_PRINT(", %s", GET_IP6ADDR_STRING(p->nd_rd_dst));
+ ND_PRINT(" to %s", GET_IP6ADDR_STRING(p->nd_rd_target));
#define REDIRECTLEN 40
if (ndo->ndo_vflag) {
- icmp6_opt_print(ndo, (const u_char *)dp + REDIRECTLEN,
- length - REDIRECTLEN);
+ if (icmp6_opt_print(ndo, (const u_char *)dp + REDIRECTLEN,
+ length - REDIRECTLEN) == -1)
+ goto trunc;
#undef REDIRECTLEN
}
}
break;
case ICMP6_MOBILEPREFIX_SOLICIT: /* fall through */
case ICMP6_HADISCOV_REQUEST:
- ND_TCHECK_2(dp->icmp6_data16[0]);
- ND_PRINT(", id 0x%04x", EXTRACT_BE_U_2(dp->icmp6_data16[0]));
+ ND_PRINT(", id 0x%04x", GET_BE_U_2(dp->icmp6_data16[0]));
break;
case ICMP6_HADISCOV_REPLY:
if (ndo->ndo_vflag) {
const u_char *cp;
const u_char *p;
- ND_TCHECK_2(dp->icmp6_data16[0]);
- ND_PRINT(", id 0x%04x", EXTRACT_BE_U_2(dp->icmp6_data16[0]));
+ ND_PRINT(", id 0x%04x",
+ GET_BE_U_2(dp->icmp6_data16[0]));
cp = (const u_char *)dp + length;
p = (const u_char *)(dp + 1);
while (p < cp) {
- ND_TCHECK_16(p);
- ND_PRINT(", %s", ip6addr_string(ndo, p));
+ ND_PRINT(", %s", GET_IP6ADDR_STRING(p));
p += 16;
}
}
if (ndo->ndo_vflag) {
uint16_t flags;
- ND_TCHECK_2(dp->icmp6_data16[0]);
- ND_PRINT(", id 0x%04x", EXTRACT_BE_U_2(dp->icmp6_data16[0]));
- ND_TCHECK_2(dp->icmp6_data16[1]);
- flags = EXTRACT_BE_U_2(dp->icmp6_data16[1]);
+ ND_PRINT(", id 0x%04x",
+ GET_BE_U_2(dp->icmp6_data16[0]));
+ flags = GET_BE_U_2(dp->icmp6_data16[1]);
if (flags & 0xc000)
ND_PRINT(" ");
if (flags & 0x8000)
if (flags & 0x4000)
ND_PRINT("O");
#define MPADVLEN 8
- icmp6_opt_print(ndo, (const u_char *)dp + MPADVLEN,
- length - MPADVLEN);
+ if (icmp6_opt_print(ndo, (const u_char *)dp + MPADVLEN,
+ length - MPADVLEN) == -1)
+ goto trunc;
}
break;
case ND_RPL_MESSAGE:
ND_PRINT(", length %u", length);
return;
trunc:
- ND_PRINT("[|icmp6]");
+ nd_print_trunc(ndo);
}
static const struct udphdr *
if (!ND_TTEST_1(ip6->ip6_nxt))
return NULL;
- nh = EXTRACT_U_1(ip6->ip6_nxt);
+ nh = GET_U_1(ip6->ip6_nxt);
hlen = sizeof(struct ip6_hdr);
while (bp < ep) {
if (ND_TTEST_2(uh->uh_dport)) {
*prot = nh;
return(uh);
- }
- else
+ } else
return(NULL);
/* NOTREACHED */
hbh = (const struct ip6_hbh *)bp;
if (!ND_TTEST_1(hbh->ip6h_len))
return(NULL);
- nh = EXTRACT_U_1(hbh->ip6h_nxt);
- hlen = (EXTRACT_U_1(hbh->ip6h_len) + 1) << 3;
+ nh = GET_U_1(hbh->ip6h_nxt);
+ hlen = (GET_U_1(hbh->ip6h_len) + 1) << 3;
break;
case IPPROTO_FRAGMENT: /* this should be odd, but try anyway */
if (!ND_TTEST_2(fragh->ip6f_offlg))
return(NULL);
/* fragments with non-zero offset are meaningless */
- if ((EXTRACT_BE_U_2(fragh->ip6f_offlg) & IP6F_OFF_MASK) != 0)
+ if ((GET_BE_U_2(fragh->ip6f_offlg) & IP6F_OFF_MASK) != 0)
return(NULL);
- nh = EXTRACT_U_1(fragh->ip6f_nxt);
+ nh = GET_U_1(fragh->ip6f_nxt);
hlen = sizeof(struct ip6_frag);
break;
ah = (const struct ah *)bp;
if (!ND_TTEST_1(ah->ah_len))
return(NULL);
- nh = EXTRACT_U_1(ah->ah_nxt);
- hlen = (EXTRACT_U_1(ah->ah_len) + 2) << 2;
+ nh = GET_U_1(ah->ah_nxt);
+ hlen = (GET_U_1(ah->ah_len) + 2) << 2;
break;
default: /* unknown or undecodable header */
return(NULL); /* should be notreached, though */
}
-static void
+static int
icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
{
const struct nd_opt_hdr *op;
- uint8_t opt_type, opt_len;
+ uint8_t opt_type;
+ u_int opt_len;
const struct nd_opt_prefix_info *opp;
const struct nd_opt_mtu *opm;
const struct nd_opt_rdnss *oprd;
const struct nd_opt_homeagent_info *oph;
const struct nd_opt_route_info *opri;
const u_char *cp, *ep, *domp;
- struct in6_addr in6;
+ nd_ipv6 in6;
size_t l;
u_int i;
ND_TCHECK_1(op->nd_opt_len);
if (resid <= 0)
- return;
- opt_type = EXTRACT_U_1(op->nd_opt_type);
- opt_len = EXTRACT_U_1(op->nd_opt_len);
+ return 0;
+ opt_type = GET_U_1(op->nd_opt_type);
+ opt_len = GET_U_1(op->nd_opt_len);
if (opt_len == 0)
goto trunc;
if (cp + (opt_len << 3) > ep)
break;
case ND_OPT_PREFIX_INFORMATION:
opp = (const struct nd_opt_prefix_info *)op;
- ND_TCHECK_16(opp->nd_opt_pi_prefix);
ND_PRINT("%s/%u%s, Flags [%s], valid time %s",
- ip6addr_string(ndo, opp->nd_opt_pi_prefix),
- EXTRACT_U_1(opp->nd_opt_pi_prefix_len),
+ GET_IP6ADDR_STRING(opp->nd_opt_pi_prefix),
+ GET_U_1(opp->nd_opt_pi_prefix_len),
(opt_len != 4) ? "badlen" : "",
- bittok2str(icmp6_opt_pi_flag_values, "none", EXTRACT_U_1(opp->nd_opt_pi_flags_reserved)),
- get_lifetime(EXTRACT_BE_U_4(opp->nd_opt_pi_valid_time)));
- ND_PRINT(", pref. time %s", get_lifetime(EXTRACT_BE_U_4(opp->nd_opt_pi_preferred_time)));
+ bittok2str(icmp6_opt_pi_flag_values, "none", GET_U_1(opp->nd_opt_pi_flags_reserved)),
+ get_lifetime(GET_BE_U_4(opp->nd_opt_pi_valid_time)));
+ ND_PRINT(", pref. time %s",
+ get_lifetime(GET_BE_U_4(opp->nd_opt_pi_preferred_time)));
break;
case ND_OPT_REDIRECTED_HEADER:
print_unknown_data(ndo, bp,"\n\t ",opt_len<<3);
break;
case ND_OPT_MTU:
opm = (const struct nd_opt_mtu *)op;
- ND_TCHECK_4(opm->nd_opt_mtu_mtu);
ND_PRINT(" %u%s",
- EXTRACT_BE_U_4(opm->nd_opt_mtu_mtu),
+ GET_BE_U_4(opm->nd_opt_mtu_mtu),
(opt_len != 1) ? "bad option length" : "" );
break;
case ND_OPT_RDNSS:
oprd = (const struct nd_opt_rdnss *)op;
l = (opt_len - 1) / 2;
ND_PRINT(" lifetime %us,",
- EXTRACT_BE_U_4(oprd->nd_opt_rdnss_lifetime));
+ GET_BE_U_4(oprd->nd_opt_rdnss_lifetime));
for (i = 0; i < l; i++) {
- ND_TCHECK_16(oprd->nd_opt_rdnss_addr[i]);
ND_PRINT(" addr: %s",
- ip6addr_string(ndo, oprd->nd_opt_rdnss_addr[i]));
+ GET_IP6ADDR_STRING(oprd->nd_opt_rdnss_addr[i]));
}
break;
case ND_OPT_DNSSL:
opds = (const struct nd_opt_dnssl *)op;
ND_PRINT(" lifetime %us, domain(s):",
- EXTRACT_BE_U_4(opds->nd_opt_dnssl_lifetime));
+ GET_BE_U_4(opds->nd_opt_dnssl_lifetime));
domp = cp + 8; /* domain names, variable-sized, RFC1035-encoded */
- while (domp < cp + (opt_len << 3) && EXTRACT_U_1(domp) != '\0')
- {
+ while (domp < cp + (opt_len << 3) && GET_U_1(domp) != '\0') {
ND_PRINT(" ");
- if ((domp = ns_nprint(ndo, domp, bp)) == NULL)
+ if ((domp = fqdn_print(ndo, domp, bp)) == NULL)
goto trunc;
}
break;
case ND_OPT_ADVINTERVAL:
opa = (const struct nd_opt_advinterval *)op;
- ND_TCHECK_4(opa->nd_opt_adv_interval);
- ND_PRINT(" %ums", EXTRACT_BE_U_4(opa->nd_opt_adv_interval));
+ ND_PRINT(" %ums",
+ GET_BE_U_4(opa->nd_opt_adv_interval));
break;
case ND_OPT_HOMEAGENT_INFO:
oph = (const struct nd_opt_homeagent_info *)op;
- ND_TCHECK_2(oph->nd_opt_hai_lifetime);
ND_PRINT(" preference %u, lifetime %u",
- EXTRACT_BE_U_2(oph->nd_opt_hai_preference),
- EXTRACT_BE_U_2(oph->nd_opt_hai_lifetime));
+ GET_BE_U_2(oph->nd_opt_hai_preference),
+ GET_BE_U_2(oph->nd_opt_hai_lifetime));
break;
case ND_OPT_ROUTE_INFO:
opri = (const struct nd_opt_route_info *)op;
case 1:
break;
case 2:
- ND_TCHECK_8(opri + 1);
- memcpy(&in6, opri + 1, 8);
+ GET_CPY_BYTES(&in6, opri + 1, 8);
break;
case 3:
- ND_TCHECK_16(opri + 1);
- memcpy(&in6, opri + 1, 16);
+ GET_CPY_BYTES(&in6, opri + 1, 16);
break;
default:
goto trunc;
}
- ND_PRINT(" %s/%u", ip6addr_string(ndo, (const u_char *)&in6),
- EXTRACT_U_1(opri->nd_opt_rti_prefixlen));
- ND_PRINT(", pref=%s", get_rtpref(EXTRACT_U_1(opri->nd_opt_rti_flags)));
+ ND_PRINT(" %s/%u", ip6addr_string(ndo, (const u_char *)&in6), /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */
+ GET_U_1(opri->nd_opt_rti_prefixlen));
+ ND_PRINT(", pref=%s",
+ get_rtpref(GET_U_1(opri->nd_opt_rti_flags)));
ND_PRINT(", lifetime=%s",
- get_lifetime(EXTRACT_BE_U_4(opri->nd_opt_rti_lifetime)));
+ get_lifetime(GET_BE_U_4(opri->nd_opt_rti_lifetime)));
break;
default:
if (ndo->ndo_vflag <= 1) {
print_unknown_data(ndo,cp+2,"\n\t ", (opt_len << 3) - 2); /* skip option header */
- return;
+ return 0;
}
break;
}
cp += opt_len << 3;
resid -= opt_len << 3;
}
- return;
+ return 0;
- trunc:
- ND_PRINT("[ndp opt]");
- return;
+trunc:
+ return -1;
}
static void
if ((const u_char *)mp + sizeof(*mp) > ep)
return;
- ND_PRINT("max resp delay: %u ", EXTRACT_BE_U_2(mp->mld6_maxdelay));
- ND_PRINT("addr: %s", ip6addr_string(ndo, mp->mld6_addr));
+ ND_PRINT("max resp delay: %u ", GET_BE_U_2(mp->mld6_maxdelay));
+ ND_PRINT("addr: %s", GET_IP6ADDR_STRING(mp->mld6_addr));
}
static void
return;
}
- ND_TCHECK_2(icp->icmp6_data16[1]);
- ngroups = EXTRACT_BE_U_2(icp->icmp6_data16[1]);
+ ngroups = GET_BE_U_2(icp->icmp6_data16[1]);
ND_PRINT(", %u group record(s)", ngroups);
if (ndo->ndo_vflag > 0) {
/* Print the group records */
ND_PRINT(" [invalid number of groups]");
return;
}
- ND_TCHECK_LEN(bp + 4 + group, sizeof(nd_ipv6));
- ND_PRINT(" [gaddr %s", ip6addr_string(ndo, bp + group + 4));
+ ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + group + 4));
ND_PRINT(" %s", tok2str(mldv2report2str, " [v2-report-#%u]",
- EXTRACT_U_1(bp + group)));
- nsrcs = EXTRACT_BE_U_2(bp + group + 2);
+ GET_U_1(bp + group)));
+ nsrcs = GET_BE_U_2(bp + group + 2);
/* Check the number of sources and print them */
if (len < group + 20 + (nsrcs * sizeof(nd_ipv6))) {
ND_PRINT(" [invalid number of sources %u]", nsrcs);
/* Print the sources */
ND_PRINT(" {");
for (j = 0; j < nsrcs; j++) {
- ND_TCHECK_LEN(bp + group + 20 + (j * sizeof(nd_ipv6)),
- sizeof(nd_ipv6));
- ND_PRINT(" %s", ip6addr_string(ndo, bp + group + 20 + (j * sizeof(nd_ipv6))));
+ ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + group + 20 + (j * sizeof(nd_ipv6))));
}
ND_PRINT(" }");
}
ND_PRINT("]");
}
}
- return;
-trunc:
- ND_PRINT("[|icmp6]");
- return;
}
static void
ND_PRINT(" [invalid len %u]", len);
return;
}
- ND_TCHECK_2(icp->icmp6_data16[0]);
- mrc = EXTRACT_BE_U_2(icp->icmp6_data16[0]);
+ mrc = GET_BE_U_2(icp->icmp6_data16[0]);
if (mrc < 32768) {
mrt = mrc;
} else {
if (ndo->ndo_vflag) {
ND_PRINT(" [max resp delay=%u]", mrt);
}
- ND_TCHECK_LEN(bp + 8, sizeof(nd_ipv6));
- ND_PRINT(" [gaddr %s", ip6addr_string(ndo, bp + 8));
+ ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + 8));
if (ndo->ndo_vflag) {
- ND_TCHECK_1(bp + 25);
- if (EXTRACT_U_1(bp + 24) & 0x08) {
+ if (GET_U_1(bp + 24) & 0x08) {
ND_PRINT(" sflag");
}
- if (EXTRACT_U_1(bp + 24) & 0x07) {
- ND_PRINT(" robustness=%u", EXTRACT_U_1(bp + 24) & 0x07);
+ if (GET_U_1(bp + 24) & 0x07) {
+ ND_PRINT(" robustness=%u", GET_U_1(bp + 24) & 0x07);
}
- if (EXTRACT_U_1(bp + 25) < 128) {
- qqi = EXTRACT_U_1(bp + 25);
+ if (GET_U_1(bp + 25) < 128) {
+ qqi = GET_U_1(bp + 25);
} else {
- qqi = ((EXTRACT_U_1(bp + 25) & 0x0f) | 0x10) <<
- (((EXTRACT_U_1(bp + 25) & 0x70) >> 4) + 3);
+ qqi = ((GET_U_1(bp + 25) & 0x0f) | 0x10) <<
+ (((GET_U_1(bp + 25) & 0x70) >> 4) + 3);
}
ND_PRINT(" qqi=%u", qqi);
}
- ND_TCHECK_2(bp + 26);
- nsrcs = EXTRACT_BE_U_2(bp + 26);
+ nsrcs = GET_BE_U_2(bp + 26);
if (nsrcs > 0) {
if (len < 28 + nsrcs * sizeof(nd_ipv6))
ND_PRINT(" [invalid number of sources]");
else if (ndo->ndo_vflag > 1) {
ND_PRINT(" {");
for (i = 0; i < nsrcs; i++) {
- ND_TCHECK_LEN(bp + 28 + (i * sizeof(nd_ipv6)),
- sizeof(nd_ipv6));
- ND_PRINT(" %s", ip6addr_string(ndo, bp + 28 + (i * sizeof(nd_ipv6))));
+ ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + 28 + (i * sizeof(nd_ipv6))));
}
ND_PRINT(" }");
} else
ND_PRINT(", %u source(s)", nsrcs);
}
ND_PRINT("]");
- return;
-trunc:
- ND_PRINT("[|icmp6]");
- return;
}
static void
/* DNS name decoding - no decompression */
ND_PRINT(", \"");
while (cp < ep) {
- i = EXTRACT_U_1(cp);
+ i = GET_U_1(cp);
cp++;
if (i) {
if (i > ep - cp) {
break;
}
while (i-- && cp < ep) {
- fn_print_char(ndo, EXTRACT_U_1(cp));
+ fn_print_char(ndo, GET_U_1(cp));
cp++;
}
- if (cp + 1 < ep && EXTRACT_U_1(cp))
+ if (cp + 1 < ep && GET_U_1(cp))
ND_PRINT(".");
} else {
if (cp == ep) {
/* FQDN */
ND_PRINT(".");
- } else if (cp + 1 == ep && EXTRACT_U_1(cp) == '\0') {
+ } else if (cp + 1 == ep && GET_U_1(cp) == '\0') {
/* truncated */
} else {
/* invalid */
ni6 = (const struct icmp6_nodeinfo *)bp;
siz = ep - bp;
- switch (EXTRACT_U_1(ni6->ni_type)) {
+ switch (GET_U_1(ni6->ni_type)) {
case ICMP6_NI_QUERY:
if (siz == sizeof(*dp) + 4) {
/* KAME who-are-you */
ND_TCHECK_LEN(dp, sizeof(*ni6));
ni6 = (const struct icmp6_nodeinfo *)dp;
ND_PRINT(" ("); /*)*/
- switch (EXTRACT_BE_U_2(ni6->ni_qtype)) {
+ switch (GET_BE_U_2(ni6->ni_qtype)) {
case NI_QTYPE_NOOP:
ND_PRINT("noop");
break;
case NI_QTYPE_SUPTYPES:
ND_PRINT("supported qtypes");
- i = EXTRACT_BE_U_2(ni6->ni_flags);
+ i = GET_BE_U_2(ni6->ni_flags);
if (i)
ND_PRINT(" [%s]", (i & 0x01) ? "C" : "");
break;
break;
case NI_QTYPE_NODEADDR:
ND_PRINT("node addresses");
- i = EXTRACT_BE_U_2(ni6->ni_flags);
+ i = GET_BE_U_2(ni6->ni_flags);
if (!i)
break;
/* NI_NODEADDR_FLAG_TRUNCATE undefined for query */
break;
}
- if (EXTRACT_BE_U_2(ni6->ni_qtype) == NI_QTYPE_NOOP ||
- EXTRACT_BE_U_2(ni6->ni_qtype) == NI_QTYPE_SUPTYPES) {
+ if (GET_BE_U_2(ni6->ni_qtype) == NI_QTYPE_NOOP ||
+ GET_BE_U_2(ni6->ni_qtype) == NI_QTYPE_SUPTYPES) {
if (siz != sizeof(*ni6))
if (ndo->ndo_vflag)
ND_PRINT(", invalid len");
break;
}
-
/* XXX backward compat, icmp-name-lookup-03 */
if (siz == sizeof(*ni6)) {
ND_PRINT(", 03 draft");
}
cp = (const u_char *)(ni6 + 1);
- switch (EXTRACT_U_1(ni6->ni_code)) {
+ switch (GET_U_1(ni6->ni_code)) {
case ICMP6_NI_SUBJ_IPV6:
if (!ND_TTEST_LEN(dp, sizeof(*ni6) + sizeof(nd_ipv6)))
break;
break;
}
ND_PRINT(", subject=%s",
- ip6addr_string(ndo, cp));
+ GET_IP6ADDR_STRING(cp));
break;
case ICMP6_NI_SUBJ_FQDN:
ND_PRINT(", subject=DNS name");
- if (EXTRACT_U_1(cp) == ep - cp - 1) {
+ if (GET_U_1(cp) == ep - cp - 1) {
/* icmp-name-lookup-03, pascal string */
if (ndo->ndo_vflag)
ND_PRINT(", 03 draft");
cp++;
ND_PRINT(", \"");
while (cp < ep) {
- fn_print_char(ndo, EXTRACT_U_1(cp));
+ fn_print_char(ndo, GET_U_1(cp));
cp++;
}
ND_PRINT("\"");
break;
}
ND_PRINT(", subject=%s",
- ipaddr_string(ndo, cp));
+ GET_IPADDR_STRING(cp));
break;
default:
ND_PRINT(", unknown subject");
break;
case ICMP6_NI_REPLY:
- if (icmp6len > siz) {
- ND_PRINT("[|icmp6: node information reply]");
- break;
- }
+ if (icmp6len > siz)
+ goto trunc;
needcomma = 0;
ni6 = (const struct icmp6_nodeinfo *)dp;
ND_PRINT(" node information reply");
ND_PRINT(" ("); /*)*/
- switch (EXTRACT_U_1(ni6->ni_code)) {
+ switch (GET_U_1(ni6->ni_code)) {
case ICMP6_NI_SUCCESS:
if (ndo->ndo_vflag) {
ND_PRINT("success");
break;
}
- if (EXTRACT_U_1(ni6->ni_code) != ICMP6_NI_SUCCESS) {
+ if (GET_U_1(ni6->ni_code) != ICMP6_NI_SUCCESS) {
/*(*/
ND_PRINT(")");
break;
}
- switch (EXTRACT_BE_U_2(ni6->ni_qtype)) {
+ switch (GET_BE_U_2(ni6->ni_qtype)) {
case NI_QTYPE_NOOP:
if (needcomma)
ND_PRINT(", ");
if (needcomma)
ND_PRINT(", ");
ND_PRINT("supported qtypes");
- i = EXTRACT_BE_U_2(ni6->ni_flags);
+ i = GET_BE_U_2(ni6->ni_flags);
if (i)
ND_PRINT(" [%s]", (i & 0x01) ? "C" : "");
break;
ND_PRINT(", ");
ND_PRINT("DNS name");
cp = (const u_char *)(ni6 + 1) + 4;
- ND_TCHECK_1(cp);
- if (EXTRACT_U_1(cp) == ep - cp - 1) {
+ if (GET_U_1(cp) == ep - cp - 1) {
/* icmp-name-lookup-03, pascal string */
if (ndo->ndo_vflag)
ND_PRINT(", 03 draft");
cp++;
ND_PRINT(", \"");
while (cp < ep) {
- fn_print_char(ndo, EXTRACT_U_1(cp));
+ fn_print_char(ndo, GET_U_1(cp));
cp++;
}
ND_PRINT("\"");
} else
dnsname_print(ndo, cp, ep);
- if ((EXTRACT_BE_U_2(ni6->ni_flags) & 0x01) != 0)
- ND_PRINT(" [TTL=%u]", EXTRACT_BE_U_4(ni6 + 1));
+ if ((GET_BE_U_2(ni6->ni_flags) & 0x01) != 0)
+ ND_PRINT(" [TTL=%u]", GET_BE_U_4(ni6 + 1));
break;
case NI_QTYPE_NODEADDR:
if (needcomma)
if (i + sizeof(uint32_t) + sizeof(nd_ipv6) > siz)
break;
ND_PRINT(" %s(%u)",
- ip6addr_string(ndo, bp + i + sizeof(uint32_t)),
- EXTRACT_BE_U_4(bp + i));
+ GET_IP6ADDR_STRING(bp + i + sizeof(uint32_t)),
+ GET_BE_U_4(bp + i));
i += sizeof(uint32_t) + sizeof(nd_ipv6);
}
- i = EXTRACT_BE_U_2(ni6->ni_flags);
+ i = GET_BE_U_2(ni6->ni_flags);
if (!i)
break;
ND_PRINT(" [%s%s%s%s%s%s%s]",
return;
trunc:
- ND_PRINT("[|icmp6]");
+ nd_print_trunc(ndo);
}
static void
cp = (const char *)(rr6 + 1);
ND_TCHECK_4(rr6->rr_reserved);
- switch (EXTRACT_U_1(rr6->rr_code)) {
+ switch (GET_U_1(rr6->rr_code)) {
case ICMP6_ROUTER_RENUMBERING_COMMAND:
- ND_PRINT("router renum: command");
+ ND_PRINT(", command");
break;
case ICMP6_ROUTER_RENUMBERING_RESULT:
- ND_PRINT("router renum: result");
+ ND_PRINT(", result");
break;
case ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET:
- ND_PRINT("router renum: sequence number reset");
+ ND_PRINT(", sequence number reset");
break;
default:
- ND_PRINT("router renum: code-#%u", EXTRACT_U_1(rr6->rr_code));
+ ND_PRINT(", code-#%u", GET_U_1(rr6->rr_code));
break;
}
- ND_PRINT(", seq=%u", EXTRACT_BE_U_4(rr6->rr_seqnum));
+ ND_PRINT(", seq=%u", GET_BE_U_4(rr6->rr_seqnum));
if (ndo->ndo_vflag) {
- uint8_t rr_flags = EXTRACT_U_1(rr6->rr_flags);
+ uint8_t rr_flags = GET_U_1(rr6->rr_flags);
#define F(x, y) (rr_flags & (x) ? (y) : "")
ND_PRINT("["); /*]*/
if (rr_flags) {
F(ICMP6_RR_FLAGS_SPECSITE, "S"),
F(ICMP6_RR_FLAGS_PREVDONE, "P"));
}
- ND_PRINT("seg=%u,", EXTRACT_U_1(rr6->rr_segnum));
- ND_PRINT("maxdelay=%u", EXTRACT_BE_U_2(rr6->rr_maxdelay));
- if (EXTRACT_BE_U_4(rr6->rr_reserved))
- ND_PRINT("rsvd=0x%x", EXTRACT_BE_U_4(rr6->rr_reserved));
+ ND_PRINT("seg=%u,", GET_U_1(rr6->rr_segnum));
+ ND_PRINT("maxdelay=%u", GET_BE_U_2(rr6->rr_maxdelay));
+ if (GET_BE_U_4(rr6->rr_reserved))
+ ND_PRINT("rsvd=0x%x", GET_BE_U_4(rr6->rr_reserved));
/*[*/
ND_PRINT("]");
#undef F
}
- if (EXTRACT_U_1(rr6->rr_code) == ICMP6_ROUTER_RENUMBERING_COMMAND) {
+ if (GET_U_1(rr6->rr_code) == ICMP6_ROUTER_RENUMBERING_COMMAND) {
match = (const struct rr_pco_match *)cp;
cp = (const char *)(match + 1);
else
ND_PRINT(" ");
ND_PRINT("match("); /*)*/
- switch (EXTRACT_U_1(match->rpm_code)) {
+ switch (GET_U_1(match->rpm_code)) {
case RPM_PCO_ADD: ND_PRINT("add"); break;
case RPM_PCO_CHANGE: ND_PRINT("change"); break;
case RPM_PCO_SETGLOBAL: ND_PRINT("setglobal"); break;
- default: ND_PRINT("#%u", EXTRACT_U_1(match->rpm_code)); break;
+ default: ND_PRINT("#%u",
+ GET_U_1(match->rpm_code)); break;
}
if (ndo->ndo_vflag) {
- ND_PRINT(",ord=%u", EXTRACT_U_1(match->rpm_ordinal));
- ND_PRINT(",min=%u", EXTRACT_U_1(match->rpm_minlen));
- ND_PRINT(",max=%u", EXTRACT_U_1(match->rpm_maxlen));
+ ND_PRINT(",ord=%u", GET_U_1(match->rpm_ordinal));
+ ND_PRINT(",min=%u", GET_U_1(match->rpm_minlen));
+ ND_PRINT(",max=%u", GET_U_1(match->rpm_maxlen));
}
if (addrtostr6(match->rpm_prefix, hbuf, sizeof(hbuf)))
- ND_PRINT(",%s/%u", hbuf, EXTRACT_U_1(match->rpm_matchlen));
+ ND_PRINT(",%s/%u", hbuf, GET_U_1(match->rpm_matchlen));
else
- ND_PRINT(",?/%u", EXTRACT_U_1(match->rpm_matchlen));
+ ND_PRINT(",?/%u", GET_U_1(match->rpm_matchlen));
/*(*/
ND_PRINT(")");
- n = EXTRACT_U_1(match->rpm_len) - 3;
+ n = GET_U_1(match->rpm_len) - 3;
if (n % 4)
goto trunc;
n /= 4;
else
ND_PRINT(" ");
ND_PRINT("use("); /*)*/
- if (EXTRACT_U_1(use->rpu_flags)) {
-#define F(x, y) (EXTRACT_U_1(use->rpu_flags) & (x) ? (y) : "")
+ if (GET_U_1(use->rpu_flags)) {
+#define F(x, y) (GET_U_1(use->rpu_flags) & (x) ? (y) : "")
ND_PRINT("%s%s,",
F(ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME, "V"),
F(ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME, "P"));
#undef F
}
if (ndo->ndo_vflag) {
- ND_PRINT("mask=0x%x,", EXTRACT_U_1(use->rpu_ramask));
- ND_PRINT("raflags=0x%x,", EXTRACT_U_1(use->rpu_raflags));
- if (EXTRACT_BE_U_4(use->rpu_vltime) == 0xffffffff)
+ ND_PRINT("mask=0x%x,",
+ GET_U_1(use->rpu_ramask));
+ ND_PRINT("raflags=0x%x,",
+ GET_U_1(use->rpu_raflags));
+ if (GET_BE_U_4(use->rpu_vltime) == 0xffffffff)
ND_PRINT("vltime=infty,");
else
ND_PRINT("vltime=%u,",
- EXTRACT_BE_U_4(use->rpu_vltime));
- if (EXTRACT_BE_U_4(use->rpu_pltime) == 0xffffffff)
+ GET_BE_U_4(use->rpu_vltime));
+ if (GET_BE_U_4(use->rpu_pltime) == 0xffffffff)
ND_PRINT("pltime=infty,");
else
ND_PRINT("pltime=%u,",
- EXTRACT_BE_U_4(use->rpu_pltime));
+ GET_BE_U_4(use->rpu_pltime));
}
if (addrtostr6(use->rpu_prefix, hbuf, sizeof(hbuf)))
- ND_PRINT("%s/%u/%u", hbuf, EXTRACT_U_1(use->rpu_uselen),
- EXTRACT_U_1(use->rpu_keeplen));
+ ND_PRINT("%s/%u/%u", hbuf,
+ GET_U_1(use->rpu_uselen),
+ GET_U_1(use->rpu_keeplen));
else
- ND_PRINT("?/%u/%u", EXTRACT_U_1(use->rpu_uselen),
- EXTRACT_U_1(use->rpu_keeplen));
+ ND_PRINT("?/%u/%u", GET_U_1(use->rpu_uselen),
+ GET_U_1(use->rpu_keeplen));
/*(*/
ND_PRINT(")");
}
return;
trunc:
- ND_PRINT("[|icmp6]");
+ nd_print_trunc(ndo);
}
projects / tcpdump / blobdiff