X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ac910c086ec393a8c320a82d0edb5ea412175b62..refs/pull/435/head:/print-icmp6.c diff --git a/print-icmp6.c b/print-icmp6.c index 011702bc..81563e6c 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -19,11 +19,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.86 2008-02-05 19:36:13 guy Exp $"; -#endif - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -35,25 +31,457 @@ static const char rcsid[] _U_ = #include #include -#include "netdissect.h" +#include "interface.h" #include "addrtoname.h" #include "extract.h" #include "ip6.h" -#include "icmp6.h" #include "ipproto.h" #include "udp.h" #include "ah.h" +/* 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 $ */ + +/* + * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +struct icmp6_hdr { + uint8_t icmp6_type; /* type field */ + uint8_t icmp6_code; /* code field */ + uint16_t icmp6_cksum; /* checksum field */ + union { + 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; +}; + +#define icmp6_data32 icmp6_dataun.icmp6_un_data32 +#define icmp6_data16 icmp6_dataun.icmp6_un_data16 +#define icmp6_data8 icmp6_dataun.icmp6_un_data8 +#define icmp6_pptr icmp6_data32[0] /* parameter prob */ +#define icmp6_mtu icmp6_data32[0] /* packet too big */ +#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_DST_UNREACH 1 /* dest unreachable, codes: */ +#define ICMP6_PACKET_TOO_BIG 2 /* packet too big */ +#define ICMP6_TIME_EXCEEDED 3 /* time exceeded, code: */ +#define ICMP6_PARAM_PROB 4 /* ip6 header bad */ + +#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 ICMP6_MEMBERSHIP_REPORT 131 /* group membership report */ +#define MLD6_LISTENER_REPORT 131 /* multicast listener report */ +#define ICMP6_MEMBERSHIP_REDUCTION 132 /* group membership termination */ +#define MLD6_LISTENER_DONE 132 /* multicast listener done */ + +#define ND_ROUTER_SOLICIT 133 /* router solicitation */ +#define ND_ROUTER_ADVERT 134 /* router advertisement */ +#define ND_NEIGHBOR_SOLICIT 135 /* neighbor solicitation */ +#define ND_NEIGHBOR_ADVERT 136 /* neighbor advertisement */ +#define ND_REDIRECT 137 /* redirect */ + +#define ICMP6_ROUTER_RENUMBERING 138 /* router renumbering */ + +#define ICMP6_WRUREQUEST 139 /* who are you request */ +#define ICMP6_WRUREPLY 140 /* who are you reply */ +#define ICMP6_FQDN_QUERY 139 /* FQDN query */ +#define ICMP6_FQDN_REPLY 140 /* FQDN reply */ +#define ICMP6_NI_QUERY 139 /* node information request */ +#define ICMP6_NI_REPLY 140 /* node information reply */ +#define IND_SOLICIT 141 /* inverse neighbor solicitation */ +#define IND_ADVERT 142 /* inverse neighbor advertisement */ + +#define ICMP6_V2_MEMBERSHIP_REPORT 143 /* v2 membership report */ +#define MLDV2_LISTENER_REPORT 143 /* v2 multicast listener report */ +#define ICMP6_HADISCOV_REQUEST 144 +#define ICMP6_HADISCOV_REPLY 145 +#define ICMP6_MOBILEPREFIX_SOLICIT 146 +#define ICMP6_MOBILEPREFIX_ADVERT 147 + +#define MLD6_MTRACE_RESP 200 /* mtrace response(to sender) */ +#define MLD6_MTRACE 201 /* mtrace messages */ + +#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_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_REASSEMBLY 1 /* ttl==0 in reass */ + +#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_INFOMSG_MASK 0x80 /* all informational messages */ + +#define ICMP6_NI_SUBJ_IPV6 0 /* Query Subject is an IPv6 address */ +#define ICMP6_NI_SUBJ_FQDN 1 /* Query Subject is a Domain name */ +#define ICMP6_NI_SUBJ_IPV4 2 /* Query Subject is an IPv4 address */ + +#define ICMP6_NI_SUCCESS 0 /* node information successful reply */ +#define ICMP6_NI_REFUSED 1 /* node information request is refused */ +#define ICMP6_NI_UNKNOWN 2 /* unknown Qtype */ + +#define ICMP6_ROUTER_RENUMBERING_COMMAND 0 /* rr command */ +#define ICMP6_ROUTER_RENUMBERING_RESULT 1 /* rr result */ +#define ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET 255 /* rr seq num reset */ + +/* Used in kernel only */ +#define ND_REDIRECT_ONLINK 0 /* redirect to an on-link node */ +#define ND_REDIRECT_ROUTER 1 /* redirect to a better router */ + +/* + * Multicast Listener Discovery + */ +struct mld6_hdr { + struct icmp6_hdr mld6_hdr; + struct in6_addr mld6_addr; /* multicast address */ +}; + +#define mld6_type mld6_hdr.icmp6_type +#define mld6_code mld6_hdr.icmp6_code +#define mld6_cksum mld6_hdr.icmp6_cksum +#define mld6_maxdelay mld6_hdr.icmp6_data16[0] +#define mld6_reserved mld6_hdr.icmp6_data16[1] + +#define MLD_MINLEN 24 +#define MLDV2_MINLEN 28 + +/* + * Neighbor Discovery + */ + +struct nd_router_solicit { /* router solicitation */ + struct icmp6_hdr nd_rs_hdr; + /* could be followed by options */ +}; + +#define nd_rs_type nd_rs_hdr.icmp6_type +#define nd_rs_code nd_rs_hdr.icmp6_code +#define nd_rs_cksum nd_rs_hdr.icmp6_cksum +#define nd_rs_reserved nd_rs_hdr.icmp6_data32[0] + +struct nd_router_advert { /* router advertisement */ + struct icmp6_hdr nd_ra_hdr; + uint32_t nd_ra_reachable; /* reachable time */ + uint32_t nd_ra_retransmit; /* retransmit timer */ + /* could be followed by options */ +}; + +#define nd_ra_type nd_ra_hdr.icmp6_type +#define nd_ra_code nd_ra_hdr.icmp6_code +#define nd_ra_cksum nd_ra_hdr.icmp6_cksum +#define nd_ra_curhoplimit nd_ra_hdr.icmp6_data8[0] +#define nd_ra_flags_reserved nd_ra_hdr.icmp6_data8[1] +#define ND_RA_FLAG_MANAGED 0x80 +#define ND_RA_FLAG_OTHER 0x40 +#define ND_RA_FLAG_HOME_AGENT 0x20 + +/* + * Router preference values based on draft-draves-ipngwg-router-selection-01. + * These are non-standard definitions. + */ +#define ND_RA_FLAG_RTPREF_MASK 0x18 /* 00011000 */ + +#define ND_RA_FLAG_RTPREF_HIGH 0x08 /* 00001000 */ +#define ND_RA_FLAG_RTPREF_MEDIUM 0x00 /* 00000000 */ +#define ND_RA_FLAG_RTPREF_LOW 0x18 /* 00011000 */ +#define ND_RA_FLAG_RTPREF_RSV 0x10 /* 00010000 */ + +#define nd_ra_router_lifetime nd_ra_hdr.icmp6_data16[1] + +struct nd_neighbor_solicit { /* neighbor solicitation */ + struct icmp6_hdr nd_ns_hdr; + struct in6_addr nd_ns_target; /*target address */ + /* could be followed by options */ +}; + +#define nd_ns_type nd_ns_hdr.icmp6_type +#define nd_ns_code nd_ns_hdr.icmp6_code +#define nd_ns_cksum nd_ns_hdr.icmp6_cksum +#define nd_ns_reserved nd_ns_hdr.icmp6_data32[0] + +struct nd_neighbor_advert { /* neighbor advertisement */ + struct icmp6_hdr nd_na_hdr; + struct in6_addr nd_na_target; /* target address */ + /* could be followed by options */ +}; + +#define nd_na_type nd_na_hdr.icmp6_type +#define nd_na_code nd_na_hdr.icmp6_code +#define nd_na_cksum nd_na_hdr.icmp6_cksum +#define nd_na_flags_reserved nd_na_hdr.icmp6_data32[0] + +#define ND_NA_FLAG_ROUTER 0x80000000 +#define ND_NA_FLAG_SOLICITED 0x40000000 +#define ND_NA_FLAG_OVERRIDE 0x20000000 + +struct nd_redirect { /* redirect */ + struct icmp6_hdr nd_rd_hdr; + struct in6_addr nd_rd_target; /* target address */ + struct in6_addr nd_rd_dst; /* destination address */ + /* could be followed by options */ +}; + +#define nd_rd_type nd_rd_hdr.icmp6_type +#define nd_rd_code nd_rd_hdr.icmp6_code +#define nd_rd_cksum nd_rd_hdr.icmp6_cksum +#define nd_rd_reserved nd_rd_hdr.icmp6_data32[0] + +struct nd_opt_hdr { /* Neighbor discovery option header */ + uint8_t nd_opt_type; + uint8_t nd_opt_len; + /* followed by option specific data*/ +}; + +#define ND_OPT_SOURCE_LINKADDR 1 +#define ND_OPT_TARGET_LINKADDR 2 +#define ND_OPT_PREFIX_INFORMATION 3 +#define ND_OPT_REDIRECTED_HEADER 4 +#define ND_OPT_MTU 5 +#define ND_OPT_ADVINTERVAL 7 +#define ND_OPT_HOMEAGENT_INFO 8 +#define ND_OPT_ROUTE_INFO 24 /* RFC4191 */ +#define ND_OPT_RDNSS 25 +#define ND_OPT_DNSSL 31 + +struct nd_opt_prefix_info { /* prefix information */ + uint8_t nd_opt_pi_type; + uint8_t nd_opt_pi_len; + uint8_t nd_opt_pi_prefix_len; + uint8_t nd_opt_pi_flags_reserved; + uint8_t nd_opt_pi_valid_time[4]; + uint8_t nd_opt_pi_preferred_time[4]; + uint8_t nd_opt_pi_reserved2[4]; + struct in6_addr nd_opt_pi_prefix; +}; + +#define ND_OPT_PI_FLAG_ONLINK 0x80 +#define ND_OPT_PI_FLAG_AUTO 0x40 +#define ND_OPT_PI_FLAG_ROUTER 0x20 /*2292bis*/ + +struct nd_opt_rd_hdr { /* redirected header */ + 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 */ + 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 */ + 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 */ + 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 */ + 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 */ + uint8_t nd_opt_hai_type; + uint8_t nd_opt_hai_len; + uint16_t nd_opt_hai_reserved; + int16_t nd_opt_hai_preference; + uint16_t nd_opt_hai_lifetime; +}; + +struct nd_opt_route_info { /* route info */ + 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 */ +}; + +/* + * icmp6 namelookup + */ + +struct icmp6_namelookup { + struct icmp6_hdr icmp6_nl_hdr; + uint8_t icmp6_nl_nonce[8]; + int32_t icmp6_nl_ttl; +#if 0 + uint8_t icmp6_nl_len; + uint8_t icmp6_nl_name[3]; +#endif + /* could be followed by options */ +}; + +/* + * icmp6 node information + */ +struct icmp6_nodeinfo { + struct icmp6_hdr icmp6_ni_hdr; + uint8_t icmp6_ni_nonce[8]; + /* could be followed by reply data */ +}; + +#define ni_type icmp6_ni_hdr.icmp6_type +#define ni_code icmp6_ni_hdr.icmp6_code +#define ni_cksum icmp6_ni_hdr.icmp6_cksum +#define ni_qtype icmp6_ni_hdr.icmp6_data16[0] +#define ni_flags icmp6_ni_hdr.icmp6_data16[1] + +#define NI_QTYPE_NOOP 0 /* NOOP */ +#define NI_QTYPE_SUPTYPES 1 /* Supported Qtypes */ +#define NI_QTYPE_FQDN 2 /* FQDN (draft 04) */ +#define NI_QTYPE_DNSNAME 2 /* DNS Name */ +#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 */ + +struct ni_reply_fqdn { + 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 */ +}; + +/* + * Router Renumbering. as router-renum-08.txt + */ +struct icmp6_router_renum { /* router renumbering header */ + struct icmp6_hdr rr_hdr; + 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 +#define ICMP6_RR_FLAGS_FORCEAPPLY 0x20 +#define ICMP6_RR_FLAGS_SPECSITE 0x10 +#define ICMP6_RR_FLAGS_PREVDONE 0x08 + +#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] + +struct rr_pco_match { /* match prefix part */ + 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; +}; + +#define RPM_PCO_ADD 1 +#define RPM_PCO_CHANGE 2 +#define RPM_PCO_SETGLOBAL 3 +#define RPM_PCO_MAX 4 + +struct rr_pco_use { /* use prefix part */ + 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 ((uint32_t)htonl(0x80000000)) +#define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME ((uint32_t)htonl(0x40000000)) + +struct rr_result { /* router renumbering result message */ + 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 ((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 *); @@ -62,8 +490,7 @@ 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 +#include "rpl.h" static const struct tok icmp6_type_values[] = { { ICMP6_DST_UNREACH, "destination unreachable"}, @@ -168,11 +595,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); @@ -181,9 +608,9 @@ 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; @@ -198,93 +625,249 @@ print_lladdr(netdissect_options *ndo, const u_int8_t *p, size_t l) static int icmp6_cksum(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(ip6, (const uint8_t *)(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, +const struct tok rpl_mop_values[] = { + { RPL_DIO_NONSTORING, "nonstoring"}, + { RPL_DIO_STORING, "storing"}, + { RPL_DIO_NONSTORING_MULTICAST, "nonstoring-multicast"}, + { RPL_DIO_STORING_MULTICAST, "storing-multicast"}, + { 0, NULL}, }; -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 */ +const struct tok rpl_subopt_values[] = { + { RPL_OPT_PAD0, "pad0"}, + { RPL_OPT_PADN, "padN"}, + { RPL_DIO_METRICS, "metrics"}, + { RPL_DIO_ROUTINGINFO, "routinginfo"}, + { RPL_DIO_CONFIG, "config"}, + { RPL_DAO_RPLTARGET, "rpltarget"}, + { RPL_DAO_TRANSITINFO, "transitinfo"}, + { RPL_DIO_DESTPREFIX, "destprefix"}, + { RPL_DAO_RPLTARGET_DESC, "rpltargetdesc"}, + { 0, NULL}, }; -struct nd_rpl_dio { - u_int8_t rpl_flags; - u_int8_t rpl_seq; - u_int8_t rpl_instanceid; - u_int8_t rpl_dagrank; - u_int8_t rpl_dagid[16]; -}; +static void +rpl_format_dagid(char dagid_str[65], const u_char *dagid) +{ + char *d = dagid_str; + int i; + + for(i=0;i<16;i++) { + if(isprint(dagid[i])) { + *d++ = dagid[i]; + } else { + snprintf(d,5,"0x%02x", dagid[i]); /* 4 + null char */ + d += 4; + } + } + *d++ = '\0'; +} + +static void +rpl_dio_printopt(netdissect_options *ndo, + const struct rpl_dio_genoption *opt, + u_int length) +{ + 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 && + (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, + " ", + ((uint8_t *)opt) + RPL_DIO_GENOPTION_LEN, /* content of DIO option */ + paylen); + } + } + opt = (struct rpl_dio_genoption *)(((char *)opt) + optlen); + length -= optlen; + } + 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 = (struct nd_rpl_dio *)bp; + char dagid_str[65]; + + ND_TCHECK(*dio); + rpl_format_dagid(dagid_str, dio->rpl_dagid); + + ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u,rank:%u,%smop:%s,prf:%u]", + dagid_str, + dio->rpl_dtsn, + dio->rpl_instanceid, + EXTRACT_16BITS(&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 rpl_dio_genoption *opt = (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 = (struct nd_rpl_dao *)bp; + char dagid_str[65]; + + ND_TCHECK(*dao); + if (length < ND_RPL_DAO_MIN_LEN) + goto tooshort; + + strcpy(dagid_str,""); + bp += ND_RPL_DAO_MIN_LEN; + length -= ND_RPL_DAO_MIN_LEN; + if(RPL_DAO_D(dao->rpl_flags)) { + ND_TCHECK2(dao->rpl_dagid, DAGID_LEN); + if (length < DAGID_LEN) + goto tooshort; + rpl_format_dagid(dagid_str, 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 = (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 = (struct nd_rpl_daoack *)bp; + char dagid_str[65]; + + ND_TCHECK2(*daoack, ND_RPL_DAOACK_MIN_LEN); + if (length < ND_RPL_DAOACK_MIN_LEN) + goto tooshort; + + strcpy(dagid_str,""); + bp += ND_RPL_DAOACK_MIN_LEN; + length -= ND_RPL_DAOACK_MIN_LEN; + if(RPL_DAOACK_D(daoack->rpl_flags)) { + ND_TCHECK2(daoack->rpl_dagid, 16); + if (length < DAGID_LEN) + goto tooshort; + rpl_format_dagid(dagid_str, 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 = (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 rpl_print(netdissect_options *ndo, const struct icmp6_hdr *hdr, - const u_char *bp, u_int length _U_) + const u_char *bp, u_int length) { - struct nd_rpl_dio *dio = (struct nd_rpl_dio *)bp; int secured = hdr->icmp6_code & 0x80; int basecode= hdr->icmp6_code & 0x7f; - ND_TCHECK(dio->rpl_dagid); - 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) { - char dagid[65]; - char *d = dagid; - int i; - for(i=0;i<16;i++) { - if(isprint(dio->rpl_dagid[i])) { - *d++ = dio->rpl_dagid[i]; - } else { - int cnt=snprintf(d,4,"0x%02x", - dio->rpl_dagid[i]); - d += cnt; - } - } - *d++ = '\0'; - ND_PRINT((ndo, " [seq:%u,instance:%u,rank:%u,dagid:%s]", - dio->rpl_seq, - dio->rpl_instanceid, - dio->rpl_dagrank, - dagid)); + 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: @@ -292,9 +875,12 @@ rpl_print(netdissect_options *ndo, break; } return; + +#if 0 trunc: ND_PRINT((ndo," [|truncated]")); return; +#endif } @@ -320,17 +906,17 @@ icmp6_print(netdissect_options *ndo, 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 (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] ")); } } @@ -355,12 +941,12 @@ 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)) @@ -371,17 +957,17 @@ icmp6_print(netdissect_options *ndo, switch (prot) { case IPPROTO_TCP: ND_PRINT((ndo,", %s tcp port %s", - ip6addr_string(&oip->ip6_dst), + ip6addr_string(ndo, &oip->ip6_dst), tcpport_string(dport))); break; case IPPROTO_UDP: ND_PRINT((ndo,", %s udp port %s", - ip6addr_string(&oip->ip6_dst), + ip6addr_string(ndo, &oip->ip6_dst), udpport_string(dport))); break; default: ND_PRINT((ndo,", %s protocol %d port %d unreachable", - ip6addr_string(&oip->ip6_dst), + ip6addr_string(ndo, &oip->ip6_dst), oip->ip6_nxt, dport)); break; } @@ -403,7 +989,7 @@ icmp6_print(netdissect_options *ndo, 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)")); @@ -484,7 +1070,7 @@ icmp6_print(netdissect_options *ndo, struct nd_neighbor_solicit *p; p = (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, @@ -499,7 +1085,7 @@ icmp6_print(netdissect_options *ndo, p = (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, @@ -515,10 +1101,10 @@ icmp6_print(netdissect_options *ndo, case ND_REDIRECT: #define RDR(i) ((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", getname6(ndo, (const u_char *)&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))); + getname6(ndo, (const u_char*)&RDR(dp)->nd_rd_target))); #define REDIRECTLEN 40 if (ndo->ndo_vflag) { icmp6_opt_print(ndo, (const u_char *)dp + REDIRECTLEN, @@ -556,7 +1142,7 @@ icmp6_print(netdissect_options *ndo, in6 = (struct in6_addr *)(dp + 1); for (; (u_char *)in6 < cp; in6++) { ND_TCHECK(*in6); - ND_PRINT((ndo,", %s", ip6addr_string(in6))); + ND_PRINT((ndo,", %s", ip6addr_string(ndo, in6))); } } break; @@ -576,7 +1162,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)); @@ -591,15 +1178,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 = (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; @@ -717,7 +1304,7 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) opp = (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), + ip6addr_string(ndo, &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), @@ -743,7 +1330,7 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) 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: @@ -753,8 +1340,8 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) domp = cp + 8; /* domain names, variable-sized, RFC1035-encoded */ while (domp < cp + (op->nd_opt_len << 3) && *domp != '\0') { - printf (" "); - if ((domp = ns_nprint (domp, bp)) == NULL) + ND_PRINT((ndo, " ")); + if ((domp = ns_nprint (ndo, domp, bp)) == NULL) goto trunc; } break; @@ -789,7 +1376,7 @@ 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", @@ -820,7 +1407,7 @@ 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 = (struct mld6_hdr *)bp; const u_char *ep; /* 'ep' points to the end of available data. */ @@ -830,7 +1417,7 @@ mld6_print(netdissect_options *ndo, const u_char *bp) 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,"addr: %s", ip6addr_string(ndo, &mp->mld6_addr))); } static void @@ -859,7 +1446,7 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len) return; } ND_TCHECK2(bp[group + 4], sizeof(struct in6_addr)); - ND_PRINT((ndo," [gaddr %s", ip6addr_string(&bp[group + 4]))); + 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]; @@ -872,13 +1459,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_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); @@ -887,7 +1474,7 @@ 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; } @@ -913,10 +1500,10 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len) 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_PRINT((ndo," [gaddr %s", ip6addr_string(ndo, &bp[8]))); if (ndo->ndo_vflag) { ND_TCHECK(bp[25]); @@ -944,7 +1531,7 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len) 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_PRINT((ndo," %s", ip6addr_string(ndo, &bp[28 + i * sizeof(struct in6_addr)]))); } ND_PRINT((ndo," }")); } else @@ -953,7 +1540,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; } @@ -972,7 +1559,7 @@ dnsname_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) break; } while (i-- && cp < ep) { - safeputchar(*cp); + safeputchar(ndo, *cp); cp++; } if (cp + 1 < ep && *cp) @@ -996,8 +1583,8 @@ 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; @@ -1030,7 +1617,6 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, if (i) ND_PRINT((ndo," [%s]", (i & 0x01) ? "C" : "")); break; - break; case NI_QTYPE_FQDN: ND_PRINT((ndo,"DNS name")); break; @@ -1083,7 +1669,7 @@ 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)))); + getname6(ndo, (const u_char *)(ni6 + 1)))); break; case ICMP6_NI_SUBJ_FQDN: ND_PRINT((ndo,", subject=DNS name")); @@ -1095,7 +1681,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, cp++; ND_PRINT((ndo,", \"")); while (cp < ep) { - safeputchar(*cp); + safeputchar(ndo, *cp); cp++; } ND_PRINT((ndo,"\"")); @@ -1111,7 +1697,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)))); + getname(ndo, (const u_char *)(ni6 + 1)))); break; default: ND_PRINT((ndo,", unknown subject")); @@ -1191,14 +1777,14 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, cp++; ND_PRINT((ndo,", \"")); while (cp < ep) { - safeputchar(*cp); + safeputchar(ndo, *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))); + ND_PRINT((ndo," [TTL=%u]", *(uint32_t *)(ni6 + 1))); break; case NI_QTYPE_NODEADDR: if (needcomma) @@ -1208,7 +1794,7 @@ 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", getname6(ndo, bp + i))); i += sizeof(struct in6_addr); ND_PRINT((ndo,"(%d)", (int32_t)EXTRACT_32BITS(bp + i))); i += sizeof(int32_t); @@ -1245,7 +1831,7 @@ 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;