Source-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/src/rev/a1346e2d2640
branches:  netbsd-1-5
changeset: 491198:a1346e2d2640
user:      he <he%NetBSD.org@localhost>
date:      Fri Apr 06 00:26:13 2001 +0000

description:
Pull up revision 1.63 (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_output.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 4b8987da523d -r a1346e2d2640 sys/netinet/tcp_output.c
--- a/sys/netinet/tcp_output.c  Fri Apr 06 00:25:58 2001 +0000
+++ b/sys/netinet/tcp_output.c  Fri Apr 06 00:26:13 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_output.c,v 1.56.4.3 2000/11/10 00:12:43 tv Exp $   */
+/*     $NetBSD: tcp_output.c,v 1.56.4.4 2001/04/06 00:26:13 he Exp $   */
 
 /*
 %%% portions-copyright-nrl-95
@@ -1024,7 +1024,11 @@
                }
        }
 #ifdef IPSEC
-       ipsec_setsocket(m, so);
+       if (ipsec_setsocket(m, so) != 0) {
+               m_freem(m);
+               error = ENOBUFS;
+               goto out;
+       }
 #endif /*IPSEC*/
 
        switch (af) {



Home | Main Index | Thread Index | Old Index