Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet6 backout KAME PR 296. "any" mode SA should be a...



details:   https://anonhg.NetBSD.org/src/rev/750727ab8ae9
branches:  trunk
changeset: 499047:750727ab8ae9
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Nov 09 17:36:11 2000 +0000

description:
backout KAME PR 296.  "any" mode SA should be able to be used for tunnel mode.

diffstat:

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

diffs (29 lines):

diff -r 9b9fa7fc39ca -r 750727ab8ae9 sys/netinet6/ipsec.c
--- a/sys/netinet6/ipsec.c      Thu Nov 09 17:34:51 2000 +0000
+++ b/sys/netinet6/ipsec.c      Thu Nov 09 17:36:11 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ipsec.c,v 1.29 2000/11/06 00:58:34 itojun Exp $        */
-/*     $KAME: ipsec.c,v 1.81 2000/10/25 06:30:57 sakane Exp $  */
+/*     $NetBSD: ipsec.c,v 1.30 2000/11/09 17:36:11 itojun Exp $        */
+/*     $KAME: ipsec.c,v 1.82 2000/11/09 17:34:10 itojun Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -3095,8 +3095,6 @@
 
        if (nxt != IPPROTO_IPV4)
                return 0;
-       if (sav->sah->saidx.mode != IPSEC_MODE_TUNNEL)
-               return 0;
 #ifdef _IP_VHL
        hlen = _IP_VHL_HL(ip->ip_vhl) << 2;
 #else
@@ -3135,8 +3133,6 @@
 
        if (nxt != IPPROTO_IPV6)
                return 0;
-       if (sav->sah->saidx.mode != IPSEC_MODE_TUNNEL)
-               return 0;
        switch (((struct sockaddr *)&sav->sah->saidx.dst)->sa_family) {
        case AF_INET6:
                sin6 = ((struct sockaddr_in6 *)&sav->sah->saidx.dst);



Home | Main Index | Thread Index | Old Index