[src/netbsd-1-5]: src/sys/netinet6 Pull up revision 1.15 (requested by itojun):

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

details:   https://anonhg.NetBSD.org/src/rev/614544ec1036
branches:  netbsd-1-5
changeset: 491205:614544ec1036
user:      he <he%NetBSD.org@localhost>
date:      Fri Apr 06 00:28:20 2001 +0000

description:
Pull up revision 1.15 (requested by itojun):
  Record IPsec packet history in m_aux structure.  Let ipfilter
  look at wire-format packet only (not the decapsulated ones), so
  that VPN setting can work with NAT/ipfilter settings.

diffstat:

 sys/netinet6/ipcomp_input.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r c5b2fdb474b0 -r 614544ec1036 sys/netinet6/ipcomp_input.c
--- a/sys/netinet6/ipcomp_input.c       Fri Apr 06 00:28:02 2001 +0000
+++ b/sys/netinet6/ipcomp_input.c       Fri Apr 06 00:28:20 2001 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ipcomp_input.c,v 1.10.4.3 2001/03/11 21:11:40 he Exp $ */
-/*     $KAME: ipcomp_input.c,v 1.19 2000/10/01 12:37:20 itojun Exp $   */
+/*     $NetBSD: ipcomp_input.c,v 1.10.4.4 2001/04/06 00:28:20 he Exp $ */
+/*     $KAME: ipcomp_input.c,v 1.22 2001/01/23 08:59:37 itojun Exp $   */
 
 /*
  * Copyright (C) 1999 WIDE Project.
@@ -209,6 +209,10 @@
 
        if (sav) {
                key_sa_recordxfer(sav, m);
+               if (ipsec_addhist(m, IPPROTO_IPCOMP, (u_int32_t)cpi) != 0) {
+                       ipsecstat.in_nomem++;
+                       goto fail;
+               }
                key_freesav(sav);
                sav = NULL;
        }
@@ -325,6 +329,10 @@
 
        if (sav) {
                key_sa_recordxfer(sav, m);
+               if (ipsec_addhist(m, IPPROTO_IPCOMP, (u_int32_t)cpi) != 0) {
+                       ipsec6stat.in_nomem++;
+                       goto fail;
+               }
                key_freesav(sav);
                sav = NULL;
        }