The Tcpdump Group git mirrors - tcpdump/blobdiff

index 9024225c8fb2b05ad5a6f72bb5012a69fbacf3b7..81563e6c81389308823b0de6a916cf973ca5ea8e 100644 (file)

--- a/print-icmp6.c

+++ b/print-icmp6.c

@@ -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,35 +447,35 @@ 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 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 *);

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

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

@@ -625,7 +625,7 @@ 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, len,

+ return nextproto6_cksum(ip6, (const uint8_t *)(void *)icp, len, len,

IPPROTO_ICMPV6);

}

IPPROTO_ICMPV6);

}

@@ -660,7 +660,7 @@ rpl_format_dagid(char dagid_str[65], const u_char *dagid)

if(isprint(dagid[i])) {

*d++ = dagid[i];

} else {

if(isprint(dagid[i])) {

*d++ = dagid[i];

} else {

- snprintf(d,4,"0x%02x", dagid[i]);

+ snprintf(d,5,"0x%02x", dagid[i]); /* 4 + null char */

d += 4;

}

d += 4;

}

@@ -694,7 +694,7 @@ rpl_dio_printopt(netdissect_options *ndo,

if(paylen > length) paylen = length;

hex_print(ndo,

" ",

if(paylen > length) paylen = length;

hex_print(ndo,

" ",

- ((u_int8_t *)opt) + RPL_DIO_GENOPTION_LEN, /* content of DIO option */

+ ((uint8_t *)opt) + RPL_DIO_GENOPTION_LEN, /* content of DIO option */

paylen);

}

paylen);

}

@@ -759,10 +759,13 @@ rpl_dao_print(netdissect_options *ndo,

length -= DAGID_LEN;

}

length -= DAGID_LEN;

}

- ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u]",

+ ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u%s%s,%02x]",

dagid_str,

dao->rpl_daoseq,

dagid_str,

dao->rpl_daoseq,

- dao->rpl_instanceid));

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

if(ndo->ndo_vflag > 1) {

const struct rpl_dio_genoption *opt = (struct rpl_dio_genoption *)bp;

@@ -903,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] "));

}

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

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

}

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

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

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

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

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

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

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

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

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

@@ -1443,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];

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

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

}

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

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

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

}

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

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

@@ -1678,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,"\""));

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

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

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