/* \summary: IPv6 Internet Control Message Protocol (ICMPv6) printer */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "netdissect-stdinc.h"
#include "ip6.h"
#include "ipproto.h"
+#include "icmp.h"
#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_id icmp6_data16[0] /* echo request/reply */
#define icmp6_seq icmp6_data16[1] /* echo request/reply */
#define icmp6_maxdelay icmp6_data16[0] /* mcast group membership */
+#define icmp6_xseq icmp6_data8[2] /* extended echo request/reply */
+#define icmp6_xinfo icmp6_data8[3] /* extended echo request/reply */
#define ICMP6_DST_UNREACH 1 /* dest unreachable, codes: */
#define ICMP6_PACKET_TOO_BIG 2 /* packet too big */
#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_HADISCOV_REPLY 145
#define ICMP6_MOBILEPREFIX_SOLICIT 146
#define ICMP6_MOBILEPREFIX_ADVERT 147
+#define ICMP6_EXTENDED_ECHO_REQUEST 160 /* extended echo request */
+#define ICMP6_EXTENDED_ECHO_REPLY 161 /* extended echo reply */
#define MLD6_MTRACE_RESP 200 /* mtrace response(to sender) */
#define MLD6_MTRACE 201 /* mtrace messages */
#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 */
*/
struct nd_router_solicit { /* router solicitation */
- struct icmp6_hdr nd_rs_hdr;
+ struct icmp6_hdr nd_rs_hdr;
/* could be followed by options */
};
#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 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)
*/
#endif
};
-/* section 6.2.1, DODAG Information Solication (DIS_IS) */
+/* section 6.2.1, DODAG Information Solicitation (DIS_IS) */
struct nd_rpl_dis_is {
nd_uint8_t rpl_dis_flags;
nd_uint8_t rpl_dis_reserved;
{ MLD6_MTRACE, "mtrace message"},
{ MLD6_MTRACE_RESP, "mtrace response"},
{ ND_RPL_MESSAGE, "RPL"},
+ { ICMP6_EXTENDED_ECHO_REQUEST, "extended echo request"},
+ { ICMP6_EXTENDED_ECHO_REPLY, "extended echo reply"},
{ 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"},
optlen = 1;
ND_PRINT(" opt:pad1");
} else {
- if (length < RPL_GENOPTION_LEN)
- goto trunc;
+ 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,
" ",
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 = 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;
}
if(ndo->ndo_vflag > 1) {
rpl_printopts(ndo, bp, length);
}
- return;
-
-trunc:
- nd_print_trunc(ndo);
- return;
-
-tooshort:
- ND_PRINT(" [|length too short]");
+ 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(GET_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);
+ ND_ICHECK_U(length, <, DAGID_LEN);
+ dagid_str = GET_IP6ADDR_STRING(daoack->rpl_dagid);
bp += DAGID_LEN;
length -= DAGID_LEN;
}
if(ndo->ndo_vflag > 1) {
rpl_printopts(ndo, bp, length);
}
- return;
-
-trunc:
- nd_print_trunc(ndo);
- return;
-
-tooshort:
- ND_PRINT(" [|dao-length too short]");
+ return;
+invalid:
+ nd_print_invalid(ndo);
}
static void
}
-
void
icmp6_print(netdissect_options *ndo,
const u_char *bp, u_int length, const u_char *bp2, int fragmented)
ND_PRINT(", id 0x%04x",
GET_BE_U_2(dp->icmp6_data16[0]));
- cp = (const u_char *)dp + length;
+ cp = (const u_char *)dp +
+ ND_MIN(length, ND_BYTES_AVAILABLE_AFTER(dp));
p = (const u_char *)(dp + 1);
while (p < cp) {
ND_PRINT(", %s", GET_IP6ADDR_STRING(p));
/* plus 4, because struct icmp6_hdr contains 4 bytes of icmp payload */
rpl_print(ndo, icmp6_code, dp->icmp6_data, length-sizeof(struct icmp6_hdr)+4);
break;
+ case ICMP6_EXTENDED_ECHO_REQUEST:
+ case ICMP6_EXTENDED_ECHO_REPLY:
+ ND_PRINT(", id %u, seq %u", GET_BE_U_2(dp->icmp6_id),
+ GET_U_1(dp->icmp6_xseq));
+ // The content of the message is the same as ICMP, so use the
+ // function defined in print-icmp.c
+ if (ndo->ndo_vflag) {
+ uint8_t xinfo = GET_U_1(dp->icmp6_xinfo);
+ print_icmp_rfc8335(ndo, xinfo, icmp6_type == ICMP6_EXTENDED_ECHO_REQUEST, icmp6_code, dp->icmp6_data + 4);
+ }
+ break;
default:
ND_PRINT(", length %u", length);
if (ndo->ndo_vflag <= 1)
if (ND_TTEST_2(uh->uh_dport)) {
*prot = nh;
return(uh);
- }
- else
+ } else
return(NULL);
/* NOTREACHED */
ND_PRINT(" lifetime %us, domain(s):",
GET_BE_U_4(opds->nd_opt_dnssl_lifetime));
domp = cp + 8; /* domain names, variable-sized, RFC1035-encoded */
- while (domp < cp + (opt_len << 3) && GET_U_1(domp) != '\0')
- {
+ while (domp < cp + (opt_len << 3) && GET_U_1(domp) != '\0') {
ND_PRINT(" ");
if ((domp = fqdn_print(ndo, domp, bp)) == NULL)
goto trunc;
default:
goto trunc;
}
- ND_PRINT(" %s/%u", ip6addr_string(ndo, (const u_char *)&in6),
+ 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)));
break;
}
-
/* XXX backward compat, icmp-name-lookup-03 */
if (siz == sizeof(*ni6)) {
ND_PRINT(", 03 draft");
ND_TCHECK_4(rr6->rr_reserved);
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", GET_U_1(rr6->rr_code));
+ ND_PRINT(", code-#%u", GET_U_1(rr6->rr_code));
break;
}
projects / tcpdump / blobdiff