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

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

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

description:
Pull up revision 1.37 (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/udp6_usrreq.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r b732e9b7a663 -r 59ce450371c2 sys/netinet6/udp6_usrreq.c
--- a/sys/netinet6/udp6_usrreq.c        Fri Apr 06 00:29:21 2001 +0000
+++ b/sys/netinet6/udp6_usrreq.c        Fri Apr 06 00:29:38 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp6_usrreq.c,v 1.30.2.2 2000/11/10 00:13:30 tv Exp $  */
+/*     $NetBSD: udp6_usrreq.c,v 1.30.2.3 2001/04/06 00:29:38 he Exp $  */
 /*     $KAME: udp6_usrreq.c,v 1.62 2000/10/19 01:11:05 itojun Exp $    */
 
 /*
@@ -733,7 +733,10 @@
 
                udp6stat.udp6s_opackets++;
 #ifdef IPSEC
-               ipsec_setsocket(m, in6p->in6p_socket);
+               if (ipsec_setsocket(m, in6p->in6p_socket) != 0) {
+                       error = ENOBUFS;
+                       goto release;
+               }
 #endif /*IPSEC*/
                error = ip6_output(m, in6p->in6p_outputopts, &in6p->in6p_route,
                            0, in6p->in6p_moptions, NULL);
@@ -761,7 +764,7 @@
 
                udpstat.udps_opackets++;
 #ifdef IPSEC
-               ipsec_setsocket(m, NULL);       /*XXX*/
+               (void)ipsec_setsocket(m, NULL); /*XXX*/
 #endif /*IPSEC*/
                error = ip_output(m, NULL, &in6p->in6p_route, 0 /*XXX*/);
                break;