X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/87c7396593cbfd23d1cbb803d9614b77f9630e50..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-icmp6.c diff --git a/print-icmp6.c b/print-icmp6.c index 4045ffac..bfdc3040 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -19,20 +19,20 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* \summary: IPv6 Internet Control Message Protocol (ICMPv6) printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#ifdef INET6 - -#include +#include #include #include #include "netdissect.h" -#include "interface.h" #include "addrtoname.h" +#include "addrtostr.h" #include "extract.h" #include "ip6.h" @@ -74,13 +74,13 @@ */ struct icmp6_hdr { - u_int8_t icmp6_type; /* type field */ - u_int8_t icmp6_code; /* code field */ - u_int16_t icmp6_cksum; /* checksum field */ + uint8_t icmp6_type; /* type field */ + uint8_t icmp6_code; /* code field */ + uint16_t icmp6_cksum; /* checksum field */ union { - u_int32_t icmp6_un_data32[1]; /* type-specific field */ - u_int16_t icmp6_un_data16[2]; /* type-specific field */ - u_int8_t icmp6_un_data8[4]; /* type-specific field */ + uint32_t icmp6_un_data32[1]; /* type-specific field */ + uint16_t icmp6_un_data16[2]; /* type-specific field */ + uint8_t icmp6_un_data8[4]; /* type-specific field */ } icmp6_dataun; }; @@ -201,8 +201,8 @@ struct nd_router_solicit { /* router solicitation */ struct nd_router_advert { /* router advertisement */ struct icmp6_hdr nd_ra_hdr; - u_int32_t nd_ra_reachable; /* reachable time */ - u_int32_t nd_ra_retransmit; /* retransmit timer */ + uint32_t nd_ra_reachable; /* reachable time */ + uint32_t nd_ra_retransmit; /* retransmit timer */ /* could be followed by options */ }; @@ -267,8 +267,8 @@ struct nd_redirect { /* redirect */ #define nd_rd_reserved nd_rd_hdr.icmp6_data32[0] struct nd_opt_hdr { /* Neighbor discovery option header */ - u_int8_t nd_opt_type; - u_int8_t nd_opt_len; + nd_uint8_t nd_opt_type; + nd_uint8_t nd_opt_len; /* followed by option specific data*/ }; @@ -284,13 +284,13 @@ struct nd_opt_hdr { /* Neighbor discovery option header */ #define ND_OPT_DNSSL 31 struct nd_opt_prefix_info { /* prefix information */ - u_int8_t nd_opt_pi_type; - u_int8_t nd_opt_pi_len; - u_int8_t nd_opt_pi_prefix_len; - u_int8_t nd_opt_pi_flags_reserved; - u_int8_t nd_opt_pi_valid_time[4]; - u_int8_t nd_opt_pi_preferred_time[4]; - u_int8_t nd_opt_pi_reserved2[4]; + nd_uint8_t nd_opt_pi_type; + nd_uint8_t nd_opt_pi_len; + nd_uint8_t nd_opt_pi_prefix_len; + nd_uint8_t nd_opt_pi_flags_reserved; + nd_uint32_t nd_opt_pi_valid_time; + nd_uint32_t nd_opt_pi_preferred_time; + nd_uint32_t nd_opt_pi_reserved2; struct in6_addr nd_opt_pi_prefix; }; @@ -299,57 +299,57 @@ struct nd_opt_prefix_info { /* prefix information */ #define ND_OPT_PI_FLAG_ROUTER 0x20 /*2292bis*/ struct nd_opt_rd_hdr { /* redirected header */ - u_int8_t nd_opt_rh_type; - u_int8_t nd_opt_rh_len; - u_int16_t nd_opt_rh_reserved1; - u_int32_t nd_opt_rh_reserved2; + uint8_t nd_opt_rh_type; + uint8_t nd_opt_rh_len; + uint16_t nd_opt_rh_reserved1; + uint32_t nd_opt_rh_reserved2; /* followed by IP header and data */ }; struct nd_opt_mtu { /* MTU option */ - u_int8_t nd_opt_mtu_type; - u_int8_t nd_opt_mtu_len; - u_int16_t nd_opt_mtu_reserved; - u_int32_t nd_opt_mtu_mtu; + uint8_t nd_opt_mtu_type; + uint8_t nd_opt_mtu_len; + uint16_t nd_opt_mtu_reserved; + uint32_t nd_opt_mtu_mtu; }; struct nd_opt_rdnss { /* RDNSS RFC 6106 5.1 */ - u_int8_t nd_opt_rdnss_type; - u_int8_t nd_opt_rdnss_len; - u_int16_t nd_opt_rdnss_reserved; - u_int32_t nd_opt_rdnss_lifetime; + uint8_t nd_opt_rdnss_type; + uint8_t nd_opt_rdnss_len; + uint16_t nd_opt_rdnss_reserved; + uint32_t nd_opt_rdnss_lifetime; struct in6_addr nd_opt_rdnss_addr[1]; /* variable-length */ }; struct nd_opt_dnssl { /* DNSSL RFC 6106 5.2 */ - u_int8_t nd_opt_dnssl_type; - u_int8_t nd_opt_dnssl_len; - u_int16_t nd_opt_dnssl_reserved; - u_int32_t nd_opt_dnssl_lifetime; + uint8_t nd_opt_dnssl_type; + uint8_t nd_opt_dnssl_len; + uint16_t nd_opt_dnssl_reserved; + uint32_t nd_opt_dnssl_lifetime; /* followed by list of DNS search domains, variable-length */ }; struct nd_opt_advinterval { /* Advertisement interval option */ - u_int8_t nd_opt_adv_type; - u_int8_t nd_opt_adv_len; - u_int16_t nd_opt_adv_reserved; - u_int32_t nd_opt_adv_interval; + uint8_t nd_opt_adv_type; + uint8_t nd_opt_adv_len; + uint16_t nd_opt_adv_reserved; + uint32_t nd_opt_adv_interval; }; struct nd_opt_homeagent_info { /* Home Agent info */ - u_int8_t nd_opt_hai_type; - u_int8_t nd_opt_hai_len; - u_int16_t nd_opt_hai_reserved; + uint8_t nd_opt_hai_type; + uint8_t nd_opt_hai_len; + uint16_t nd_opt_hai_reserved; int16_t nd_opt_hai_preference; - u_int16_t nd_opt_hai_lifetime; + uint16_t nd_opt_hai_lifetime; }; struct nd_opt_route_info { /* route info */ - u_int8_t nd_opt_rti_type; - u_int8_t nd_opt_rti_len; - u_int8_t nd_opt_rti_prefixlen; - u_int8_t nd_opt_rti_flags; - u_int32_t nd_opt_rti_lifetime; + uint8_t nd_opt_rti_type; + uint8_t nd_opt_rti_len; + uint8_t nd_opt_rti_prefixlen; + uint8_t nd_opt_rti_flags; + uint32_t nd_opt_rti_lifetime; /* prefix follows */ }; @@ -359,11 +359,11 @@ struct nd_opt_route_info { /* route info */ struct icmp6_namelookup { struct icmp6_hdr icmp6_nl_hdr; - u_int8_t icmp6_nl_nonce[8]; + uint8_t icmp6_nl_nonce[8]; int32_t icmp6_nl_ttl; #if 0 - u_int8_t icmp6_nl_len; - u_int8_t icmp6_nl_name[3]; + uint8_t icmp6_nl_len; + uint8_t icmp6_nl_name[3]; #endif /* could be followed by options */ }; @@ -373,7 +373,7 @@ struct icmp6_namelookup { */ struct icmp6_nodeinfo { struct icmp6_hdr icmp6_ni_hdr; - u_int8_t icmp6_ni_nonce[8]; + uint8_t icmp6_ni_nonce[8]; /* could be followed by reply data */ }; @@ -391,22 +391,22 @@ struct icmp6_nodeinfo { #define NI_QTYPE_IPV4ADDR 4 /* IPv4 Addresses */ /* network endian */ -#define NI_SUPTYPE_FLAG_COMPRESS ((u_int16_t)htons(0x1)) -#define NI_FQDN_FLAG_VALIDTTL ((u_int16_t)htons(0x1)) +#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 ((u_int16_t)htons(0x1)) -#define NI_NODEADDR_FLAG_ALL ((u_int16_t)htons(0x2)) -#define NI_NODEADDR_FLAG_COMPAT ((u_int16_t)htons(0x4)) -#define NI_NODEADDR_FLAG_LINKLOCAL ((u_int16_t)htons(0x8)) -#define NI_NODEADDR_FLAG_SITELOCAL ((u_int16_t)htons(0x10)) -#define NI_NODEADDR_FLAG_GLOBAL ((u_int16_t)htons(0x20)) -#define NI_NODEADDR_FLAG_ANYCAST ((u_int16_t)htons(0x40)) /* just experimental. not in spec */ +#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 */ struct ni_reply_fqdn { - u_int32_t ni_fqdn_ttl; /* TTL */ - u_int8_t ni_fqdn_namelen; /* length in octets of the FQDN */ - u_int8_t ni_fqdn_name[3]; /* XXX: alignment */ + uint32_t ni_fqdn_ttl; /* TTL */ + uint8_t ni_fqdn_namelen; /* length in octets of the FQDN */ + uint8_t ni_fqdn_name[3]; /* XXX: alignment */ }; /* @@ -414,10 +414,10 @@ struct ni_reply_fqdn { */ struct icmp6_router_renum { /* router renumbering header */ struct icmp6_hdr rr_hdr; - u_int8_t rr_segnum; - u_int8_t rr_flags; - u_int16_t rr_maxdelay; - u_int32_t rr_reserved; + uint8_t rr_segnum; + uint8_t rr_flags; + uint16_t rr_maxdelay; + uint32_t rr_reserved; }; #define ICMP6_RR_FLAGS_TEST 0x80 #define ICMP6_RR_FLAGS_REQRESULT 0x40 @@ -431,13 +431,13 @@ struct icmp6_router_renum { /* router renumbering header */ #define rr_seqnum rr_hdr.icmp6_data32[0] struct rr_pco_match { /* match prefix part */ - u_int8_t rpm_code; - u_int8_t rpm_len; - u_int8_t rpm_ordinal; - u_int8_t rpm_matchlen; - u_int8_t rpm_minlen; - u_int8_t rpm_maxlen; - u_int16_t rpm_reserved; + uint8_t rpm_code; + uint8_t rpm_len; + uint8_t rpm_ordinal; + uint8_t rpm_matchlen; + uint8_t rpm_minlen; + uint8_t rpm_maxlen; + uint16_t rpm_reserved; struct in6_addr rpm_prefix; }; @@ -447,41 +447,41 @@ struct rr_pco_match { /* match prefix part */ #define RPM_PCO_MAX 4 struct rr_pco_use { /* use prefix part */ - u_int8_t rpu_uselen; - u_int8_t rpu_keeplen; - u_int8_t rpu_ramask; - u_int8_t rpu_raflags; - u_int32_t rpu_vltime; - u_int32_t rpu_pltime; - u_int32_t rpu_flags; + uint8_t rpu_uselen; + uint8_t rpu_keeplen; + uint8_t rpu_ramask; + uint8_t rpu_raflags; + uint32_t rpu_vltime; + uint32_t rpu_pltime; + uint32_t rpu_flags; struct in6_addr rpu_prefix; }; #define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK 0x80 #define ICMP6_RR_PCOUSE_RAFLAGS_AUTO 0x40 /* network endian */ -#define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME ((u_int32_t)htonl(0x80000000)) -#define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME ((u_int32_t)htonl(0x40000000)) +#define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME ((uint32_t)htonl(0x80000000)) +#define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME ((uint32_t)htonl(0x40000000)) struct rr_result { /* router renumbering result message */ - u_int16_t rrr_flags; - u_int8_t rrr_ordinal; - u_int8_t rrr_matchedlen; - u_int32_t rrr_ifid; + uint16_t rrr_flags; + uint8_t rrr_ordinal; + uint8_t rrr_matchedlen; + uint32_t rrr_ifid; struct in6_addr rrr_prefix; }; /* network endian */ -#define ICMP6_RR_RESULT_FLAGS_OOB ((u_int16_t)htons(0x0002)) -#define ICMP6_RR_RESULT_FLAGS_FORBIDDEN ((u_int16_t)htons(0x0001)) +#define ICMP6_RR_RESULT_FLAGS_OOB ((uint16_t)htons(0x0002)) +#define ICMP6_RR_RESULT_FLAGS_FORBIDDEN ((uint16_t)htons(0x0001)) static const char *get_rtpref(u_int); -static const char *get_lifetime(u_int32_t); +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 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 struct udphdr *get_upperlayer(netdissect_options *ndo, u_char *, u_int *); +static const struct udphdr *get_upperlayer(netdissect_options *ndo, const u_char *, u_int *); static void dnsname_print(netdissect_options *ndo, const u_char *, const u_char *); 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 *); @@ -490,8 +490,158 @@ static void icmp6_rrenum_print(netdissect_options *ndo, const u_char *, const u_ #define abs(a) ((0 < (a)) ? (a) : -(a)) #endif -/* inline the various RPL definitions */ -#define ND_RPL_MESSAGE 0x9B +/* + * DIO: Updated to RFC6550, as published in 2012: section 6. (page 30) + */ + +#define ND_RPL_MESSAGE 155 /* 0x9B */ + +enum ND_RPL_CODE { + ND_RPL_DAG_IS=0x00, + ND_RPL_DAG_IO=0x01, + ND_RPL_DAO =0x02, + ND_RPL_DAO_ACK=0x03, + ND_RPL_SEC_DAG_IS = 0x80, + ND_RPL_SEC_DAG_IO = 0x81, + ND_RPL_SEC_DAG = 0x82, + ND_RPL_SEC_DAG_ACK= 0x83, + ND_RPL_SEC_CONSIST= 0x8A +}; + +enum ND_RPL_DIO_FLAGS { + ND_RPL_DIO_GROUNDED = 0x80, + ND_RPL_DIO_DATRIG = 0x40, + ND_RPL_DIO_DASUPPORT= 0x20, + ND_RPL_DIO_RES4 = 0x10, + ND_RPL_DIO_RES3 = 0x08, + ND_RPL_DIO_PRF_MASK = 0x07 /* 3-bit preference */ +}; + +#define DAGID_LEN 16 + +/* section 6 of draft-ietf-roll-rpl-19 */ +struct nd_rpl_security { + uint8_t rpl_sec_t_reserved; /* bit 7 is T-bit */ + uint8_t rpl_sec_algo; + uint16_t rpl_sec_kim_lvl_flags; /* bit 15/14, KIM */ + /* bit 10-8, LVL, bit 7-0 flags */ + uint32_t rpl_sec_counter; +#if 0 + uint8_t rpl_sec_ki[0]; /* depends upon kim */ +#endif +}; + +/* section 6.2.1, DODAG Information Solication (DIS_IS) */ +struct nd_rpl_dis_is { + uint8_t rpl_dis_flags; + uint8_t rpl_dis_reserved; +#if 0 + uint8_t rpl_dis_options[0]; +#endif +}; + +/* section 6.3.1, DODAG Information Object (DIO) */ +struct nd_rpl_dio { + uint8_t rpl_instanceid; + uint8_t rpl_version; + uint16_t rpl_dagrank; + uint8_t rpl_mopprf; /* bit 7=G, 5-3=MOP, 2-0=PRF */ + uint8_t rpl_dtsn; /* Dest. Advertisement Trigger Sequence Number */ + uint8_t rpl_flags; /* no flags defined yet */ + uint8_t rpl_resv1; + uint8_t rpl_dagid[DAGID_LEN]; +}; +#define RPL_DIO_GROUND_FLAG 0x80 +#define RPL_DIO_MOP_SHIFT 3 +#define RPL_DIO_MOP_MASK (7 << RPL_DIO_MOP_SHIFT) +#define RPL_DIO_PRF_SHIFT 0 +#define RPL_DIO_PRF_MASK (7 << RPL_DIO_PRF_SHIFT) +#define RPL_DIO_GROUNDED(X) ((X)&RPL_DIO_GROUND_FLAG) +#define RPL_DIO_MOP(X) (enum RPL_DIO_MOP)(((X)&RPL_DIO_MOP_MASK) >> RPL_DIO_MOP_SHIFT) +#define RPL_DIO_PRF(X) (((X)&RPL_DIO_PRF_MASK) >> RPL_DIO_PRF_SHIFT) + +enum RPL_DIO_MOP { + RPL_DIO_NONSTORING= 0x0, + RPL_DIO_STORING = 0x1, + RPL_DIO_NONSTORING_MULTICAST = 0x2, + RPL_DIO_STORING_MULTICAST = 0x3 +}; + +enum RPL_SUBOPT { + RPL_OPT_PAD0 = 0, + RPL_OPT_PADN = 1, + RPL_DIO_METRICS = 2, + RPL_DIO_ROUTINGINFO = 3, + RPL_DIO_CONFIG = 4, + RPL_DAO_RPLTARGET = 5, + RPL_DAO_TRANSITINFO = 6, + RPL_DIO_DESTPREFIX = 8, + RPL_DAO_RPLTARGET_DESC=9 +}; + +struct rpl_dio_genoption { + uint8_t rpl_dio_type; + uint8_t rpl_dio_len; /* suboption length, not including type/len */ +}; +#define RPL_DIO_GENOPTION_LEN 2 + +#define RPL_DIO_LIFETIME_INFINITE 0xffffffff +#define RPL_DIO_LIFETIME_DISCONNECT 0 + +struct rpl_dio_destprefix { + uint8_t rpl_dio_type; + uint8_t rpl_dio_len; + uint8_t rpl_dio_prefixlen; /* in bits */ + uint8_t rpl_dio_prf; /* flags, including Route Preference */ + uint32_t rpl_dio_prefixlifetime; /* in seconds */ +#if 0 + uint8_t rpl_dio_prefix[0]; /* variable number of bytes */ +#endif +}; + +/* section 6.4.1, DODAG Information Object (DIO) */ +struct nd_rpl_dao { + uint8_t rpl_instanceid; + uint8_t rpl_flags; /* bit 7=K, 6=D */ + uint8_t rpl_resv; + uint8_t rpl_daoseq; + uint8_t rpl_dagid[DAGID_LEN]; /* present when D set. */ +}; +#define ND_RPL_DAO_MIN_LEN 4 /* length without DAGID */ + +/* indicates if this DAO is to be acK'ed */ +#define RPL_DAO_K_SHIFT 7 +#define RPL_DAO_K_MASK (1 << RPL_DAO_K_SHIFT) +#define RPL_DAO_K(X) (((X)&RPL_DAO_K_MASK) >> RPL_DAO_K_SHIFT) + +/* indicates if the DAGID is present */ +#define RPL_DAO_D_SHIFT 6 +#define RPL_DAO_D_MASK (1 << RPL_DAO_D_SHIFT) +#define RPL_DAO_D(X) (((X)&RPL_DAO_D_MASK) >> RPL_DAO_D_SHIFT) + +struct rpl_dao_target { + uint8_t rpl_dao_type; + uint8_t rpl_dao_len; + uint8_t rpl_dao_flags; /* unused */ + uint8_t rpl_dao_prefixlen; /* in bits */ +#if 0 + uint8_t rpl_dao_prefix[0]; /* variable number of bytes */ +#endif +}; + +/* section 6.5.1, Destination Advertisement Object Acknowledgement (DAO-ACK) */ +struct nd_rpl_daoack { + uint8_t rpl_instanceid; + uint8_t rpl_flags; /* bit 7=D */ + uint8_t rpl_daoseq; + uint8_t rpl_status; + uint8_t rpl_dagid[DAGID_LEN]; /* present when D set. */ +}; +#define ND_RPL_DAOACK_MIN_LEN 4 /* length without DAGID */ +/* indicates if the DAGID is present */ +#define RPL_DAOACK_D_SHIFT 7 +#define RPL_DAOACK_D_MASK (1 << RPL_DAOACK_D_SHIFT) +#define RPL_DAOACK_D(X) (((X)&RPL_DAOACK_D_MASK) >> RPL_DAOACK_D_SHIFT) static const struct tok icmp6_type_values[] = { { ICMP6_DST_UNREACH, "destination unreachable"}, @@ -596,11 +746,11 @@ get_rtpref(u_int v) } static const char * -get_lifetime(u_int32_t v) +get_lifetime(uint32_t v) { static char buf[20]; - if (v == (u_int32_t)~0UL) + if (v == (uint32_t)~0UL) return "infinity"; else { snprintf(buf, sizeof(buf), "%us", v); @@ -609,94 +759,29 @@ get_lifetime(u_int32_t v) } static void -print_lladdr(netdissect_options *ndo, const u_int8_t *p, size_t l) +print_lladdr(netdissect_options *ndo, const uint8_t *p, size_t l) { - const u_int8_t *ep, *q; + const uint8_t *ep, *q; q = p; ep = p + l; while (l > 0 && q < ep) { if (q > p) ND_PRINT((ndo,":")); - ND_PRINT((ndo,"%02x", *q++)); + ND_PRINT((ndo,"%02x", EXTRACT_U_1(q))); + q++; l--; } } -static int icmp6_cksum(const struct ip6_hdr *ip6, const struct icmp6_hdr *icp, - u_int len) +static int icmp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6, + const struct icmp6_hdr *icp, u_int len) { - return (nextproto6_cksum(ip6, (const u_int8_t *)(void *)icp, len, - IPPROTO_ICMPV6)); + return nextproto6_cksum(ndo, ip6, (const uint8_t *)(const void *)icp, len, len, + IPPROTO_ICMPV6); } -enum ND_RPL_CODE { - ND_RPL_DIS =0x00, - ND_RPL_DIO =0x01, - ND_RPL_DAO =0x02, - ND_RPL_DAO_ACK=0x03, - ND_RPL_SDIS =0x80, - ND_RPL_SDIO =0x81, - ND_RPL_SDAO =0x82, - ND_RPL_SDAO_ACK=0x83, - ND_RPL_SCC =0x8A, -}; - -enum ND_RPL_DIO_FLAGS { - ND_RPL_DIO_GROUNDED = 0x80, - ND_RPL_DIO_DATRIG = 0x40, - ND_RPL_DIO_DASUPPORT= 0x20, - ND_RPL_DIO_RES4 = 0x10, - ND_RPL_DIO_RES3 = 0x08, - ND_RPL_DIO_PRF_MASK = 0x07, /* 3-bit preference */ -}; - -enum ND_RPL_SUBOPT { - RPL_OPT_PAD0 = 0, - RPL_OPT_PADN = 1, - RPL_DIO_METRICS = 2, - RPL_DIO_ROUTINGINFO = 3, - RPL_DIO_CONFIG = 4, - RPL_DAO_RPLTARGET = 5, - RPL_DAO_TRANSITINFO = 6, - RPL_DIO_DESTPREFIX = 8, - RPL_DAO_RPLTARGET_DESC=9, -}; - -#define RPL_DIO_GROUND_FLAG 0x80 -#define RPL_DIO_MOP_SHIFT 3 -#define RPL_DIO_MOP_MASK (7 << RPL_DIO_MOP_SHIFT) -#define RPL_DIO_PRF_SHIFT 0 -#define RPL_DIO_PRF_MASK (7 << RPL_DIO_PRF_SHIFT) -#define RPL_DIO_GROUNDED(X) ((X)&RPL_DIO_GROUND_FLAG) -#define RPL_DIO_MOP(X) (((X)&RPL_DIO_MOP_MASK) >> RPL_DIO_MOP_SHIFT) -#define RPL_DIO_PRF(X) (((X)&RPL_DIO_PRF_MASK) >> RPL_DIO_PRF_SHIFT) - - -struct nd_rpl_dio { - u_int8_t rpl_instanceid; - u_int8_t rpl_version; - u_int16_t rpl_dagrank; - u_int8_t rpl_mopprf; /* bit 7=G, 5-3=MOP, 2-0=PRF */ - u_int8_t rpl_dtsn; - u_int8_t rpl_flags; /* Dest. Advertisement Trigger Seq Number */ - u_int8_t rpl_resv1; - u_int8_t rpl_dagid[16]; -}; -struct nd_rpl_option { - u_int8_t rpl_dio_type; - u_int8_t rpl_dio_len; /* suboption length, not including type/len */ - u_int8_t rpl_dio_data[0]; -}; - -enum RPL_DIO_MOP { - RPL_DIO_NONSTORING= 0x0, - RPL_DIO_STORING = 0x1, - RPL_DIO_NONSTORING_MULTICAST = 0x2, - RPL_DIO_STORING_MULTICAST = 0x3, -}; - -const struct tok rpl_mop_values[] = { +static const struct tok rpl_mop_values[] = { { RPL_DIO_NONSTORING, "nonstoring"}, { RPL_DIO_STORING, "storing"}, { RPL_DIO_NONSTORING_MULTICAST, "nonstoring-multicast"}, @@ -704,7 +789,7 @@ const struct tok rpl_mop_values[] = { { 0, NULL}, }; -const struct tok rpl_subopt_values[] = { +static const struct tok rpl_subopt_values[] = { { RPL_OPT_PAD0, "pad0"}, { RPL_OPT_PADN, "padN"}, { RPL_DIO_METRICS, "metrics"}, @@ -718,67 +803,161 @@ const struct tok rpl_subopt_values[] = { }; static void -rpl_dio_print(netdissect_options *ndo, - const struct icmp6_hdr *hdr _U_, - const u_char *bp, u_int length) +rpl_dio_printopt(netdissect_options *ndo, + const struct rpl_dio_genoption *opt, + u_int length) { - struct nd_rpl_dio *dio = (struct nd_rpl_dio *)bp; - char dagid[65]; - char *d = dagid; - int i; - ND_TCHECK(dio->rpl_dagid); - - for(i=0;i<16;i++) { - if(isprint(dio->rpl_dagid[i])) { - *d++ = dio->rpl_dagid[i]; + if(length < RPL_DIO_GENOPTION_LEN) return; + length -= RPL_DIO_GENOPTION_LEN; + + ND_TCHECK(opt->rpl_dio_len); + + while((opt->rpl_dio_type == RPL_OPT_PAD0 && + (const u_char *)opt < ndo->ndo_snapend) || + ND_TTEST_LEN(opt, (opt->rpl_dio_len + 2))) { + + unsigned int optlen = opt->rpl_dio_len+2; + if(opt->rpl_dio_type == RPL_OPT_PAD0) { + optlen = 1; + ND_PRINT((ndo, " opt:pad0")); } else { - int cnt=snprintf(d,4,"0x%02x", - dio->rpl_dagid[i]); - d += cnt; + ND_PRINT((ndo, " opt:%s len:%u ", + tok2str(rpl_subopt_values, "subopt:%u", opt->rpl_dio_type), + optlen)); + if(ndo->ndo_vflag > 2) { + unsigned int paylen = opt->rpl_dio_len; + if(paylen > length) paylen = length; + hex_print(ndo, + " ", + ((const uint8_t *)opt) + RPL_DIO_GENOPTION_LEN, /* content of DIO option */ + paylen); + } } + opt = (const struct rpl_dio_genoption *)(((const char *)opt) + optlen); + length -= optlen; } - *d++ = '\0'; + return; +trunc: + ND_PRINT((ndo," [|truncated]")); + return; +} + +static void +rpl_dio_print(netdissect_options *ndo, + 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(*dio); + dagid_str = ip6addr_string (ndo, dio->rpl_dagid); + ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u,rank:%u,%smop:%s,prf:%u]", - dagid, + dagid_str, dio->rpl_dtsn, dio->rpl_instanceid, - dio->rpl_dagrank, + EXTRACT_BE_U_2(&dio->rpl_dagrank), RPL_DIO_GROUNDED(dio->rpl_mopprf) ? "grounded,":"", tok2str(rpl_mop_values, "mop%u", RPL_DIO_MOP(dio->rpl_mopprf)), RPL_DIO_PRF(dio->rpl_mopprf))); if(ndo->ndo_vflag > 1) { - struct nd_rpl_option *opt = (struct nd_rpl_option *)&dio[1]; - length -= sizeof(struct nd_rpl_dio); - ND_TCHECK(opt->rpl_dio_len); - while((opt->rpl_dio_type == RPL_OPT_PAD0 && - (u_char *)opt < ndo->ndo_snapend) || - ND_TTEST2(*opt,(opt->rpl_dio_len+2))) { - unsigned int optlen = opt->rpl_dio_len+2; - if(opt->rpl_dio_type == RPL_OPT_PAD0) { - optlen = 1; - ND_PRINT((ndo, " opt:pad0")); - } else { - ND_PRINT((ndo, " opt:%s len:%u ", - tok2str(rpl_subopt_values, "%subopt:%u", opt->rpl_dio_type), - optlen)); - if(ndo->ndo_vflag > 2) { - unsigned int paylen = opt->rpl_dio_len; - if(paylen > length) paylen = length; - hex_print(ndo, - " ", - (u_char *)&opt[1], /* content of DIO option */ - paylen); - } - } - opt = (struct nd_rpl_option *)(((char *)opt) + optlen); - length -= optlen; - } + const struct rpl_dio_genoption *opt = (const struct rpl_dio_genoption *)&dio[1]; + rpl_dio_printopt(ndo, opt, length); + } + return; +trunc: + ND_PRINT((ndo," [|truncated]")); + return; +} + +static void +rpl_dao_print(netdissect_options *ndo, + const u_char *bp, u_int length) +{ + const struct nd_rpl_dao *dao = (const struct nd_rpl_dao *)bp; + const char *dagid_str = ""; + + ND_TCHECK(*dao); + if (length < ND_RPL_DAO_MIN_LEN) + goto tooshort; + + bp += ND_RPL_DAO_MIN_LEN; + length -= ND_RPL_DAO_MIN_LEN; + if(RPL_DAO_D(dao->rpl_flags)) { + ND_TCHECK_LEN(dao->rpl_dagid, DAGID_LEN); + if (length < DAGID_LEN) + goto tooshort; + dagid_str = ip6addr_string (ndo, dao->rpl_dagid); + bp += DAGID_LEN; + length -= DAGID_LEN; + } + + ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u%s%s,%02x]", + dagid_str, + dao->rpl_daoseq, + dao->rpl_instanceid, + RPL_DAO_K(dao->rpl_flags) ? ",acK":"", + RPL_DAO_D(dao->rpl_flags) ? ",Dagid":"", + dao->rpl_flags)); + + if(ndo->ndo_vflag > 1) { + const struct rpl_dio_genoption *opt = (const struct rpl_dio_genoption *)bp; + rpl_dio_printopt(ndo, opt, length); } return; + trunc: ND_PRINT((ndo," [|truncated]")); return; + +tooshort: + ND_PRINT((ndo," [|length too short]")); + return; +} + +static void +rpl_daoack_print(netdissect_options *ndo, + const u_char *bp, u_int length) +{ + const struct nd_rpl_daoack *daoack = (const struct nd_rpl_daoack *)bp; + const char *dagid_str = ""; + + ND_TCHECK_LEN(daoack, ND_RPL_DAOACK_MIN_LEN); + if (length < ND_RPL_DAOACK_MIN_LEN) + goto tooshort; + + bp += ND_RPL_DAOACK_MIN_LEN; + length -= ND_RPL_DAOACK_MIN_LEN; + if(RPL_DAOACK_D(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); + bp += DAGID_LEN; + length -= DAGID_LEN; + } + + ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u,status:%u]", + dagid_str, + daoack->rpl_daoseq, + daoack->rpl_instanceid, + daoack->rpl_status)); + + /* no officially defined options for DAOACK, but print any we find */ + if(ndo->ndo_vflag > 1) { + const struct rpl_dio_genoption *opt = (const struct rpl_dio_genoption *)bp; + rpl_dio_printopt(ndo, opt, length); + } + return; + +trunc: + ND_PRINT((ndo," [|dao-truncated]")); + return; + +tooshort: + ND_PRINT((ndo," [|dao-length too short]")); + return; } static void @@ -790,31 +969,38 @@ rpl_print(netdissect_options *ndo, int basecode= hdr->icmp6_code & 0x7f; if(secured) { - ND_PRINT((ndo, ", (SEC)")); + ND_PRINT((ndo, ", (SEC) [worktodo]")); + /* XXX + * the next header pointer needs to move forward to + * skip the secure part. + */ + return; } else { ND_PRINT((ndo, ", (CLR)")); } switch(basecode) { - case ND_RPL_DIS: + case ND_RPL_DAG_IS: ND_PRINT((ndo, "DODAG Information Solicitation")); if(ndo->ndo_vflag) { } break; - case ND_RPL_DIO: + case ND_RPL_DAG_IO: ND_PRINT((ndo, "DODAG Information Object")); if(ndo->ndo_vflag) { - rpl_dio_print(ndo, hdr, bp, length); + rpl_dio_print(ndo, bp, length); } break; case ND_RPL_DAO: ND_PRINT((ndo, "Destination Advertisement Object")); if(ndo->ndo_vflag) { + rpl_dao_print(ndo, bp, length); } break; case ND_RPL_DAO_ACK: ND_PRINT((ndo, "Destination Advertisement Object Ack")); if(ndo->ndo_vflag) { + rpl_daoack_print(ndo, bp, length); } break; default: @@ -840,30 +1026,30 @@ icmp6_print(netdissect_options *ndo, const struct ip6_hdr *ip; const struct ip6_hdr *oip; const struct udphdr *ouh; - int dport; + u_int dport; const u_char *ep; u_int prot; - dp = (struct icmp6_hdr *)bp; - ip = (struct ip6_hdr *)bp2; - oip = (struct ip6_hdr *)(dp + 1); + dp = (const struct icmp6_hdr *)bp; + ip = (const struct ip6_hdr *)bp2; + oip = (const struct ip6_hdr *)(dp + 1); /* 'ep' points to the end of available data. */ ep = ndo->ndo_snapend; ND_TCHECK(dp->icmp6_cksum); if (ndo->ndo_vflag && !fragmented) { - u_int16_t sum, udp_sum; + uint16_t sum, udp_sum; - if (ND_TTEST2(bp[0], length)) { - udp_sum = EXTRACT_16BITS(&dp->icmp6_cksum); - sum = icmp6_cksum(ip, dp, length); + if (ND_TTEST_LEN(bp, length)) { + udp_sum = EXTRACT_BE_U_2(&dp->icmp6_cksum); + sum = icmp6_cksum(ndo, ip, dp, length); if (sum != 0) - (void)ND_PRINT((ndo,"[bad icmp6 cksum 0x%04x -> 0x%04x!] ", + ND_PRINT((ndo,"[bad icmp6 cksum 0x%04x -> 0x%04x!] ", udp_sum, in_cksum_shouldbe(udp_sum, sum))); else - (void)ND_PRINT((ndo,"[icmp6 sum ok] ")); + ND_PRINT((ndo,"[icmp6 sum ok] ")); } } @@ -888,34 +1074,34 @@ icmp6_print(netdissect_options *ndo, case ICMP6_DST_UNREACH_NOROUTE: /* fall through */ case ICMP6_DST_UNREACH_ADMIN: case ICMP6_DST_UNREACH_ADDR: - ND_PRINT((ndo," %s",ip6addr_string(&oip->ip6_dst))); + ND_PRINT((ndo," %s",ip6addr_string(ndo, &oip->ip6_dst))); break; case ICMP6_DST_UNREACH_BEYONDSCOPE: ND_PRINT((ndo," %s, source address %s", - ip6addr_string(&oip->ip6_dst), - ip6addr_string(&oip->ip6_src))); + ip6addr_string(ndo, &oip->ip6_dst), + ip6addr_string(ndo, &oip->ip6_src))); break; case ICMP6_DST_UNREACH_NOPORT: - if ((ouh = get_upperlayer(ndo, (u_char *)oip, &prot)) + if ((ouh = get_upperlayer(ndo, (const u_char *)oip, &prot)) == NULL) goto trunc; - dport = EXTRACT_16BITS(&ouh->uh_dport); + dport = EXTRACT_BE_U_2(ouh->uh_dport); switch (prot) { case IPPROTO_TCP: ND_PRINT((ndo,", %s tcp port %s", - ip6addr_string(&oip->ip6_dst), - tcpport_string(dport))); + ip6addr_string(ndo, &oip->ip6_dst), + tcpport_string(ndo, dport))); break; case IPPROTO_UDP: ND_PRINT((ndo,", %s udp port %s", - ip6addr_string(&oip->ip6_dst), - udpport_string(dport))); + ip6addr_string(ndo, &oip->ip6_dst), + udpport_string(ndo, dport))); break; default: - ND_PRINT((ndo,", %s protocol %d port %d unreachable", - ip6addr_string(&oip->ip6_dst), - oip->ip6_nxt, dport)); + ND_PRINT((ndo,", %s protocol %u port %u unreachable", + ip6addr_string(ndo, &oip->ip6_dst), + prot, dport)); break; } break; @@ -929,14 +1115,14 @@ icmp6_print(netdissect_options *ndo, break; case ICMP6_PACKET_TOO_BIG: ND_TCHECK(dp->icmp6_mtu); - ND_PRINT((ndo,", mtu %u", EXTRACT_32BITS(&dp->icmp6_mtu))); + ND_PRINT((ndo,", mtu %u", EXTRACT_BE_U_4(&dp->icmp6_mtu))); break; case ICMP6_TIME_EXCEEDED: ND_TCHECK(oip->ip6_dst); switch (dp->icmp6_code) { case ICMP6_TIME_EXCEED_TRANSIT: ND_PRINT((ndo," for %s", - ip6addr_string(&oip->ip6_dst))); + ip6addr_string(ndo, &oip->ip6_dst))); break; case ICMP6_TIME_EXCEED_REASSEMBLY: ND_PRINT((ndo," (reassembly)")); @@ -950,13 +1136,13 @@ icmp6_print(netdissect_options *ndo, ND_TCHECK(oip->ip6_dst); switch (dp->icmp6_code) { case ICMP6_PARAMPROB_HEADER: - ND_PRINT((ndo,", erroneous - octet %u", EXTRACT_32BITS(&dp->icmp6_pptr))); + ND_PRINT((ndo,", erroneous - octet %u", EXTRACT_BE_U_4(&dp->icmp6_pptr))); break; case ICMP6_PARAMPROB_NEXTHEADER: - ND_PRINT((ndo,", next header - octet %u", EXTRACT_32BITS(&dp->icmp6_pptr))); + ND_PRINT((ndo,", next header - octet %u", EXTRACT_BE_U_4(&dp->icmp6_pptr))); break; case ICMP6_PARAMPROB_OPTION: - ND_PRINT((ndo,", option - octet %u", EXTRACT_32BITS(&dp->icmp6_pptr))); + ND_PRINT((ndo,", option - octet %u", EXTRACT_BE_U_4(&dp->icmp6_pptr))); break; default: ND_PRINT((ndo,", code-#%d", @@ -967,7 +1153,7 @@ icmp6_print(netdissect_options *ndo, case ICMP6_ECHO_REQUEST: case ICMP6_ECHO_REPLY: ND_TCHECK(dp->icmp6_seq); - ND_PRINT((ndo,", seq %u", EXTRACT_16BITS(&dp->icmp6_seq))); + ND_PRINT((ndo,", seq %u", EXTRACT_BE_U_2(&dp->icmp6_seq))); break; case ICMP6_MEMBERSHIP_QUERY: if (length == MLD_MINLEN) { @@ -995,18 +1181,18 @@ icmp6_print(netdissect_options *ndo, case ND_ROUTER_ADVERT: #define RTADVLEN 16 if (ndo->ndo_vflag) { - struct nd_router_advert *p; + const struct nd_router_advert *p; - p = (struct nd_router_advert *)dp; + p = (const struct nd_router_advert *)dp; ND_TCHECK(p->nd_ra_retransmit); ND_PRINT((ndo,"\n\thop limit %u, Flags [%s]" \ ", pref %s, router lifetime %us, reachable time %us, retrans time %us", (u_int)p->nd_ra_curhoplimit, bittok2str(icmp6_opt_ra_flag_values,"none",(p->nd_ra_flags_reserved)), get_rtpref(p->nd_ra_flags_reserved), - EXTRACT_16BITS(&p->nd_ra_router_lifetime), - EXTRACT_32BITS(&p->nd_ra_reachable), - EXTRACT_32BITS(&p->nd_ra_retransmit))); + 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); @@ -1014,10 +1200,10 @@ icmp6_print(netdissect_options *ndo, break; case ND_NEIGHBOR_SOLICIT: { - struct nd_neighbor_solicit *p; - p = (struct nd_neighbor_solicit *)dp; + const struct nd_neighbor_solicit *p; + p = (const struct nd_neighbor_solicit *)dp; ND_TCHECK(p->nd_ns_target); - ND_PRINT((ndo,", who has %s", ip6addr_string(&p->nd_ns_target))); + ND_PRINT((ndo,", who has %s", ip6addr_string(ndo, &p->nd_ns_target))); if (ndo->ndo_vflag) { #define NDSOLLEN 24 icmp6_opt_print(ndo, (const u_char *)dp + NDSOLLEN, @@ -1027,17 +1213,17 @@ icmp6_print(netdissect_options *ndo, break; case ND_NEIGHBOR_ADVERT: { - struct nd_neighbor_advert *p; + const struct nd_neighbor_advert *p; - p = (struct nd_neighbor_advert *)dp; + p = (const struct nd_neighbor_advert *)dp; ND_TCHECK(p->nd_na_target); ND_PRINT((ndo,", tgt is %s", - ip6addr_string(&p->nd_na_target))); + ip6addr_string(ndo, &p->nd_na_target))); if (ndo->ndo_vflag) { ND_PRINT((ndo,", Flags [%s]", bittok2str(icmp6_nd_na_flag_values, "none", - EXTRACT_32BITS(&p->nd_na_flags_reserved)))); + EXTRACT_BE_U_4(&p->nd_na_flags_reserved)))); #define NDADVLEN 24 icmp6_opt_print(ndo, (const u_char *)dp + NDADVLEN, length - NDADVLEN); @@ -1046,12 +1232,12 @@ icmp6_print(netdissect_options *ndo, } break; case ND_REDIRECT: -#define RDR(i) ((struct nd_redirect *)(i)) +#define RDR(i) ((const struct nd_redirect *)(i)) ND_TCHECK(RDR(dp)->nd_rd_dst); - ND_PRINT((ndo,", %s", getname6((const u_char *)&RDR(dp)->nd_rd_dst))); + ND_PRINT((ndo,", %s", ip6addr_string(ndo, &RDR(dp)->nd_rd_dst))); ND_TCHECK(RDR(dp)->nd_rd_target); ND_PRINT((ndo," to %s", - getname6((const u_char*)&RDR(dp)->nd_rd_target))); + ip6addr_string(ndo, &RDR(dp)->nd_rd_target))); #define REDIRECTLEN 40 if (ndo->ndo_vflag) { icmp6_opt_print(ndo, (const u_char *)dp + REDIRECTLEN, @@ -1076,27 +1262,28 @@ icmp6_print(netdissect_options *ndo, case ICMP6_MOBILEPREFIX_SOLICIT: /* fall through */ case ICMP6_HADISCOV_REQUEST: ND_TCHECK(dp->icmp6_data16[0]); - ND_PRINT((ndo,", id 0x%04x", EXTRACT_16BITS(&dp->icmp6_data16[0]))); + ND_PRINT((ndo,", id 0x%04x", EXTRACT_BE_U_2(&dp->icmp6_data16[0]))); break; case ICMP6_HADISCOV_REPLY: if (ndo->ndo_vflag) { - struct in6_addr *in6; - u_char *cp; + const struct in6_addr *in6; + const u_char *cp; ND_TCHECK(dp->icmp6_data16[0]); - ND_PRINT((ndo,", id 0x%04x", EXTRACT_16BITS(&dp->icmp6_data16[0]))); - cp = (u_char *)dp + length; - in6 = (struct in6_addr *)(dp + 1); - for (; (u_char *)in6 < cp; in6++) { + ND_PRINT((ndo,", id 0x%04x", EXTRACT_BE_U_2(&dp->icmp6_data16[0]))); + cp = (const u_char *)dp + length; + in6 = (const struct in6_addr *)(dp + 1); + for (; (const u_char *)in6 < cp; in6++) { ND_TCHECK(*in6); - ND_PRINT((ndo,", %s", ip6addr_string(in6))); + ND_PRINT((ndo,", %s", ip6addr_string(ndo, in6))); } } break; case ICMP6_MOBILEPREFIX_ADVERT: if (ndo->ndo_vflag) { ND_TCHECK(dp->icmp6_data16[0]); - ND_PRINT((ndo,", id 0x%04x", EXTRACT_16BITS(&dp->icmp6_data16[0]))); + ND_PRINT((ndo,", id 0x%04x", EXTRACT_BE_U_2(&dp->icmp6_data16[0]))); + ND_TCHECK(dp->icmp6_data16[1]); if (dp->icmp6_data16[1] & 0xc0) ND_PRINT((ndo," ")); if (dp->icmp6_data16[1] & 0x80) @@ -1109,7 +1296,8 @@ icmp6_print(netdissect_options *ndo, } break; case ND_RPL_MESSAGE: - rpl_print(ndo, dp, &dp->icmp6_data8[0], length); + /* plus 4, because struct icmp6_hdr contains 4 bytes of icmp payload */ + rpl_print(ndo, dp, &dp->icmp6_data8[0], length-sizeof(struct icmp6_hdr)+4); break; default: ND_PRINT((ndo,", length %u", length)); @@ -1124,15 +1312,15 @@ trunc: ND_PRINT((ndo, "[|icmp6]")); } -static struct udphdr * -get_upperlayer(netdissect_options *ndo, u_char *bp, u_int *prot) +static const struct udphdr * +get_upperlayer(netdissect_options *ndo, const u_char *bp, u_int *prot) { const u_char *ep; - struct ip6_hdr *ip6 = (struct ip6_hdr *)bp; - struct udphdr *uh; - struct ip6_hbh *hbh; - struct ip6_frag *fragh; - struct ah *ah; + const struct ip6_hdr *ip6 = (const struct ip6_hdr *)bp; + const struct udphdr *uh; + const struct ip6_hbh *hbh; + const struct ip6_frag *fragh; + const struct ah *ah; u_int nh; int hlen; @@ -1142,7 +1330,7 @@ get_upperlayer(netdissect_options *ndo, u_char *bp, u_int *prot) if (!ND_TTEST(ip6->ip6_nxt)) return NULL; - nh = ip6->ip6_nxt; + nh = EXTRACT_U_1(ip6->ip6_nxt); hlen = sizeof(struct ip6_hdr); while (bp < ep) { @@ -1151,7 +1339,7 @@ get_upperlayer(netdissect_options *ndo, u_char *bp, u_int *prot) switch(nh) { case IPPROTO_UDP: case IPPROTO_TCP: - uh = (struct udphdr *)bp; + uh = (const struct udphdr *)bp; if (ND_TTEST(uh->uh_dport)) { *prot = nh; return(uh); @@ -1163,30 +1351,30 @@ get_upperlayer(netdissect_options *ndo, u_char *bp, u_int *prot) case IPPROTO_HOPOPTS: case IPPROTO_DSTOPTS: case IPPROTO_ROUTING: - hbh = (struct ip6_hbh *)bp; + hbh = (const struct ip6_hbh *)bp; if (!ND_TTEST(hbh->ip6h_len)) return(NULL); - nh = hbh->ip6h_nxt; - hlen = (hbh->ip6h_len + 1) << 3; + nh = EXTRACT_U_1(hbh->ip6h_nxt); + hlen = (EXTRACT_U_1(hbh->ip6h_len) + 1) << 3; break; case IPPROTO_FRAGMENT: /* this should be odd, but try anyway */ - fragh = (struct ip6_frag *)bp; + fragh = (const struct ip6_frag *)bp; if (!ND_TTEST(fragh->ip6f_offlg)) return(NULL); /* fragments with non-zero offset are meaningless */ - if ((EXTRACT_16BITS(&fragh->ip6f_offlg) & IP6F_OFF_MASK) != 0) + if ((EXTRACT_BE_U_2(fragh->ip6f_offlg) & IP6F_OFF_MASK) != 0) return(NULL); - nh = fragh->ip6f_nxt; + nh = EXTRACT_U_1(fragh->ip6f_nxt); hlen = sizeof(struct ip6_frag); break; case IPPROTO_AH: - ah = (struct ah *)bp; + ah = (const struct ah *)bp; if (!ND_TTEST(ah->ah_len)) return(NULL); - nh = ah->ah_nxt; - hlen = (ah->ah_len + 2) << 2; + nh = EXTRACT_U_1(ah->ah_nxt); + hlen = (EXTRACT_U_1(ah->ah_len) + 2) << 2; break; default: /* unknown or undecodable header */ @@ -1202,6 +1390,7 @@ static void icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) { const struct nd_opt_hdr *op; + uint8_t opt_type, opt_len; const struct nd_opt_prefix_info *opp; const struct nd_opt_mtu *opm; const struct nd_opt_rdnss *oprd; @@ -1210,109 +1399,112 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) const struct nd_opt_homeagent_info *oph; const struct nd_opt_route_info *opri; const u_char *cp, *ep, *domp; - struct in6_addr in6, *in6p; + struct in6_addr in6; + const struct in6_addr *in6p; size_t l; u_int i; -#define ECHECK(var) if ((u_char *)&(var) > ep - sizeof(var)) return +#define ECHECK(var) if ((const u_char *)&(var) > ep - sizeof(var)) return cp = bp; /* 'ep' points to the end of available data. */ ep = ndo->ndo_snapend; while (cp < ep) { - op = (struct nd_opt_hdr *)cp; + op = (const struct nd_opt_hdr *)cp; ECHECK(op->nd_opt_len); if (resid <= 0) return; - if (op->nd_opt_len == 0) + opt_type = EXTRACT_U_1(op->nd_opt_type); + opt_len = EXTRACT_U_1(op->nd_opt_len); + if (opt_len == 0) goto trunc; - if (cp + (op->nd_opt_len << 3) > ep) + if (cp + (opt_len << 3) > ep) goto trunc; ND_PRINT((ndo,"\n\t %s option (%u), length %u (%u): ", - tok2str(icmp6_opt_values, "unknown", op->nd_opt_type), - op->nd_opt_type, - op->nd_opt_len << 3, - op->nd_opt_len)); + tok2str(icmp6_opt_values, "unknown", opt_type), + opt_type, + opt_len << 3, + opt_len)); - switch (op->nd_opt_type) { + switch (opt_type) { case ND_OPT_SOURCE_LINKADDR: - l = (op->nd_opt_len << 3) - 2; + l = (opt_len << 3) - 2; print_lladdr(ndo, cp + 2, l); break; case ND_OPT_TARGET_LINKADDR: - l = (op->nd_opt_len << 3) - 2; + l = (opt_len << 3) - 2; print_lladdr(ndo, cp + 2, l); break; case ND_OPT_PREFIX_INFORMATION: - opp = (struct nd_opt_prefix_info *)op; + opp = (const struct nd_opt_prefix_info *)op; ND_TCHECK(opp->nd_opt_pi_prefix); ND_PRINT((ndo,"%s/%u%s, Flags [%s], valid time %s", - ip6addr_string(&opp->nd_opt_pi_prefix), - opp->nd_opt_pi_prefix_len, - (op->nd_opt_len != 4) ? "badlen" : "", - bittok2str(icmp6_opt_pi_flag_values, "none", opp->nd_opt_pi_flags_reserved), - get_lifetime(EXTRACT_32BITS(&opp->nd_opt_pi_valid_time)))); - ND_PRINT((ndo,", pref. time %s", get_lifetime(EXTRACT_32BITS(&opp->nd_opt_pi_preferred_time)))); + ip6addr_string(ndo, &opp->nd_opt_pi_prefix), + EXTRACT_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((ndo,", pref. time %s", get_lifetime(EXTRACT_BE_U_4(opp->nd_opt_pi_preferred_time)))); break; case ND_OPT_REDIRECTED_HEADER: - print_unknown_data(ndo, bp,"\n\t ",op->nd_opt_len<<3); + print_unknown_data(ndo, bp,"\n\t ",opt_len<<3); /* xxx */ break; case ND_OPT_MTU: - opm = (struct nd_opt_mtu *)op; + opm = (const struct nd_opt_mtu *)op; ND_TCHECK(opm->nd_opt_mtu_mtu); ND_PRINT((ndo," %u%s", - EXTRACT_32BITS(&opm->nd_opt_mtu_mtu), - (op->nd_opt_len != 1) ? "bad option length" : "" )); + EXTRACT_BE_U_4(&opm->nd_opt_mtu_mtu), + (opt_len != 1) ? "bad option length" : "" )); break; case ND_OPT_RDNSS: - oprd = (struct nd_opt_rdnss *)op; - l = (op->nd_opt_len - 1) / 2; + oprd = (const struct nd_opt_rdnss *)op; + l = (opt_len - 1) / 2; ND_PRINT((ndo," lifetime %us,", - EXTRACT_32BITS(&oprd->nd_opt_rdnss_lifetime))); + EXTRACT_BE_U_4(&oprd->nd_opt_rdnss_lifetime))); for (i = 0; i < l; i++) { ND_TCHECK(oprd->nd_opt_rdnss_addr[i]); ND_PRINT((ndo," addr: %s", - ip6addr_string(&oprd->nd_opt_rdnss_addr[i]))); + ip6addr_string(ndo, &oprd->nd_opt_rdnss_addr[i]))); } break; case ND_OPT_DNSSL: - opds = (struct nd_opt_dnssl *)op; + opds = (const struct nd_opt_dnssl *)op; ND_PRINT((ndo," lifetime %us, domain(s):", - EXTRACT_32BITS(&opds->nd_opt_dnssl_lifetime))); + EXTRACT_BE_U_4(&opds->nd_opt_dnssl_lifetime))); domp = cp + 8; /* domain names, variable-sized, RFC1035-encoded */ - while (domp < cp + (op->nd_opt_len << 3) && *domp != '\0') + while (domp < cp + (opt_len << 3) && EXTRACT_U_1(domp) != '\0') { - printf (" "); - if ((domp = ns_nprint (domp, bp)) == NULL) + ND_PRINT((ndo, " ")); + if ((domp = ns_nprint (ndo, domp, bp)) == NULL) goto trunc; } break; case ND_OPT_ADVINTERVAL: - opa = (struct nd_opt_advinterval *)op; + opa = (const struct nd_opt_advinterval *)op; ND_TCHECK(opa->nd_opt_adv_interval); - ND_PRINT((ndo," %ums", EXTRACT_32BITS(&opa->nd_opt_adv_interval))); + ND_PRINT((ndo," %ums", EXTRACT_BE_U_4(&opa->nd_opt_adv_interval))); break; case ND_OPT_HOMEAGENT_INFO: - oph = (struct nd_opt_homeagent_info *)op; + oph = (const struct nd_opt_homeagent_info *)op; ND_TCHECK(oph->nd_opt_hai_lifetime); ND_PRINT((ndo," preference %u, lifetime %u", - EXTRACT_16BITS(&oph->nd_opt_hai_preference), - EXTRACT_16BITS(&oph->nd_opt_hai_lifetime))); + EXTRACT_BE_U_2(&oph->nd_opt_hai_preference), + EXTRACT_BE_U_2(&oph->nd_opt_hai_lifetime))); break; case ND_OPT_ROUTE_INFO: - opri = (struct nd_opt_route_info *)op; + opri = (const struct nd_opt_route_info *)op; ND_TCHECK(opri->nd_opt_rti_lifetime); memset(&in6, 0, sizeof(in6)); - in6p = (struct in6_addr *)(opri + 1); - switch (op->nd_opt_len) { + in6p = (const struct in6_addr *)(opri + 1); + switch (opt_len) { case 1: break; case 2: - ND_TCHECK2(*in6p, 8); + ND_TCHECK_8(in6p); memcpy(&in6, opri + 1, 8); break; case 3: @@ -1322,25 +1514,25 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) default: goto trunc; } - ND_PRINT((ndo," %s/%u", ip6addr_string(&in6), + ND_PRINT((ndo," %s/%u", ip6addr_string(ndo, &in6), opri->nd_opt_rti_prefixlen)); ND_PRINT((ndo,", pref=%s", get_rtpref(opri->nd_opt_rti_flags))); ND_PRINT((ndo,", lifetime=%s", - get_lifetime(EXTRACT_32BITS(&opri->nd_opt_rti_lifetime)))); + get_lifetime(EXTRACT_BE_U_4(&opri->nd_opt_rti_lifetime)))); break; default: if (ndo->ndo_vflag <= 1) { - print_unknown_data(ndo,cp+2,"\n\t ", (op->nd_opt_len << 3) - 2); /* skip option header */ + print_unknown_data(ndo,cp+2,"\n\t ", (opt_len << 3) - 2); /* skip option header */ return; } break; } /* do we want to see an additional hexdump ? */ if (ndo->ndo_vflag> 1) - print_unknown_data(ndo, cp+2,"\n\t ", (op->nd_opt_len << 3) - 2); /* skip option header */ + print_unknown_data(ndo, cp+2,"\n\t ", (opt_len << 3) - 2); /* skip option header */ - cp += op->nd_opt_len << 3; - resid -= op->nd_opt_len << 3; + cp += opt_len << 3; + resid -= opt_len << 3; } return; @@ -1353,23 +1545,23 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) static void mld6_print(netdissect_options *ndo, const u_char *bp) { - struct mld6_hdr *mp = (struct mld6_hdr *)bp; + const struct mld6_hdr *mp = (const struct mld6_hdr *)bp; const u_char *ep; /* 'ep' points to the end of available data. */ ep = ndo->ndo_snapend; - if ((u_char *)mp + sizeof(*mp) > ep) + if ((const u_char *)mp + sizeof(*mp) > ep) return; - ND_PRINT((ndo,"max resp delay: %d ", EXTRACT_16BITS(&mp->mld6_maxdelay))); - ND_PRINT((ndo,"addr: %s", ip6addr_string(&mp->mld6_addr))); + ND_PRINT((ndo,"max resp delay: %d ", EXTRACT_BE_U_2(&mp->mld6_maxdelay))); + ND_PRINT((ndo,"addr: %s", ip6addr_string(ndo, &mp->mld6_addr))); } static void mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len) { - struct icmp6_hdr *icp = (struct icmp6_hdr *) bp; + const struct icmp6_hdr *icp = (const struct icmp6_hdr *) bp; u_int group, nsrcs, ngroups; u_int i, j; @@ -1380,7 +1572,7 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len) } ND_TCHECK(icp->icmp6_data16[1]); - ngroups = EXTRACT_16BITS(&icp->icmp6_data16[1]); + ngroups = EXTRACT_BE_U_2(&icp->icmp6_data16[1]); ND_PRINT((ndo,", %d group record(s)", ngroups)); if (ndo->ndo_vflag > 0) { /* Print the group records */ @@ -1391,11 +1583,12 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len) ND_PRINT((ndo," [invalid number of groups]")); return; } - ND_TCHECK2(bp[group + 4], sizeof(struct in6_addr)); - ND_PRINT((ndo," [gaddr %s", ip6addr_string(&bp[group + 4]))); + ND_TCHECK_LEN(bp + 4 + group, sizeof(struct in6_addr)); + ND_PRINT((ndo," [gaddr %s", ip6addr_string(ndo, bp + group + 4))); ND_PRINT((ndo," %s", tok2str(mldv2report2str, " [v2-report-#%d]", - bp[group]))); - nsrcs = (bp[group + 2] << 8) + bp[group + 3]; + EXTRACT_U_1(bp + group)))); + nsrcs = (EXTRACT_U_1(bp + group + 2) << 8) + + EXTRACT_U_1(bp + group + 3); /* Check the number of sources and print them */ if (len < group + 20 + (nsrcs * sizeof(struct in6_addr))) { ND_PRINT((ndo," [invalid number of sources %d]", nsrcs)); @@ -1405,13 +1598,13 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len) ND_PRINT((ndo,", %d source(s)", nsrcs)); else { /* Print the sources */ - (void)ND_PRINT((ndo," {")); + ND_PRINT((ndo," {")); for (j = 0; j < nsrcs; j++) { - ND_TCHECK2(bp[group + 20 + j * sizeof(struct in6_addr)], - sizeof(struct in6_addr)); - ND_PRINT((ndo," %s", ip6addr_string(&bp[group + 20 + j * sizeof(struct in6_addr)]))); + ND_TCHECK_LEN(bp + group + 20 + (j * sizeof(struct in6_addr)), + sizeof(struct in6_addr)); + ND_PRINT((ndo," %s", ip6addr_string(ndo, bp + group + 20 + (j * sizeof(struct in6_addr))))); } - (void)ND_PRINT((ndo," }")); + ND_PRINT((ndo," }")); } /* Next group record */ group += 20 + nsrcs * sizeof(struct in6_addr); @@ -1420,18 +1613,18 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len) } return; trunc: - (void)ND_PRINT((ndo,"[|icmp6]")); + ND_PRINT((ndo,"[|icmp6]")); return; } static void mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len) { - struct icmp6_hdr *icp = (struct icmp6_hdr *) bp; + const struct icmp6_hdr *icp = (const struct icmp6_hdr *) bp; u_int mrc; int mrt, qqi; u_int nsrcs; - register u_int i; + u_int i; /* Minimum len is 28 */ if (len < 28) { @@ -1439,45 +1632,46 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len) return; } ND_TCHECK(icp->icmp6_data16[0]); - mrc = EXTRACT_16BITS(&icp->icmp6_data16[0]); + mrc = EXTRACT_BE_U_2(&icp->icmp6_data16[0]); if (mrc < 32768) { mrt = mrc; } else { mrt = ((mrc & 0x0fff) | 0x1000) << (((mrc & 0x7000) >> 12) + 3); } if (ndo->ndo_vflag) { - (void)ND_PRINT((ndo," [max resp delay=%d]", mrt)); + ND_PRINT((ndo," [max resp delay=%d]", mrt)); } - ND_TCHECK2(bp[8], sizeof(struct in6_addr)); - ND_PRINT((ndo," [gaddr %s", ip6addr_string(&bp[8]))); + ND_TCHECK_LEN(bp + 8, sizeof(struct in6_addr)); + ND_PRINT((ndo," [gaddr %s", ip6addr_string(ndo, bp + 8))); if (ndo->ndo_vflag) { - ND_TCHECK(bp[25]); - if (bp[24] & 0x08) { + ND_TCHECK_1(bp + 25); + if (EXTRACT_U_1(bp + 24) & 0x08) { ND_PRINT((ndo," sflag")); } - if (bp[24] & 0x07) { - ND_PRINT((ndo," robustness=%d", bp[24] & 0x07)); + if (EXTRACT_U_1(bp + 24) & 0x07) { + ND_PRINT((ndo," robustness=%d", EXTRACT_U_1(bp + 24) & 0x07)); } - if (bp[25] < 128) { - qqi = bp[25]; + if (EXTRACT_U_1(bp + 25) < 128) { + qqi = EXTRACT_U_1(bp + 25); } else { - qqi = ((bp[25] & 0x0f) | 0x10) << (((bp[25] & 0x70) >> 4) + 3); + qqi = ((EXTRACT_U_1(bp + 25) & 0x0f) | 0x10) << + (((EXTRACT_U_1(bp + 25) & 0x70) >> 4) + 3); } ND_PRINT((ndo," qqi=%d", qqi)); } - ND_TCHECK2(bp[26], 2); - nsrcs = EXTRACT_16BITS(&bp[26]); + ND_TCHECK_2(bp + 26); + nsrcs = EXTRACT_BE_U_2(bp + 26); if (nsrcs > 0) { if (len < 28 + nsrcs * sizeof(struct in6_addr)) ND_PRINT((ndo," [invalid number of sources]")); else if (ndo->ndo_vflag > 1) { ND_PRINT((ndo," {")); for (i = 0; i < nsrcs; i++) { - ND_TCHECK2(bp[28 + i * sizeof(struct in6_addr)], - sizeof(struct in6_addr)); - ND_PRINT((ndo," %s", ip6addr_string(&bp[28 + i * sizeof(struct in6_addr)]))); + ND_TCHECK_LEN(bp + 28 + (i * sizeof(struct in6_addr)), + sizeof(struct in6_addr)); + ND_PRINT((ndo," %s", ip6addr_string(ndo, bp + 28 + (i * sizeof(struct in6_addr))))); } ND_PRINT((ndo," }")); } else @@ -1486,7 +1680,7 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len) ND_PRINT((ndo,"]")); return; trunc: - (void)ND_PRINT((ndo,"[|icmp6]")); + ND_PRINT((ndo,"[|icmp6]")); return; } @@ -1498,23 +1692,24 @@ dnsname_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) /* DNS name decoding - no decompression */ ND_PRINT((ndo,", \"")); while (cp < ep) { - i = *cp++; + i = EXTRACT_U_1(cp); + cp++; if (i) { if (i > ep - cp) { ND_PRINT((ndo,"???")); break; } while (i-- && cp < ep) { - safeputchar(*cp); + safeputchar(ndo, EXTRACT_U_1(cp)); cp++; } - if (cp + 1 < ep && *cp) + if (cp + 1 < ep && EXTRACT_U_1(cp)) ND_PRINT((ndo,".")); } else { if (cp == ep) { /* FQDN */ ND_PRINT((ndo,".")); - } else if (cp + 1 == ep && *cp == '\0') { + } else if (cp + 1 == ep && EXTRACT_U_1(cp) == '\0') { /* truncated */ } else { /* invalid */ @@ -1529,16 +1724,16 @@ dnsname_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) static void icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, const u_char *ep) { - struct icmp6_nodeinfo *ni6; - struct icmp6_hdr *dp; + const struct icmp6_nodeinfo *ni6; + const struct icmp6_hdr *dp; const u_char *cp; size_t siz, i; int needcomma; if (ep < bp) return; - dp = (struct icmp6_hdr *)bp; - ni6 = (struct icmp6_nodeinfo *)bp; + dp = (const struct icmp6_hdr *)bp; + ni6 = (const struct icmp6_nodeinfo *)bp; siz = ep - bp; switch (ni6->ni_type) { @@ -1550,20 +1745,19 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, } ND_PRINT((ndo," node information query")); - ND_TCHECK2(*dp, sizeof(*ni6)); - ni6 = (struct icmp6_nodeinfo *)dp; + ND_TCHECK_LEN(dp, sizeof(*ni6)); + ni6 = (const struct icmp6_nodeinfo *)dp; ND_PRINT((ndo," (")); /*)*/ - switch (EXTRACT_16BITS(&ni6->ni_qtype)) { + switch (EXTRACT_BE_U_2(&ni6->ni_qtype)) { case NI_QTYPE_NOOP: ND_PRINT((ndo,"noop")); break; case NI_QTYPE_SUPTYPES: ND_PRINT((ndo,"supported qtypes")); - i = EXTRACT_16BITS(&ni6->ni_flags); + i = EXTRACT_BE_U_2(&ni6->ni_flags); if (i) ND_PRINT((ndo," [%s]", (i & 0x01) ? "C" : "")); break; - break; case NI_QTYPE_FQDN: ND_PRINT((ndo,"DNS name")); break; @@ -1607,8 +1801,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, switch (ni6->ni_code) { case ICMP6_NI_SUBJ_IPV6: - if (!ND_TTEST2(*dp, - sizeof(*ni6) + sizeof(struct in6_addr))) + if (!ND_TTEST_LEN(dp, sizeof(*ni6) + sizeof(struct in6_addr))) break; if (siz != sizeof(*ni6) + sizeof(struct in6_addr)) { if (ndo->ndo_vflag) @@ -1616,19 +1809,19 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, break; } ND_PRINT((ndo,", subject=%s", - getname6((const u_char *)(ni6 + 1)))); + ip6addr_string(ndo, ni6 + 1))); break; case ICMP6_NI_SUBJ_FQDN: ND_PRINT((ndo,", subject=DNS name")); cp = (const u_char *)(ni6 + 1); - if (cp[0] == ep - cp - 1) { + if (EXTRACT_U_1(cp) == ep - cp - 1) { /* icmp-name-lookup-03, pascal string */ if (ndo->ndo_vflag) ND_PRINT((ndo,", 03 draft")); cp++; ND_PRINT((ndo,", \"")); while (cp < ep) { - safeputchar(*cp); + safeputchar(ndo, EXTRACT_U_1(cp)); cp++; } ND_PRINT((ndo,"\"")); @@ -1636,7 +1829,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, dnsname_print(ndo, cp, ep); break; case ICMP6_NI_SUBJ_IPV4: - if (!ND_TTEST2(*dp, sizeof(*ni6) + sizeof(struct in_addr))) + if (!ND_TTEST_LEN(dp, sizeof(*ni6) + sizeof(struct in_addr))) break; if (siz != sizeof(*ni6) + sizeof(struct in_addr)) { if (ndo->ndo_vflag) @@ -1644,7 +1837,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, break; } ND_PRINT((ndo,", subject=%s", - getname((const u_char *)(ni6 + 1)))); + ipaddr_string(ndo, ni6 + 1))); break; default: ND_PRINT((ndo,", unknown subject")); @@ -1663,7 +1856,8 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, needcomma = 0; - ni6 = (struct icmp6_nodeinfo *)dp; + ND_TCHECK_LEN(dp, sizeof(*ni6)); + ni6 = (const struct icmp6_nodeinfo *)dp; ND_PRINT((ndo," node information reply")); ND_PRINT((ndo," (")); /*)*/ switch (ni6->ni_code) { @@ -1695,7 +1889,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, break; } - switch (EXTRACT_16BITS(&ni6->ni_qtype)) { + switch (EXTRACT_BE_U_2(&ni6->ni_qtype)) { case NI_QTYPE_NOOP: if (needcomma) ND_PRINT((ndo,", ")); @@ -1708,7 +1902,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, if (needcomma) ND_PRINT((ndo,", ")); ND_PRINT((ndo,"supported qtypes")); - i = EXTRACT_16BITS(&ni6->ni_flags); + i = EXTRACT_BE_U_2(&ni6->ni_flags); if (i) ND_PRINT((ndo," [%s]", (i & 0x01) ? "C" : "")); break; @@ -1717,21 +1911,22 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, ND_PRINT((ndo,", ")); ND_PRINT((ndo,"DNS name")); cp = (const u_char *)(ni6 + 1) + 4; - if (cp[0] == ep - cp - 1) { + ND_TCHECK_1(cp); + if (EXTRACT_U_1(cp) == ep - cp - 1) { /* icmp-name-lookup-03, pascal string */ if (ndo->ndo_vflag) ND_PRINT((ndo,", 03 draft")); cp++; ND_PRINT((ndo,", \"")); while (cp < ep) { - safeputchar(*cp); + safeputchar(ndo, EXTRACT_U_1(cp)); cp++; } ND_PRINT((ndo,"\"")); } else dnsname_print(ndo, cp, ep); - if ((EXTRACT_16BITS(&ni6->ni_flags) & 0x01) != 0) - ND_PRINT((ndo," [TTL=%u]", *(u_int32_t *)(ni6 + 1))); + if ((EXTRACT_BE_U_2(&ni6->ni_flags) & 0x01) != 0) + ND_PRINT((ndo," [TTL=%u]", EXTRACT_BE_U_4(ni6 + 1))); break; case NI_QTYPE_NODEADDR: if (needcomma) @@ -1741,9 +1936,9 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, while (i < siz) { if (i + sizeof(struct in6_addr) + sizeof(int32_t) > siz) break; - ND_PRINT((ndo," %s", getname6(bp + i))); + ND_PRINT((ndo," %s", ip6addr_string(ndo, bp + i))); i += sizeof(struct in6_addr); - ND_PRINT((ndo,"(%d)", (int32_t)EXTRACT_32BITS(bp + i))); + ND_PRINT((ndo,"(%d)", (int32_t) EXTRACT_BE_U_4(bp + i))); i += sizeof(int32_t); } i = ni6->ni_flags; @@ -1778,16 +1973,16 @@ trunc: static void icmp6_rrenum_print(netdissect_options *ndo, const u_char *bp, const u_char *ep) { - struct icmp6_router_renum *rr6; + const struct icmp6_router_renum *rr6; const char *cp; - struct rr_pco_match *match; - struct rr_pco_use *use; + const struct rr_pco_match *match; + const struct rr_pco_use *use; char hbuf[NI_MAXHOST]; int n; if (ep < bp) return; - rr6 = (struct icmp6_router_renum *)bp; + rr6 = (const struct icmp6_router_renum *)bp; cp = (const char *)(rr6 + 1); ND_TCHECK(rr6->rr_reserved); @@ -1806,7 +2001,7 @@ icmp6_rrenum_print(netdissect_options *ndo, const u_char *bp, const u_char *ep) break; } - ND_PRINT((ndo,", seq=%u", EXTRACT_32BITS(&rr6->rr_seqnum))); + ND_PRINT((ndo,", seq=%u", EXTRACT_BE_U_4(&rr6->rr_seqnum))); if (ndo->ndo_vflag) { #define F(x, y) ((rr6->rr_flags) & (x) ? (y) : "") @@ -1819,16 +2014,16 @@ icmp6_rrenum_print(netdissect_options *ndo, const u_char *bp, const u_char *ep) F(ICMP6_RR_FLAGS_PREVDONE, "P"))); } ND_PRINT((ndo,"seg=%u,", rr6->rr_segnum)); - ND_PRINT((ndo,"maxdelay=%u", EXTRACT_16BITS(&rr6->rr_maxdelay))); + ND_PRINT((ndo,"maxdelay=%u", EXTRACT_BE_U_2(&rr6->rr_maxdelay))); if (rr6->rr_reserved) - ND_PRINT((ndo,"rsvd=0x%x", EXTRACT_32BITS(&rr6->rr_reserved))); + ND_PRINT((ndo,"rsvd=0x%x", EXTRACT_BE_U_4(&rr6->rr_reserved))); /*[*/ ND_PRINT((ndo,"]")); #undef F } if (rr6->rr_code == ICMP6_ROUTER_RENUMBERING_COMMAND) { - match = (struct rr_pco_match *)cp; + match = (const struct rr_pco_match *)cp; cp = (const char *)(match + 1); ND_TCHECK(match->rpm_prefix); @@ -1850,7 +2045,7 @@ icmp6_rrenum_print(netdissect_options *ndo, const u_char *bp, const u_char *ep) ND_PRINT((ndo,",min=%u", match->rpm_minlen)); ND_PRINT((ndo,",max=%u", match->rpm_maxlen)); } - if (inet_ntop(AF_INET6, &match->rpm_prefix, hbuf, sizeof(hbuf))) + if (addrtostr6(&match->rpm_prefix, hbuf, sizeof(hbuf))) ND_PRINT((ndo,",%s/%u", hbuf, match->rpm_matchlen)); else ND_PRINT((ndo,",?/%u", match->rpm_matchlen)); @@ -1862,7 +2057,7 @@ icmp6_rrenum_print(netdissect_options *ndo, const u_char *bp, const u_char *ep) goto trunc; n /= 4; while (n-- > 0) { - use = (struct rr_pco_use *)cp; + use = (const struct rr_pco_use *)cp; cp = (const char *)(use + 1); ND_TCHECK(use->rpu_prefix); @@ -1886,15 +2081,14 @@ icmp6_rrenum_print(netdissect_options *ndo, const u_char *bp, const u_char *ep) ND_PRINT((ndo,"vltime=infty,")); else ND_PRINT((ndo,"vltime=%u,", - EXTRACT_32BITS(&use->rpu_vltime))); + EXTRACT_BE_U_4(&use->rpu_vltime))); if (~use->rpu_pltime == 0) ND_PRINT((ndo,"pltime=infty,")); else ND_PRINT((ndo,"pltime=%u,", - EXTRACT_32BITS(&use->rpu_pltime))); + EXTRACT_BE_U_4(&use->rpu_pltime))); } - if (inet_ntop(AF_INET6, &use->rpu_prefix, hbuf, - sizeof(hbuf))) + if (addrtostr6(&use->rpu_prefix, hbuf, sizeof(hbuf))) ND_PRINT((ndo,"%s/%u/%u", hbuf, use->rpu_uselen, use->rpu_keeplen)); else @@ -1911,8 +2105,6 @@ trunc: ND_PRINT((ndo,"[|icmp6]")); } -#endif /* INET6 */ - /* * Local Variables: * c-style: whitesmith