[src/trunk]: src/sys/netipsec Argh, in my previous commit in this file I forg...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/25d15c175878
branches:  trunk
changeset: 359695:25d15c175878
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Feb 21 16:48:28 2018 +0000

description:
Argh, in my previous commit in this file I forgot to fix the IPv6
entry point; apply the same fix there.

diffstat:

 sys/netipsec/ipsec_input.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r cde52417d266 -r 25d15c175878 sys/netipsec/ipsec_input.c
--- a/sys/netipsec/ipsec_input.c        Wed Feb 21 16:42:33 2018 +0000
+++ b/sys/netipsec/ipsec_input.c        Wed Feb 21 16:48:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_input.c,v 1.57 2018/02/21 16:08:55 maxv Exp $    */
+/*     $NetBSD: ipsec_input.c,v 1.58 2018/02/21 16:48:28 maxv Exp $    */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */
 /*     $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $        */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.57 2018/02/21 16:08:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.58 2018/02/21 16:48:28 maxv Exp $");
 
 /*
  * IPsec input processing.
@@ -589,15 +589,16 @@
        /* Save protocol */
        m_copydata(m, protoff, 1, &prot);
 
+#ifdef notyet
 #ifdef INET
        /* IP-in-IP encapsulation */
        if (prot == IPPROTO_IPIP) {
                struct ip ipn;
 
                /* ipn will now contain the inner IPv4 header */
+               /* XXX: check m_pkthdr.len */
                m_copydata(m, skip, sizeof(struct ip), &ipn);
 
-#ifdef notyet
                /*
                 * Check that the inner source address is the same as
                 * the proxy address, if available.
@@ -623,18 +624,16 @@
                        error = EACCES;
                        goto bad;
                }
-#endif /*XXX*/
        }
 #endif /* INET */
-
        /* IPv6-in-IP encapsulation */
        if (prot == IPPROTO_IPV6) {
                struct ip6_hdr ip6n;
 
                /* ip6n will now contain the inner IPv6 header. */
+               /* XXX: check m_pkthdr.len */
                m_copydata(m, skip, sizeof(struct ip6_hdr), &ip6n);
 
-#ifdef notyet
                /*
                 * Check that the inner source address is the same as
                 * the proxy address, if available.
@@ -661,8 +660,8 @@
                        error = EACCES;
                        goto bad;
                }
-#endif /*XXX*/
        }
+#endif /* notyet */
 
        key_sa_recordxfer(sav, m);