The Tcpdump Group git mirrors - tcpdump/blobdiff

index e3da022ed43a6982fc38bd0ab36dcc33386d54d0..81563e6c81389308823b0de6a916cf973ca5ea8e 100644 (file)

--- a/print-icmp6.c

+++ b/print-icmp6.c

@@ -19,6 +19,7 @@

* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

+#define NETDISSECT_REWORKED

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

@@ -30,7 +31,6 @@

#include <stdio.h>

#include <string.h>

#include <stdio.h>

#include <string.h>

-#include "netdissect.h"

#include "interface.h"

#include "addrtoname.h"

#include "extract.h"

#include "interface.h"

#include "addrtoname.h"

#include "extract.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;

};

} icmp6_dataun;

};

@@ -201,8 +201,8 @@ struct nd_router_solicit { /* router solicitation */

struct nd_router_advert { /* router advertisement */

struct icmp6_hdr nd_ra_hdr;

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 */

};

/* 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 */

#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;

+ uint8_t nd_opt_type;

+ uint8_t nd_opt_len;

/* followed by option specific data*/

};

/* 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 */

#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];

+ 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;

};

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 */

#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 */

/* 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 */

};

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 */

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 */

/* 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 */

};

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 */

};

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 */

};

/* prefix follows */

};

@@ -359,11 +359,11 @@ struct nd_opt_route_info { /* route info */

struct icmp6_namelookup {

struct icmp6_hdr icmp6_nl_hdr;

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

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 */

};

#endif

/* could be followed by options */

};

@@ -373,7 +373,7 @@ struct icmp6_namelookup {

struct icmp6_nodeinfo {

struct icmp6_hdr icmp6_ni_hdr;

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 */

};

/* could be followed by reply data */

};

@@ -391,22 +391,22 @@ struct icmp6_nodeinfo {

#define NI_QTYPE_IPV4ADDR 4 /* IPv4 Addresses */

/* network endian */

#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;

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

};

#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 */

#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;

};

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 */

#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 */

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 */

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 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 *);

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,7 @@ static void icmp6_rrenum_print(netdissect_options *ndo, const u_char *, const u_

#define abs(a) ((0 < (a)) ? (a) : -(a))

#endif

#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"},

static const struct tok icmp6_type_values[] = {

{ ICMP6_DST_UNREACH, "destination unreachable"},

@@ -596,11 +595,11 @@ get_rtpref(u_int v)

}

static const char *

}

static const char *

-get_lifetime(u_int32_t v)

+get_lifetime(uint32_t v)

{

static char buf[20];

{

static char buf[20];

- if (v == (u_int32_t)~0UL)

+ if (v == (uint32_t)~0UL)

return "infinity";

else {

snprintf(buf, sizeof(buf), "%us", v);

return "infinity";

else {

snprintf(buf, sizeof(buf), "%us", v);

@@ -609,9 +608,9 @@ get_lifetime(u_int32_t v)

}

static void

}

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;

q = p;

ep = p + l;

@@ -626,164 +625,110 @@ 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)

{

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},

};

-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,

-};

+static void

+rpl_format_dagid(char dagid_str[65], const u_char *dagid)

+ char *d = dagid_str;

+ int i;

-#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];

-};

+ 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 char *rpl_mop_name[]={

- "nonstoring",

- "storing",

- "nonstoring-multicast",

- "storing-multicast",

- "mop-reserved-4",

- "mop-reserved-5",

- "mop-reserved-6",

- "mop-reserved-7"

-};

+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;

-static char *rpl_subopt_name(int opt, char *buf, int len) {

- switch(opt) {

- case RPL_OPT_PAD0:

- return "pad0";

- case RPL_OPT_PADN:

- return "padN";

- case RPL_DIO_METRICS:

- return "metrics";

- case RPL_DIO_ROUTINGINFO:

- return "routinginfo";

- case RPL_DIO_CONFIG:

- return "routinginfo";

- case RPL_DAO_RPLTARGET:

- return "rpltarget";

- case RPL_DAO_TRANSITINFO:

- return "transitinfo";

- case RPL_DIO_DESTPREFIX:

- return "destprefix";

- case RPL_DAO_RPLTARGET_DESC:

- return "rpltargetdesc";

- default:

- snprintf(buf, len, "unknown:%u", opt);

- return buf;

+ 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,

}

static void

rpl_dio_print(netdissect_options *ndo,

- const struct icmp6_hdr *hdr,

const u_char *bp, u_int length)

{

const u_char *bp, 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);

+ 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);

- 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, " [dagid:%s,seq:%u,instance:%u,rank:%u,%smop:%s,prf:%u]",

- dagid,

+ dagid_str,

dio->rpl_dtsn,

dio->rpl_instanceid,

dio->rpl_dtsn,

dio->rpl_instanceid,

- dio->rpl_dagrank,

+ EXTRACT_16BITS(&dio->rpl_dagrank),

RPL_DIO_GROUNDED(dio->rpl_mopprf) ? "grounded,":"",

- rpl_mop_name[RPL_DIO_MOP(dio->rpl_mopprf)],

+ tok2str(rpl_mop_values, "mop%u", RPL_DIO_MOP(dio->rpl_mopprf)),

RPL_DIO_PRF(dio->rpl_mopprf)));

if(ndo->ndo_vflag > 1) {

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);

- char optname_buf[64];

- 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 len = opt->rpl_dio_len+2;

- if(opt->rpl_dio_type == RPL_OPT_PAD0) {

- len = 1;

- ND_PRINT((ndo, " opt:pad0"));

- } else {

- ND_PRINT((ndo, " opt:%s len:%u ",

- rpl_subopt_name(opt->rpl_dio_type, optname_buf, sizeof(optname_buf)),

- len));

- if(ndo->ndo_vflag > 2) {

- int len = opt->rpl_dio_len;

- if(len > length) len = length;

- hex_print(ndo,

- " ",

- (char *)&opt[1], /* content of DIO option */

- len);

- }

- opt = (struct nd_rpl_option *)(((char *)opt) + len);

- length -= len;

- }

+ struct rpl_dio_genoption *opt = (struct rpl_dio_genoption *)&dio[1];

+ rpl_dio_printopt(ndo, opt, length);

}

return;

trunc:

}

return;

trunc:

@@ -791,6 +736,97 @@ trunc:

return;

}

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,"<elided>");

+ 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,"<elided>");

+ 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,

static void

rpl_print(netdissect_options *ndo,

const struct icmp6_hdr *hdr,

@@ -800,31 +836,38 @@ rpl_print(netdissect_options *ndo,

int basecode= hdr->icmp6_code & 0x7f;

if(secured) {

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) {

} 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;

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) {

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) {

}

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) {

}

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:

}

break;

default:

@@ -832,9 +875,12 @@ rpl_print(netdissect_options *ndo,

break;

}

return;

break;

}

return;

+#if 0

trunc:

ND_PRINT((ndo," [|truncated]"));

return;

trunc:

ND_PRINT((ndo," [|truncated]"));

return;

+#endif

}

@@ -860,17 +906,17 @@ icmp6_print(netdissect_options *ndo,

ND_TCHECK(dp->icmp6_cksum);

if (ndo->ndo_vflag && !fragmented) {

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)

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

udp_sum,

in_cksum_shouldbe(udp_sum, sum)));

else

- (void)ND_PRINT((ndo,"[icmp6 sum ok] "));

+ ND_PRINT((ndo,"[icmp6 sum ok] "));

}

@@ -895,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:

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",

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))

break;

case ICMP6_DST_UNREACH_NOPORT:

if ((ouh = get_upperlayer(ndo, (u_char *)oip, &prot))

@@ -911,17 +957,17 @@ icmp6_print(netdissect_options *ndo,

switch (prot) {

case IPPROTO_TCP:

ND_PRINT((ndo,", %s tcp port %s",

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",

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",

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;

}

oip->ip6_nxt, dport));

break;

}

@@ -943,7 +989,7 @@ icmp6_print(netdissect_options *ndo,

switch (dp->icmp6_code) {

case ICMP6_TIME_EXCEED_TRANSIT:

ND_PRINT((ndo," for %s",

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)"));

break;

case ICMP6_TIME_EXCEED_REASSEMBLY:

ND_PRINT((ndo," (reassembly)"));

@@ -1024,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);

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,

if (ndo->ndo_vflag) {

#define NDSOLLEN 24

icmp6_opt_print(ndo, (const u_char *)dp + NDSOLLEN,

@@ -1039,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",

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,

if (ndo->ndo_vflag) {

ND_PRINT((ndo,", Flags [%s]",

bittok2str(icmp6_nd_na_flag_values,

@@ -1055,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);

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",

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,

#define REDIRECTLEN 40

if (ndo->ndo_vflag) {

icmp6_opt_print(ndo, (const u_char *)dp + REDIRECTLEN,

@@ -1096,7 +1142,7 @@ icmp6_print(netdissect_options *ndo,

in6 = (struct in6_addr *)(dp + 1);

for (; (u_char *)in6 < cp; in6++) {

ND_TCHECK(*in6);

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;

}

break;

@@ -1116,7 +1162,8 @@ icmp6_print(netdissect_options *ndo,

}

break;

case ND_RPL_MESSAGE:

}

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));

break;

default:

ND_PRINT((ndo,", length %u", length));

@@ -1131,15 +1178,15 @@ trunc:

ND_PRINT((ndo, "[|icmp6]"));

}

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;

{

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;

u_int nh;

int hlen;

@@ -1257,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",

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),

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),

@@ -1283,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",

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:

}

break;

case ND_OPT_DNSSL:

@@ -1293,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')

{

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;

goto trunc;

}

break;

@@ -1329,7 +1376,7 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)

default:

goto trunc;

}

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",

opri->nd_opt_rti_prefixlen));

ND_PRINT((ndo,", pref=%s", get_rtpref(opri->nd_opt_rti_flags)));

ND_PRINT((ndo,", lifetime=%s",

@@ -1360,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)

{

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. */

const u_char *ep;

/* 'ep' points to the end of available data. */

@@ -1370,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)));

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

}

static void

@@ -1399,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));

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];

ND_PRINT((ndo," %s", tok2str(mldv2report2str, " [v2-report-#%d]",

bp[group])));

nsrcs = (bp[group + 2] << 8) + bp[group + 3];

@@ -1412,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 */

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));

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);

}

/* Next group record */

group += 20 + nsrcs * sizeof(struct in6_addr);

@@ -1427,7 +1474,7 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len)

}

return;

trunc:

}

return;

trunc:

- (void)ND_PRINT((ndo,"[|icmp6]"));

+ ND_PRINT((ndo,"[|icmp6]"));

return;

}

return;

}

@@ -1453,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) {

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_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]);

if (ndo->ndo_vflag) {

ND_TCHECK(bp[25]);

@@ -1484,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));

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

}

ND_PRINT((ndo," }"));

} else

@@ -1493,7 +1540,7 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len)

ND_PRINT((ndo,"]"));

return;

trunc:

ND_PRINT((ndo,"]"));

return;

trunc:

- (void)ND_PRINT((ndo,"[|icmp6]"));

+ ND_PRINT((ndo,"[|icmp6]"));

return;

}

return;

}

@@ -1512,7 +1559,7 @@ dnsname_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)

break;

}

while (i-- && cp < ep) {

break;

}

while (i-- && cp < ep) {

- safeputchar(*cp);

+ safeputchar(ndo, *cp);

cp++;

}

if (cp + 1 < ep && *cp)

cp++;

}

if (cp + 1 < ep && *cp)

@@ -1536,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)

{

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;

const u_char *cp;

size_t siz, i;

int needcomma;

@@ -1570,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;

if (i)

ND_PRINT((ndo," [%s]", (i & 0x01) ? "C" : ""));

break;

- break;

case NI_QTYPE_FQDN:

ND_PRINT((ndo,"DNS name"));

break;

case NI_QTYPE_FQDN:

ND_PRINT((ndo,"DNS name"));

break;

@@ -1623,7 +1669,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp,

break;

}

ND_PRINT((ndo,", subject=%s",

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"));

break;

case ICMP6_NI_SUBJ_FQDN:

ND_PRINT((ndo,", subject=DNS name"));

@@ -1635,7 +1681,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp,

cp++;

ND_PRINT((ndo,", \""));

while (cp < ep) {

cp++;

ND_PRINT((ndo,", \""));

while (cp < ep) {

- safeputchar(*cp);

+ safeputchar(ndo, *cp);

cp++;

}

ND_PRINT((ndo,"\""));

cp++;

}

ND_PRINT((ndo,"\""));

@@ -1651,7 +1697,7 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp,

break;

}

ND_PRINT((ndo,", subject=%s",

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"));

break;

default:

ND_PRINT((ndo,", unknown subject"));

@@ -1731,14 +1777,14 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp,

cp++;

ND_PRINT((ndo,", \""));

while (cp < ep) {

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)

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)

break;

case NI_QTYPE_NODEADDR:

if (needcomma)

@@ -1748,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;

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);

i += sizeof(struct in6_addr);

ND_PRINT((ndo,"(%d)", (int32_t)EXTRACT_32BITS(bp + i)));

i += sizeof(int32_t);

@@ -1785,7 +1831,7 @@ trunc:

static void

icmp6_rrenum_print(netdissect_options *ndo, const u_char *bp, const u_char *ep)

{

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 char *cp;

struct rr_pco_match *match;

struct rr_pco_use *use;