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

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

details:   https://anonhg.NetBSD.org/src/rev/4b8987da523d
branches:  netbsd-1-5
changeset: 491197:4b8987da523d
user:      he <he%NetBSD.org@localhost>
date:      Fri Apr 06 00:25:58 2001 +0000

description:
Pull up revision 1.122 (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/netinet/tcp_input.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 7f884a7df6ae -r 4b8987da523d sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Fri Apr 06 00:25:38 2001 +0000
+++ b/sys/netinet/tcp_input.c   Fri Apr 06 00:25:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.108.4.7 2000/08/16 01:22:22 itojun Exp $       */
+/*     $NetBSD: tcp_input.c,v 1.108.4.8 2001/04/06 00:25:58 he Exp $   */
 
 /*
 %%% portions-copyright-nrl-95
@@ -3409,7 +3409,10 @@
                else
                        so = NULL;
                /* use IPsec policy on listening socket, on SYN ACK */
-               ipsec_setsocket(m, so);
+               if (ipsec_setsocket(m, so) != 0) {
+                       m_freem(m);
+                       return ENOBUFS;
+               }
        }
 #endif
        m->m_pkthdr.rcvif = NULL;