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

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

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

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

diffs (27 lines):

diff -r d6dafd2cb65d -r 788eaafbbfaf sys/netinet/ip_mroute.c
--- a/sys/netinet/ip_mroute.c   Fri Apr 06 00:24:47 2001 +0000
+++ b/sys/netinet/ip_mroute.c   Fri Apr 06 00:25:03 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_mroute.c,v 1.50 2000/04/19 06:30:55 itojun Exp $    */
+/*     $NetBSD: ip_mroute.c,v 1.50.4.1 2001/04/06 00:25:03 he Exp $    */
 
 /*
  * IP multicast forwarding procedures
@@ -1690,7 +1690,7 @@
                /* If tunnel options */
 #ifdef IPSEC
                /* Don't lookup socket in forwading case */
-               ipsec_setsocket(m, NULL);
+               (void)ipsec_setsocket(m, NULL);
 #endif
                ip_output(m, (struct mbuf *)0, &vifp->v_route,
                          IP_FORWARDING, (struct ip_moptions *)0);
@@ -1707,7 +1707,7 @@
 
 #ifdef IPSEC
                /* Don't lookup socket in forwading case */
-               ipsec_setsocket(m, NULL);
+               (void)ipsec_setsocket(m, NULL);
 #endif
                error = ip_output(m, (struct mbuf *)0, (struct route *)0,
                                  IP_FORWARDING|IP_MULTICASTOPTS, &imo);