 @@ -1,15 +1,15 @@
 /*	$KAME: dccp_usrreq.c,v 1.67 2005/11/03 16:05:04 nishida Exp $	*/
-/*	$NetBSD: dccp_usrreq.c,v 1.23 2022/10/28 05:20:08 ozaki-r Exp $ */
+/*	$NetBSD: dccp_usrreq.c,v 1.24 2022/10/28 05:26:29 ozaki-r Exp $ */
 /*
  * Copyright (c) 2003 Joacim Häggmark, Magnus Erixzon, Nils-Erik Mattsson
  * 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
 @@ -57,27 +57,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.
+ *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.23 2022/10/28 05:20:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.24 2022/10/28 05:26:29 ozaki-r Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_dccp.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/domain.h>
 #include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 @@ -433,37 +433,37 @@ dccp_input(struct mbuf *m, int off, int
 			DCCP_DEBUG((LOG_INFO, "Error, sonewconn failed!\n"));
 			INP_UNLOCK(inp);
 			INP_INFO_WUNLOCK(&dccpbinfo);
 			goto badunlocked;
+		}
 		/* INP_LOCK(inp); XXX */
 		oinp = inp;
 #ifdef INET6
 		if (isipv6) {
 			inp = sotoinpcb(so);
-			inp->inp_laddr6 = ip6->ip6_dst;
+			in6p_laddr(inp) = ip6->ip6_dst;
-			inp->inp_faddr6 = ip6->ip6_src;
+			in6p_faddr(inp) = ip6->ip6_src;
 			inp->inp_lport = dh->dh_dport;
 			inp->inp_fport = dh->dh_sport;
 			in_pcbstate(inp, INP_CONNECTED);
 		} else
 #endif
+		{
 			inp = sotoinpcb(so);
-			inp->inp_laddr = ip->ip_dst;
+			in4p_laddr(inp) = ip->ip_dst;
-			inp->inp_faddr = ip->ip_src;
+			in4p_faddr(inp) = ip->ip_src;
 			inp->inp_lport = dh->dh_dport;
 			inp->inp_fport = dh->dh_sport;
+		}
 		if (!isipv6)
 			in_pcbstate(inp, INP_BOUND);
 		dp = inp->inp_ppcb;
 		dp->state = DCCPS_LISTEN;
 		dp->who = DCCP_SERVER;
 		dp->cslen = ((struct dccpcb *)oinp->inp_ppcb)->cslen;
 		dp->avgpsize = ((struct dccpcb *)oinp->inp_ppcb)->avgpsize;
 @@ -1343,41 +1343,41 @@ again:
 		error = EMSGSIZE;
 		goto release;
+	}
 	/*
 	 * Fill in mbuf with extended DCCP header
 	 * and addresses and length put into network format.
 	 */
 #ifdef INET6
 	if (isipv6) {
 		ip6 = mtod(m, struct ip6_hdr *);
 		dh = (struct dccphdr *)(ip6 + 1);
 		ip6->ip6_flow = (ip6->ip6_flow & ~IPV6_FLOWINFO_MASK) |
-			(inp->inp_flowinfo & IPV6_FLOWINFO_MASK);
+			(in6p_flowinfo(inp) & IPV6_FLOWINFO_MASK);
 		ip6->ip6_vfc = (ip6->ip6_vfc & ~IPV6_VERSION_MASK) |
 			 (IPV6_VERSION & IPV6_VERSION_MASK);
 		ip6->ip6_nxt = IPPROTO_DCCP;
-		ip6->ip6_src = inp->inp_laddr6;
+		ip6->ip6_src = in6p_laddr(inp);
-		ip6->ip6_dst = inp->inp_faddr6;
+		ip6->ip6_dst = in6p_faddr(inp);
 	} else
 #endif
+	{
 		ip = mtod(m, struct ip *);
 		dh = (struct dccphdr *)(ip + 1);
 		memset(ip, 0, sizeof(struct ip));
 		ip->ip_p = IPPROTO_DCCP;
-		ip->ip_src = inp->inp_laddr;
+		ip->ip_src = in4p_laddr(inp);
-		ip->ip_dst = inp->inp_faddr;
+		ip->ip_dst = in4p_faddr(inp);
+	}
 	dlh = (struct dccplhdr *)dh;
 	dh->dh_sport = inp->inp_lport;
 	dh->dh_dport = inp->inp_fport;
 	dh->dh_cscov = dp->cslen;
 	dh->dh_ccval = dp->ccval;
 	dh->dh_type = type;
 	dh->dh_res = 0; /* Reserved field should be zero */
 	if (!use_shortseq) {
 		dlh->dh_res2 = 0; /* Reserved field should be zero */
 		dh->dh_off = 4 + (extrah_len / 4) + (optlen / 4);
 	} else
 @@ -1497,27 +1497,27 @@ again:
 		    cslen);
 #ifndef __OpenBSD__
 		m->m_pkthdr.csum_data = offsetof(struct dccphdr, dh_sum);
 #endif
+	}
 	dccpstat.dccps_opackets++;
 	dccpstat.dccps_obytes += m->m_pkthdr.len;
 #ifdef INET6
 	if (isipv6) {
 		DCCP_DEBUG((LOG_INFO, "Calling ip_output6, mbuf->m_len = %u, mbuf->m_pkthdr.len = %u\n", m->m_len, m->m_pkthdr.len));
-		error = ip6_output(m, inp->inp_outputopts6, &inp->inp_route,
+		error = ip6_output(m, in6p_outputopts(inp), &inp->inp_route,
 		    (inp->inp_socket->so_options & SO_DONTROUTE), NULL, NULL,
 		    NULL);
 	} else
 #endif
+	{
 		DCCP_DEBUG((LOG_INFO, "Calling ip_output, mbuf->m_len = %u, mbuf->m_pkthdr.len = %u\n", m->m_len, m->m_pkthdr.len));
 		error = ip_output(m, inp->inp_options, &inp->inp_route,
 		    (inp->inp_socket->so_options & SO_DONTROUTE), 0,
 				  inp);
+	}
 	if (error) {
 		DCCP_DEBUG((LOG_INFO, "IP output failed! %d\n", error));
 @@ -1695,27 +1695,27 @@ dccp_connect(struct socket *so, struct s
 	int error;
 	struct sockaddr_in *sin;
 	char test[2];
 	DCCP_DEBUG((LOG_INFO, "Entering dccp_connect!\n"));
 	INP_INFO_WLOCK(&dccpbinfo);
 	inp = sotoinpcb(so);
 	if (inp == 0) {
 		INP_INFO_WUNLOCK(&dccpbinfo);
 		return EINVAL;
+	}
 	INP_LOCK(inp);
-	if (inp->inp_faddr.s_addr != INADDR_ANY) {
+	if (in4p_faddr(inp).s_addr != INADDR_ANY) {
 		INP_UNLOCK(inp);
 		INP_INFO_WUNLOCK(&dccpbinfo);
 		return EISCONN;
+	}
 	dp = (struct dccpcb *)inp->inp_ppcb;
 	if (dp->state == DCCPS_ESTAB) {
 		DCCP_DEBUG((LOG_INFO, "Why are we in connect when we already have an established connection?\n"));
+	}
 	dp->who = DCCP_CLIENT;
 	dp->seq_snd = (((u_int64_t)random() << 32) | random()) % 281474976710656LL;
 @@ -1840,27 +1840,27 @@ dccp_disconnect(struct socket *so)
+{
 	struct inpcb *inp;
 	struct dccpcb *dp;
 	DCCP_DEBUG((LOG_INFO, "Entering dccp_disconnect!\n"));
 	INP_INFO_WLOCK(&dccpbinfo);
 #ifndef __NetBSD__
 	inp = sotoinpcb(so);
 	if (inp == 0) {
 		INP_INFO_WUNLOCK(&dccpbinfo);
 		return EINVAL;
+	}
 	INP_LOCK(inp);
-	if (inp->inp_faddr.s_addr == INADDR_ANY) {
+	if (in4p_faddr(inp).s_addr == INADDR_ANY) {
 		INP_INFO_WUNLOCK(&dccpbinfo);
 		INP_UNLOCK(inp);
 		return ENOTCONN;
+	}
 	dp = (struct dccpcb *)inp->inp_ppcb;
 #else /* NetBSD */
 	inp = sotoinpcb(so);
 	if (inp == NULL) {
 		INP_INFO_WUNLOCK(&dccpbinfo);
 		return EINVAL;
+	}
 	dp = inp->inp_ppcb;
 @@ -2120,30 +2120,30 @@ dccp_newdccpcb(int family, void *aux)
 	dp->retrans = 200;
 	dp->avgpsize = 0;
 	dp->d_maxseg = 1400;
 	dp->ref_pseq.hi = 0;
 	dp->ref_pseq.lo = 0;
 	dp->pktlenidx = 0;
 	dp->pktcnt = 0;
 	inp = (struct inpcb *)aux;
 	dp->d_inpcb = inp;
 	inp->inp_ppcb = dp;
 	switch (family) {
 	case PF_INET:
-		inp->inp_ip.ip_ttl = ip_defttl;
+		in4p_ip(inp).ip_ttl = ip_defttl;
 		break;
 	case PF_INET6:
-		inp->inp_ip6.ip6_hlim = in6_selecthlim_rt(inp);
+		in6p_ip6(inp).ip6_hlim = in6_selecthlim_rt(inp);
 		break;
+	}
 	if (!dccp_do_feature_nego){
 		dp->cc_state[0] = (*cc_sw[4].cc_send_init)(dp);
 		dp->cc_state[1] = (*cc_sw[4].cc_recv_init)(dp);
+	}
 	return dp;
+}
 int
 dccp_add_option(struct dccpcb *dp, u_int8_t opt, char *val, u_int8_t val_len)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sctp_output.c,v 1.31 2022/05/31 08:43:16 andvar Exp $ */
+/*	$NetBSD: sctp_output.c,v 1.32 2022/10/28 05:26:29 ozaki-r Exp $ */
 /*	$KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $	*/
 /*
  * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
  * 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
 @@ -20,27 +20,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.31 2022/05/31 08:43:16 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.32 2022/10/28 05:26:29 ozaki-r Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
 #include "opt_inet.h"
 #include "opt_sctp.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 @@ -2127,31 +2127,31 @@ sctp_lowlevel_chunk_output(struct sctp_i
 		ip->ip_v = IPVERSION;
 		ip->ip_hl = (sizeof(struct ip) >> 2);
 		if (nofragment_flag) {
 			ip->ip_off = htons(IP_DF);
 		} else
 			ip->ip_off = 0;
 		ip->ip_id = htons(ip_newid(NULL));
 		ip->ip_ttl = inp->inp_ip_ttl;
 		ip->ip_len = htons(m->m_pkthdr.len);
 		if (stcb) {
 			if ((stcb->asoc.ecn_allowed) && ecn_ok) {
 				/* Enable ECN */
-				ip->ip_tos = (u_char)((inp->ip_inp.inp.inp_ip.ip_tos & 0x000000fc) |
+				ip->ip_tos = (u_char)((in4p_ip(&inp->ip_inp.inp).ip_tos & 0x000000fc) |
 						      sctp_get_ect(stcb, chk));
 			} else {
 				/* No ECN */
-				ip->ip_tos = inp->ip_inp.inp.inp_ip.ip_tos;
+				ip->ip_tos = in4p_ip(&inp->ip_inp.inp).ip_tos;
+			}
 		} else {
 			/* no association at all */
 			ip->ip_tos = inp->inp_ip_tos;
+		}
 		ip->ip_p = IPPROTO_SCTP;
 		ip->ip_sum = 0;
 #ifdef SCTP_DEBUG
 		printf("chunk_output: net %p\n", net);
 #endif
 		if (net == NULL) {
 			ro = &iproute;
 			memset(&iproute, 0, sizeof(iproute));
 @@ -2289,30 +2289,30 @@ sctp_lowlevel_chunk_output(struct sctp_i
 		u_short prev_port=0;
 		M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT);
 		if (m == NULL) {
 			/* failed to prepend data, give up */
 			return (ENOMEM);
+		}
 		ip6h = mtod(m, struct ip6_hdr *);
 		/*
 		 * We assume here that inp_flow is in host byte order within
 		 * the TCB!
 		 */
-		flowBottom = ((struct in6pcb *)inp)->in6p_flowinfo & 0x0000ffff;
+		flowBottom = in6p_flowinfo(inp) & 0x0000ffff;
-		flowTop = ((((struct in6pcb *)inp)->in6p_flowinfo & 0x000f0000) >> 16);
+		flowTop = ((in6p_flowinfo(inp) & 0x000f0000) >> 16);
-		tosTop = (((((struct in6pcb *)inp)->in6p_flowinfo & 0xf0) >> 4) | IPV6_VERSION);
+		tosTop = (((in6p_flowinfo(inp) & 0xf0) >> 4) | IPV6_VERSION);
 		/* protect *sin6 from overwrite */
 		memcpy(&tmp, to, sizeof(struct sockaddr_in6));
 		sin6 = &tmp;
 		/* KAME hack: embed scopeid */
 #if defined(SCTP_BASE_FREEBSD) || defined(__APPLE__)
 		if (in6_embedscope(&sin6->sin6_addr, sin6, NULL, NULL) != 0)
 #else
 		/*
 		 * XXX: appropriate scope zone must be provided or otherwise
 		 * ip6_use_defzone must be 1.
 		 */
 @@ -2321,34 +2321,34 @@ sctp_lowlevel_chunk_output(struct sctp_i
 			return (EINVAL);
 		if (net == NULL) {
 			memset(&ip6route, 0, sizeof(ip6route));
 			ro = (struct route *)&ip6route;
 			/* XXX */
 			rt = rtcache_lookup(ro, (struct sockaddr *) sin6);
 			rtcache_unref(rt, ro);
 		} else {
 			ro = (struct route *)&net->ro;
+		}
 		if (stcb != NULL) {
 			if ((stcb->asoc.ecn_allowed) && ecn_ok) {
 				/* Enable ECN */
-				tosBottom = (((((struct in6pcb *)inp)->in6p_flowinfo & 0x0c) | sctp_get_ect(stcb, chk)) << 4);
+				tosBottom = (((in6p_flowinfo(inp) & 0x0c) | sctp_get_ect(stcb, chk)) << 4);
 			} else {
 				/* No ECN */
-				tosBottom = ((((struct in6pcb *)inp)->in6p_flowinfo & 0x0c) << 4);
+				tosBottom = ((in6p_flowinfo(inp) & 0x0c) << 4);
+			}
 		} else {
 			/* we could get no asoc if it is a O-O-T-B packet */
-			tosBottom = ((((struct in6pcb *)inp)->in6p_flowinfo & 0x0c) << 4);
+			tosBottom = ((in6p_flowinfo(inp) & 0x0c) << 4);
+		}
 		ip6h->ip6_flow = htonl(((tosTop << 24) | ((tosBottom|flowTop) << 16) | flowBottom));
 		ip6h->ip6_nxt = IPPROTO_SCTP;
 		ip6h->ip6_plen = m->m_pkthdr.len;
 		ip6h->ip6_dst = sin6->sin6_addr;
 		/*
 		 * Add SRC address selection here:
 		 * we can only reuse to a limited degree the kame src-addr-sel,
 		 * since we can try their selection but it may not be bound.
 		 */
 		memset(&lsa6_tmp, 0, sizeof(lsa6_tmp));
 		lsa6_tmp.sin6_family = AF_INET6;
 @@ -2406,27 +2406,27 @@ sctp_lowlevel_chunk_output(struct sctp_i
+						}
+					}
+				}
+			}
 			return (EHOSTUNREACH);
+		}
 		ip6h->ip6_src = lsa6->sin6_addr;
 		/*
 		 * We set the hop limit now since there is a good chance that
 		 * our ro pointer is now filled
 		 */
-		ip6h->ip6_hlim = in6_selecthlim((struct in6pcb *)&inp->ip_inp.inp,
+		ip6h->ip6_hlim = in6_selecthlim(&inp->ip_inp.inp,
 						(ro ?
 						 (rt ? (rt->rt_ifp) : (NULL)) :
 						 (NULL)));
 		o_flgs = 0;
 		ifp = rt->rt_ifp;
 #ifdef SCTP_DEBUG
 		if (sctp_debug_on & SCTP_DEBUG_OUTPUT3) {
 			/* Copy to be sure something bad is not happening */
 			sin6->sin6_addr = ip6h->ip6_dst;
 			lsa6->sin6_addr = ip6h->ip6_src;
 			printf("Calling ipv6 output routine from low level\n");
 			printf("src: ");
 @@ -2437,27 +2437,27 @@ sctp_lowlevel_chunk_output(struct sctp_i
 #endif /* SCTP_DEBUG */
 		if (net) {
 			sin6 = (struct sockaddr_in6 *)&net->ro.ro_sa;
 			/* preserve the port and scope for link local send */
 			prev_scope = sin6->sin6_scope_id;
 			prev_port = sin6->sin6_port;
+		}
 		/* XXX NOMPSAFE need to hold ifp here */
 		rtcache_unref(rt, ro);
 		ret = ip6_output(m, ((struct in6pcb *)inp)->in6p_outputopts,
 				 ro,
 				 o_flgs,
 				 ((struct in6pcb *)inp)->in6p_moptions,
-				 (struct in6pcb *)inp,
+				 (struct inpcb *)inp,
 				 &ifp);
 		if (net) {
 			/* for link local this must be done */
 			sin6->sin6_scope_id = prev_scope;
 			sin6->sin6_port = prev_port;
+		}
 #ifdef SCTP_DEBUG
 		if (sctp_debug_on & SCTP_DEBUG_OUTPUT3) {
 			printf("return from send is %d\n", ret);
+		}
 #endif /* SCTP_DEBUG_OUTPUT */
 		sctp_pegs[SCTP_DATAGRAMS_SENT]++;
 		if (net) {

 @@ -1,15 +1,15 @@
 /*	$KAME: sctp_pcb.h,v 1.21 2005/07/16 01:18:47 suz Exp $	*/
-/*	$NetBSD: sctp_pcb.h,v 1.6 2022/10/28 05:20:08 ozaki-r Exp $ */
+/*	$NetBSD: sctp_pcb.h,v 1.7 2022/10/28 05:26:29 ozaki-r Exp $ */
 #ifndef __SCTP_PCB_H__
 #define __SCTP_PCB_H__
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
  * 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.
 @@ -278,27 +278,27 @@ struct sctp_pcb {
 struct sctp_socket_q_list {
 	struct sctp_tcb *tcb;
 	TAILQ_ENTRY(sctp_socket_q_list) next_sq;
 };
 struct sctp_inpcb {
 	/*
 	 * put an inpcb in front of it all, kind of a waste but we need
 	 * to for compatibility with all the other stuff.
 	 */
 	union {
 		struct inpcb inp;
-		char align[(sizeof(struct inpcb) + SCTP_ALIGNM1) &
+		char align[(sizeof(struct in6pcb) + SCTP_ALIGNM1) &
 			  ~SCTP_ALIGNM1];
 	} ip_inp;
 	LIST_ENTRY(sctp_inpcb) sctp_list;	/* lists all endpoints */
 	/* hash of all endpoints for model */
 	LIST_ENTRY(sctp_inpcb) sctp_hash;
 	/* count of local addresses bound, 0 if bound all */
 	int laddr_count;
 	/* list of addrs in use by the EP */
 	struct sctpladdr sctp_addr_list;
 	/* used for source address selection rotation */
 	struct sctp_laddr *next_addr_touse;
 	struct ifnet *next_ifn_touse;
 @@ -743,50 +743,32 @@ struct sctp_tcb *sctp_remove_from_socket
 /* Null in last arg inpcb indicate run on ALL ep's. Specific
  * inp in last arg indicates run on ONLY assoc's of the
  * specified endpoint.
  */
 int
 sctp_initiate_iterator(asoc_func af, uint32_t, uint32_t, void *, uint32_t,
 		       end_func ef, struct sctp_inpcb *);
 void in6_sin6_2_sin (struct sockaddr_in *,
                             struct sockaddr_in6 *sin6);
 #ifdef __NetBSD__
 #ifndef in6pcb
 #define in6pcb		inpcb
 #endif
 #ifndef sotoin6pcb
-#define sotoin6pcb      sotoinpcb
+#define sotoin6pcb(so)	((struct in6pcb *)((so)->so_pcb))
 #endif
 #ifndef in6p_flags
-#define in6p_flags	inp_flags
+#define in6p_flags	in6p_pcb.inp_flags
 #endif
 #ifndef in6p_af
-#define in6p_af		inp_af
+#define in6p_af		in6p_pcb.inp_af
 #endif
 #ifndef in6p_cksum
 #define in6p_cksum	inp_cksum6
 #endif
 #ifndef in6p_hops
 #define in6p_hops	inp_hops6
 #endif
 #ifndef in6p_flowinfo
 #define in6p_flowinfo	inp_flowinfo
 #endif
 #ifndef in6p_outputopts
 #define in6p_outputopts	inp_outputopts6
 #endif
 #ifndef in6p_moptions
 #define in6p_moptions	inp_moptions6
 #endif
 #ifndef inpcb_hdr
 #define inpcb_hdr	inpcb
 #endif
 #ifndef sp_inph
 #define sp_inph		sp_inp
 #endif
 #endif
 #endif /* _KERNEL */
 #endif /* !__SCTP_PCB_H__ */

 @@ -1,15 +1,15 @@
 /*	$KAME: dccp6_usrreq.c,v 1.13 2005/07/27 08:42:56 nishida Exp $	*/
-/*	$NetBSD: dccp6_usrreq.c,v 1.13 2022/10/28 05:20:08 ozaki-r Exp $ */
+/*	$NetBSD: dccp6_usrreq.c,v 1.14 2022/10/28 05:26:29 ozaki-r Exp $ */
 /*
  * Copyright (C) 2003 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.13 2022/10/28 05:20:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.14 2022/10/28 05:26:29 ozaki-r Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_dccp.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/domain.h>
 #include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/lock.h>
 @@ -152,39 +152,39 @@ dccp6_connect(struct socket *so, struct
 	struct sockaddr_in6 *sin6;
 	char test[2];
 	DCCP_DEBUG((LOG_INFO, "Entering dccp6_connect!\n"));
 #ifndef __NetBSD__
 	INP_INFO_WLOCK(&dccpbinfo);
 	inp = sotoinpcb(so);
 	if (inp == 0) {
 		INP_INFO_WUNLOCK(&dccpbinfo);
 		return EINVAL;
+	}
 	INP_LOCK(inp);
-	if (inp->inp_faddr6.s_addr != INADDR_ANY) {
+	if (in6p_faddr(inp).s_addr != INADDR_ANY) {
 		INP_UNLOCK(inp);
 		INP_INFO_WUNLOCK(&dccpbinfo);
 		return EISCONN;
+	}
 	dp = (struct dccpcb *)inp->inp_ppcb;
 #else
 	inp = sotoinpcb(so);
 	if (inp == 0) {
 		return EINVAL;
+	}
-	if (!IN6_IS_ADDR_UNSPECIFIED(&inp->inp_faddr6)) {
+	if (!IN6_IS_ADDR_UNSPECIFIED(&in6p_faddr(inp))) {
 		return EISCONN;
+	}
 	dp = (struct dccpcb *)inp->inp_ppcb;
 #endif
 	if (dp->state == DCCPS_ESTAB) {
 		DCCP_DEBUG((LOG_INFO, "Why are we in connect when we already have a established connection?\n"));
+	}
 	dp->who = DCCP_CLIENT;
 	dp->seq_snd = (((u_int64_t)random() << 32) | random()) % 281474976710656LL;
 	sin6 = (struct sockaddr_in6 *)nam;

 @@ -1,15 +1,15 @@
 /* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
-/* $NetBSD: sctp6_usrreq.c,v 1.22 2020/04/27 19:33:48 rjs Exp $ */
+/* $NetBSD: sctp6_usrreq.c,v 1.23 2022/10/28 05:26:29 ozaki-r Exp $ */
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
  * 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.
 @@ -23,27 +23,27 @@
  * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS 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 CISCO SYSTEMS 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.22 2020/04/27 19:33:48 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.23 2022/10/28 05:26:29 ozaki-r Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_sctp.h"
 #include "opt_net_mpsafe.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 @@ -224,27 +224,27 @@ sctp_skip_csum:
 			    (u_int8_t *)&chunk_buf);
 			sh->v_tag = init_chk->init.initiate_tag;
+		}
 		sctp_send_abort(m, iphlen, sh, 0, NULL);
 		goto bad;
 	} else if (stcb == NULL) {
 		refcount_up = 1;
+	}
 	in6p_ip = (struct inpcb *)in6p;
 #ifdef IPSEC
 	/*
 	 * Check AH/ESP integrity.
 	 */
-	if (ipsec_used && ipsec_in_reject(m, (struct in6pcb *)in6p_ip)) {
+	if (ipsec_used && ipsec_in_reject(m, in6p_ip)) {
 /* XXX */
 #if 0
 		/* FIX ME: need to find right stat */
 		ipsec6stat.in_polvio++;
 #endif
 		goto bad;
+	}
 #endif /*IPSEC*/
 	/*
 	 * Construct sockaddr format source address.
 	 * Stuff source address and datagram in user buffer.
 	 */
 @@ -252,29 +252,29 @@ sctp_skip_csum:
 #ifndef __OpenBSD__
 	    || (in6p->sctp_socket->so_options & SO_TIMESTAMP)
 #endif
 	    ) {
 #if defined(__FreeBSD__) || defined(__APPLE__)
 #if (defined(SCTP_BASE_FREEBSD) && __FreeBSD_version < 501113) || defined(__APPLE__)
 		ip6_savecontrol(in6p_ip, &opts, ip6, m);
 #elif __FreeBSD_version >= 440000 || (defined(SCTP_BASE_FREEBSD) && __FreeBSD_version >= 501113)
 		ip6_savecontrol(in6p_ip, m, &opts);
 #else
 		ip6_savecontrol(in6p_ip, m, &opts, NULL);
 #endif
 #elif defined(__NetBSD__)
-		ip6_savecontrol((struct in6pcb *)in6p_ip, &opts, ip6, m);
+		ip6_savecontrol(in6p_ip, &opts, ip6, m);
 #else
-		ip6_savecontrol((struct in6pcb *)in6p_ip, m, &opts);
+		ip6_savecontrol(in6p_ip, m, &opts);
 #endif
+	}
 	/*
 	 * CONTROL chunk processing
 	 */
 	length = ntohs(ip6->ip6_plen) + iphlen;
 	offset -= sizeof(*ch);
 	ecn_bits = ((ntohl(ip6->ip6_flow) >> 20) & 0x000000ff);
 	s = splsoftnet();
 	(void)sctp_common_input_processing(&m, iphlen, offset, length, sh, ch,
 	    in6p, stcb, net, ecn_bits);
 	/* inp's ref-count reduced && stcb unlocked */
 @@ -473,28 +473,27 @@ sctp6_ctlinput(int cmd, const struct soc
 				/* inp's ref-count reduced && stcb unlocked */
 			} else {
 				if (cmd == PRC_HOSTDEAD) {
 					cm = EHOSTUNREACH;
 				} else {
 					cm = inet6ctlerrmap[cmd];
+				}
 				sctp_notify(inp, cm, &sh, sin6tosa(&final),
 					    stcb, net);
 				/* inp's ref-count reduced && stcb unlocked */
+			}
 		} else {
 			if (PRC_IS_REDIRECT(cmd) && inp) {
-				in6_rtchange((struct in6pcb *)inp,
+				in6_rtchange((struct inpcb *)inp, inet6ctlerrmap[cmd]);
 					     inet6ctlerrmap[cmd]);
+			}
 			if (inp) {
 				/* reduce inp's ref-count */
 				SCTP_INP_WLOCK(inp);
 				SCTP_INP_DECR_REF(inp);
 				SCTP_INP_WUNLOCK(inp);
+			}
 			if (stcb) {
 				SCTP_TCB_UNLOCK(stcb);
+			}
+		}
 		splx(s);
+	}