Module Name: src
Committed By: ozaki-r
Date: Thu Apr 20 09:19:19 UTC 2017
Modified Files:
src/sys/netinet: sctp_input.c
src/sys/netinet6: sctp6_usrreq.c
Log Message:
Fix build of kernel with SCTP
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/sctp_input.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet6/sctp6_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/sctp_input.c
diff -u src/sys/netinet/sctp_input.c:1.4 src/sys/netinet/sctp_input.c:1.5
--- src/sys/netinet/sctp_input.c:1.4 Thu Apr 20 08:46:07 2017
+++ src/sys/netinet/sctp_input.c Thu Apr 20 09:19:19 2017
@@ -1,5 +1,5 @@
/* $KAME: sctp_input.c,v 1.28 2005/04/21 18:36:21 nishida Exp $ */
-/* $NetBSD: sctp_input.c,v 1.4 2017/04/20 08:46:07 ozaki-r Exp $ */
+/* $NetBSD: sctp_input.c,v 1.5 2017/04/20 09:19:19 ozaki-r Exp $ */
/*
* Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.4 2017/04/20 08:46:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.5 2017/04/20 09:19:19 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -4237,7 +4237,7 @@ sctp_input(struct mbuf *m, ...)
* I very much doubt any of the IPSEC stuff will work but I have
* no idea, so I will leave it in place.
*/
- if (ipsec_used && ipsec4_in_reject(m, inp)) {
+ if (ipsec_used && ipsec4_in_reject(m, (struct inpcb *)inp)) {
#if 0
ipsecstat.in_polvio++;
#endif
Index: src/sys/netinet6/sctp6_usrreq.c
diff -u src/sys/netinet6/sctp6_usrreq.c:1.12 src/sys/netinet6/sctp6_usrreq.c:1.13
--- src/sys/netinet6/sctp6_usrreq.c:1.12 Thu Apr 20 08:46:07 2017
+++ src/sys/netinet6/sctp6_usrreq.c Thu Apr 20 09:19:19 2017
@@ -1,5 +1,5 @@
/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
-/* $NetBSD: sctp6_usrreq.c,v 1.12 2017/04/20 08:46:07 ozaki-r Exp $ */
+/* $NetBSD: sctp6_usrreq.c,v 1.13 2017/04/20 09:19:19 ozaki-r Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.12 2017/04/20 08:46:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.13 2017/04/20 09:19:19 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -235,7 +235,7 @@ sctp_skip_csum:
/*
* Check AH/ESP integrity.
*/
- if (ipsec_used && ipsec6_in_reject(m, in6p)) {
+ if (ipsec_used && ipsec6_in_reject(m, (struct in6pcb *)in6p_ip)) {
/* XXX */
#if 0
/* FIX ME: need to find right stat */
