[src/netbsd-1-5]: src/sys/netinet6 Pullup 1.30 and 1.31 [itojun]:

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

details:   https://anonhg.NetBSD.org/src/rev/7d080e65a901
branches:  netbsd-1-5
changeset: 490185:7d080e65a901
user:      tv <tv%NetBSD.org@localhost>
date:      Fri Nov 10 01:15:26 2000 +0000

description:
Pullup 1.30 and 1.31 [itojun]:
Fix previous pullup from != IPSEC_MODE_TUNNEL to == IPSEC_MODE_TRANSPORT.

diffstat:

 sys/netinet6/ipsec.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 6dfe304c29e2 -r 7d080e65a901 sys/netinet6/ipsec.c
--- a/sys/netinet6/ipsec.c      Fri Nov 10 00:13:30 2000 +0000
+++ b/sys/netinet6/ipsec.c      Fri Nov 10 01:15:26 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ipsec.c,v 1.23.2.2 2000/11/10 00:09:05 tv Exp $        */
-/*     $KAME: ipsec.c,v 1.81 2000/10/25 06:30:57 sakane Exp $  */
+/*     $NetBSD: ipsec.c,v 1.23.2.3 2000/11/10 01:15:26 tv Exp $        */
+/*     $KAME: ipsec.c,v 1.83 2000/11/09 17:45:30 itojun Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -3087,7 +3087,8 @@
 
        if (nxt != IPPROTO_IPV4)
                return 0;
-       if (sav->sah->saidx.mode != IPSEC_MODE_TUNNEL)
+       /* do not decapsulate if the SA is for transport mode only */
+       if (sav->sah->saidx.mode == IPSEC_MODE_TRANSPORT)
                return 0;
 #ifdef _IP_VHL
        hlen = _IP_VHL_HL(ip->ip_vhl) << 2;
@@ -3127,7 +3128,8 @@
 
        if (nxt != IPPROTO_IPV6)
                return 0;
-       if (sav->sah->saidx.mode != IPSEC_MODE_TUNNEL)
+       /* do not decapsulate if the SA is for transport mode only */
+       if (sav->sah->saidx.mode == IPSEC_MODE_TRANSPORT)
                return 0;
        switch (((struct sockaddr *)&sav->sah->saidx.dst)->sa_family) {
        case AF_INET6: