[src/netbsd-3]: src/sys/netinet6 Pull up revision 1.45 (requested by man in t...

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

details:   https://anonhg.NetBSD.org/src/rev/8ee17954c85a
branches:  netbsd-3
changeset: 575602:8ee17954c85a
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Apr 28 10:49:21 2005 +0000

description:
Pull up revision 1.45 (requested by man in ticket #201):
Enhance IPSEC_NAT_T so that it can work with multiple machines behind
the same NAT.

diffstat:

 sys/netinet6/ah_input.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r afe32207d353 -r 8ee17954c85a sys/netinet6/ah_input.c
--- a/sys/netinet6/ah_input.c   Thu Apr 28 10:49:13 2005 +0000
+++ b/sys/netinet6/ah_input.c   Thu Apr 28 10:49:21 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ah_input.c,v 1.44 2004/02/11 10:47:28 itojun Exp $     */
+/*     $NetBSD: ah_input.c,v 1.44.14.1 2005/04/28 10:49:21 tron Exp $  */
 /*     $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $       */
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ah_input.c,v 1.44 2004/02/11 10:47:28 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ah_input.c,v 1.44.14.1 2005/04/28 10:49:21 tron Exp $");
 
 #include "opt_inet.h"
 
@@ -130,7 +130,7 @@
 
        if ((sav = key_allocsa(AF_INET,
                              (caddr_t)&ip->ip_src, (caddr_t)&ip->ip_dst,
-                             IPPROTO_AH, spi)) == 0) {
+                             IPPROTO_AH, spi, 0, 0)) == 0) {
                ipseclog((LOG_WARNING,
                    "IPv4 AH input: no key association found for spi %u\n",
                    (u_int32_t)ntohl(spi)));
@@ -517,7 +517,7 @@
                if ((sav = key_allocsa(AF_INET,
                                       (caddr_t) &ip->ip_src,
                                       (caddr_t) &ip->ip_dst,
-                                      IPPROTO_AH, ah->ah_spi)) == NULL)
+                                      IPPROTO_AH, ah->ah_spi, 0, 0)) == NULL)
                        return NULL;
                if (sav->state != SADB_SASTATE_MATURE &&
                    sav->state != SADB_SASTATE_DYING) {
@@ -587,7 +587,7 @@
 
        if ((sav = key_allocsa(AF_INET6,
                              (caddr_t)&ip6->ip6_src, (caddr_t)&ip6->ip6_dst,
-                             IPPROTO_AH, spi)) == 0) {
+                             IPPROTO_AH, spi, 0, 0)) == 0) {
                ipseclog((LOG_WARNING,
                    "IPv6 AH input: no key association found for spi %u\n",
                    (u_int32_t)ntohl(spi)));
@@ -962,7 +962,7 @@
                        sav = key_allocsa(AF_INET6,
                                          (caddr_t)&sa6_src->sin6_addr,
                                          (caddr_t)&sa6_dst->sin6_addr,
-                                         IPPROTO_AH, ahp->ah_spi);
+                                         IPPROTO_AH, ahp->ah_spi, 0, 0);
                        if (sav) {
                                if (sav->state == SADB_SASTATE_MATURE ||
                                    sav->state == SADB_SASTATE_DYING)