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.54 (requested by itojun):



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

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

diffs (21 lines):

diff -r 3fa17ea795ae -r 7f884a7df6ae sys/netinet/raw_ip.c
--- a/sys/netinet/raw_ip.c      Fri Apr 06 00:25:20 2001 +0000
+++ b/sys/netinet/raw_ip.c      Fri Apr 06 00:25:38 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip.c,v 1.53.4.1 2001/02/26 22:43:55 he Exp $       */
+/*     $NetBSD: raw_ip.c,v 1.53.4.2 2001/04/06 00:25:38 he Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -296,7 +296,10 @@
                ipstat.ips_rawout++;
        }
 #ifdef IPSEC
-       ipsec_setsocket(m, inp->inp_socket);
+       if (ipsec_setsocket(m, inp->inp_socket) != 0) {
+               m_freem(m);
+               return ENOBUFS;
+       }
 #endif /*IPSEC*/
        return (ip_output(m, opts, &inp->inp_route, flags, inp->inp_moptions, &inp->inp_errormtu));
 }



Home | Main Index | Thread Index | Old Index