 @@ -1,14 +1,14 @@
-/*	$NetBSD: icmp6.h,v 1.56 2020/06/15 23:41:35 roy Exp $	*/
+/*	$NetBSD: icmp6.h,v 1.57 2020/07/27 14:52:55 roy Exp $	*/
 /*	$KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun 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
 @@ -67,27 +67,27 @@
 #define ICMPV6_PLD_MAXLEN	1232	/* IPV6_MMTU - sizeof(struct ip6_hdr)
 					   - sizeof(struct icmp6_hdr) */
 struct icmp6_hdr {
 	u_int8_t	icmp6_type;	/* type field */
 	u_int8_t	icmp6_code;	/* code field */
 	u_int16_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 */
 	} icmp6_dataun;
-} __packed;
+};
 #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: */
 @@ -172,27 +172,27 @@ struct icmp6_hdr {
 #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 mld_hdr {
 	struct icmp6_hdr	mld_icmp6_hdr;
 	struct in6_addr		mld_addr; /* multicast address */
-} __packed;
+};
 /* definitions to provide backward compatibility to old KAME applications */
 #ifndef _KERNEL
 #define mld6_hdr	mld_hdr
 #define mld6_type	mld_type
 #define mld6_code	mld_code
 #define mld6_cksum	mld_cksum
 #define mld6_maxdelay	mld_maxdelay
 #define mld6_reserved	mld_reserved
 #define mld6_addr	mld_addr
 #endif
 /* shortcut macro definitions */
 @@ -201,39 +201,39 @@ struct mld_hdr {
 #define mld_cksum	mld_icmp6_hdr.icmp6_cksum
 #define mld_maxdelay	mld_icmp6_hdr.icmp6_data16[0]
 #define mld_reserved	mld_icmp6_hdr.icmp6_data16[1]
 #define MLD_MINLEN			24
 /*
  * Neighbor Discovery
  */
 struct nd_router_solicit {	/* router solicitation */
 	struct icmp6_hdr 	nd_rs_hdr;
 	/* could be followed by options */
-} __packed;
+};
 #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;
 	u_int32_t		nd_ra_reachable;	/* reachable time */
 	u_int32_t		nd_ra_retransmit;	/* retransmit timer */
 	/* could be followed by options */
-} __packed;
+};
 #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
 #define ND_RA_FLAG_PROXY	0x04
 /*
  * Router preference values based on RFC4191.
 @@ -241,72 +241,72 @@ struct nd_router_advert {	/* router adve
 #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 */
-} __packed;
+};
 #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 */
-} __packed;
+};
 #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]
 #if BYTE_ORDER == BIG_ENDIAN
 #define ND_NA_FLAG_ROUTER		0x80000000
 #define ND_NA_FLAG_SOLICITED		0x40000000
 #define ND_NA_FLAG_OVERRIDE		0x20000000
 #else
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define ND_NA_FLAG_ROUTER		0x80
 #define ND_NA_FLAG_SOLICITED		0x40
 #define ND_NA_FLAG_OVERRIDE		0x20
 #endif
 #endif
 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 */
-} __packed;
+};
 #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 */
 	u_int8_t	nd_opt_type;
 	u_int8_t	nd_opt_len;
 	/* followed by option specific data*/
-} __packed;
+};
 #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_SOURCE_ADDRLIST		9
 #define ND_OPT_TARGET_ADDRLIST		10
 #define ND_OPT_NONCE			14	/* RFC 3971 */
 #define ND_OPT_MAP			23	/* RFC 5380 */
 #define ND_OPT_ROUTE_INFO		24	/* RFC 4191 */
 @@ -322,96 +322,96 @@ struct nd_opt_route_info {	/* route info
 	u_int32_t	nd_opt_rti_lifetime;
 	/* prefix follows */
 };
 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_int32_t	nd_opt_pi_valid_time;
 	u_int32_t	nd_opt_pi_preferred_time;
 	u_int32_t	nd_opt_pi_reserved2;
 	struct in6_addr	nd_opt_pi_prefix;
-} __packed;
+};
 #define ND_OPT_PI_FLAG_ONLINK		0x80
 #define ND_OPT_PI_FLAG_AUTO		0x40
 #define ND_OPT_PI_FLAG_ROUTER		0x20
 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;
 	/* followed by IP header and data */
-} __packed;
+};
 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;
-} __packed;
+};
 #define	ND_OPT_NONCE_LEN	((1 * 8) - 2)
 #if ((ND_OPT_NONCE_LEN + 2) % 8) != 0
 #error	"(ND_OPT_NONCE_LEN + 2) must be a multiple of 8."
 #endif
 struct nd_opt_nonce {
 	u_int8_t	nd_opt_nonce_type;
 	u_int8_t	nd_opt_nonce_len;
 	u_int8_t	nd_opt_nonce[ND_OPT_NONCE_LEN];
-} __packed;
+};
 struct nd_opt_rdnss {		/* RDNSS option RFC 6106 */
 	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;
 	/* followed by list of IP prefixes */
-} __packed;
+};
 struct nd_opt_dnssl {		/* DNSSL option RFC 6106 */
 	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;
 	/* followed by list of IP prefixes */
-} __packed;
+};
 /*
  * icmp6 namelookup
  */
 struct icmp6_namelookup {
 	struct icmp6_hdr 	icmp6_nl_hdr;
 	u_int8_t	icmp6_nl_nonce[8];
 	int32_t		icmp6_nl_ttl;
 #if 0
 	u_int8_t	icmp6_nl_len;
 	u_int8_t	icmp6_nl_name[3];
 #endif
 	/* could be followed by options */
-} __packed;
+};
 /*
  * icmp6 node information
  */
 struct icmp6_nodeinfo {
 	struct icmp6_hdr icmp6_ni_hdr;
 	u_int8_t icmp6_ni_nonce[8];
 	/* could be followed by reply data */
-} __packed;
+};
 #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 */
 @@ -454,94 +454,94 @@ struct icmp6_nodeinfo {
 #define NI_NODEADDR_FLAG_ALL		0x0200
 #define NI_NODEADDR_FLAG_COMPAT		0x0400
 #define NI_NODEADDR_FLAG_LINKLOCAL	0x0800
 #define NI_NODEADDR_FLAG_SITELOCAL	0x1000
 #define NI_NODEADDR_FLAG_GLOBAL		0x2000
 #define NI_NODEADDR_FLAG_ANYCAST	0x4000 /* just experimental. not in spec */
 #endif
 #endif
 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 */
-} __packed;
+};
 /*
  * Router Renumbering. as router-renum-08.txt
  */
 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;
-} __packed;
+};
 #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 */
 	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;
 	struct	in6_addr	rpm_prefix;
-} __packed;
+};
 #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 */
 	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;
 	struct	in6_addr rpu_prefix;
-} __packed;
+};
 #define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK	0x80
 #define ICMP6_RR_PCOUSE_RAFLAGS_AUTO	0x40
 #if BYTE_ORDER == BIG_ENDIAN
 #define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME     0x80000000
 #define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME     0x40000000
 #elif BYTE_ORDER == LITTLE_ENDIAN
 #define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME     0x80
 #define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME     0x40
 #endif
 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;
 	struct	in6_addr rrr_prefix;
-} __packed;
+};
 #if BYTE_ORDER == BIG_ENDIAN
 #define ICMP6_RR_RESULT_FLAGS_OOB		0x0002
 #define ICMP6_RR_RESULT_FLAGS_FORBIDDEN		0x0001
 #elif BYTE_ORDER == LITTLE_ENDIAN
 #define ICMP6_RR_RESULT_FLAGS_OOB		0x0200
 #define ICMP6_RR_RESULT_FLAGS_FORBIDDEN		0x0100
 #endif
 /*
  * icmp6 filter structures.
  */
 struct icmp6_filter {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: icmp6.c,v 1.245 2020/06/12 11:04:45 roy Exp $	*/
+/*	$NetBSD: icmp6.c,v 1.246 2020/07/27 14:52:55 roy Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 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
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.245 2020/06/12 11:04:45 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.246 2020/07/27 14:52:55 roy Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 @@ -104,26 +104,52 @@ __KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.
 #include <netinet6/scope6_var.h>
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/ipsec6.h>
 #include <netipsec/key.h>
 #endif
 #include "faith.h"
 #if defined(NFAITH) && 0 < NFAITH
 #include <net/if_faith.h>
 #endif
 /* Ensure that non packed structures are the desired size. */
 __CTASSERT(sizeof(struct icmp6_hdr) == 8);
 __CTASSERT(sizeof(struct icmp6_nodeinfo) == 16);
 __CTASSERT(sizeof(struct icmp6_namelookup) == 20);
 __CTASSERT(sizeof(struct icmp6_router_renum) == 16);
 __CTASSERT(sizeof(struct nd_router_solicit) == 8);
 __CTASSERT(sizeof(struct nd_router_advert) == 16);
 __CTASSERT(sizeof(struct nd_neighbor_solicit) == 24);
 __CTASSERT(sizeof(struct nd_neighbor_advert) == 24);
 __CTASSERT(sizeof(struct nd_redirect) == 40);
 __CTASSERT(sizeof(struct nd_opt_hdr) == 2);
 __CTASSERT(sizeof(struct nd_opt_route_info) == 8);
 __CTASSERT(sizeof(struct nd_opt_prefix_info) == 32);
 __CTASSERT(sizeof(struct nd_opt_rd_hdr) == 8);
 __CTASSERT(sizeof(struct nd_opt_mtu) == 8);
 __CTASSERT(sizeof(struct nd_opt_nonce) == 2 + ND_OPT_NONCE_LEN);
 __CTASSERT(sizeof(struct nd_opt_rdnss) == 8);
 __CTASSERT(sizeof(struct nd_opt_dnssl) == 8);
 __CTASSERT(sizeof(struct mld_hdr) == 24);
 __CTASSERT(sizeof(struct ni_reply_fqdn) == 8);
 __CTASSERT(sizeof(struct rr_pco_match) == 24);
 __CTASSERT(sizeof(struct rr_pco_use) == 32);
 __CTASSERT(sizeof(struct rr_result) == 24);
 extern struct domain inet6domain;
 percpu_t *icmp6stat_percpu;
 extern struct inpcbtable raw6cbtable;
 extern int icmp6errppslim;
 static int icmp6errpps_count = 0;
 static struct timeval icmp6errppslim_last;
 extern int icmp6_nodeinfo;
 /*
  * List of callbacks to notify when Path MTU changes are made.
  */