more whitespace sync with kame
This commit is contained in:
itojun
parent
8b2a9cd42c
commit
73f4e5001f
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: icmp6.c,v 1.68 2001/10/18 09:09:25 itojun Exp $ */
|
||||
/* $NetBSD: icmp6.c,v 1.69 2001/10/24 06:36:37 itojun Exp $ */
|
||||
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -2198,7 +2198,7 @@ icmp6_reflect(m, off)
|
|||
#ifdef IPSEC
|
||||
/* Don't lookup socket */
|
||||
(void)ipsec_setsocket(m, NULL);
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
|
||||
ip6_output(m, NULL, NULL, 0, NULL, &outif);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: in6.h,v 1.30 2001/10/18 07:44:34 itojun Exp $ */
|
||||
/* $NetBSD: in6.h,v 1.31 2001/10/24 06:36:38 itojun Exp $ */
|
||||
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -397,7 +397,7 @@ struct route_in6 {
|
|||
#define IPV6_CHECKSUM 26 /* int; checksum offset for raw socket */
|
||||
#define IPV6_V6ONLY 27 /* bool; make AF_INET6 sockets v6 only */
|
||||
|
||||
#if 1 /*IPSEC*/
|
||||
#if 1 /* IPSEC */
|
||||
#define IPV6_IPSEC_POLICY 28 /* struct; get/set security policy */
|
||||
#endif
|
||||
#define IPV6_FAITH 29 /* bool; accept FAITH'ed connections */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: in6_pcb.c,v 1.42 2001/10/16 04:57:38 itojun Exp $ */
|
||||
/* $NetBSD: in6_pcb.c,v 1.43 2001/10/24 06:36:38 itojun Exp $ */
|
||||
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -132,7 +132,7 @@ in6_pcballoc(so, head)
|
|||
FREE(in6p, M_PCB);
|
||||
return error;
|
||||
}
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
in6p->in6p_next = head->in6p_next;
|
||||
head->in6p_next = in6p;
|
||||
in6p->in6p_prev = head;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: in6_pcb.h,v 1.18 2001/10/15 09:51:16 itojun Exp $ */
|
||||
/* $NetBSD: in6_pcb.h,v 1.19 2001/10/24 06:36:38 itojun Exp $ */
|
||||
/* $KAME: in6_pcb.h,v 1.45 2001/02/09 05:59:46 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -103,7 +103,7 @@ struct in6pcb {
|
|||
/* should move the following just after next/prev */
|
||||
LIST_ENTRY(in6pcb) in6p_hlist; /* hash chain */
|
||||
u_long in6p_hash; /* hash value */
|
||||
#if 1 /*IPSEC*/
|
||||
#if 1 /* IPSEC */
|
||||
struct inpcbpolicy *in6p_sp; /* security policy. */
|
||||
#endif
|
||||
struct icmp6_filter *in6p_icmp6filt;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: in6_proto.c,v 1.31 2001/10/16 04:57:38 itojun Exp $ */
|
||||
/* $NetBSD: in6_proto.c,v 1.32 2001/10/24 06:36:38 itojun Exp $ */
|
||||
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
#include <netinet6/esp.h>
|
||||
#endif
|
||||
#include <netinet6/ipcomp.h>
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
|
||||
#include <netinet6/ip6protosw.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ip6_forward.c,v 1.24 2001/10/17 08:23:06 itojun Exp $ */
|
||||
/* $NetBSD: ip6_forward.c,v 1.25 2001/10/24 06:36:38 itojun Exp $ */
|
||||
/* $KAME: ip6_forward.c,v 1.74 2001/06/12 23:54:55 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -115,7 +115,7 @@ ip6_forward(m, srcrt)
|
|||
m_freem(m);
|
||||
return;
|
||||
}
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
|
||||
/*
|
||||
* Do not forward packets to multicast destination (should be handled
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ip6_input.c,v 1.44 2001/10/16 06:24:44 itojun Exp $ */
|
||||
/* $NetBSD: ip6_input.c,v 1.45 2001/10/24 06:36:38 itojun Exp $ */
|
||||
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
#ifdef INET
|
||||
#include <netinet/ip.h>
|
||||
#include <netinet/ip_icmp.h>
|
||||
#endif /*INET*/
|
||||
#endif /* INET */
|
||||
#include <netinet/ip6.h>
|
||||
#include <netinet6/in6_var.h>
|
||||
#include <netinet6/ip6_var.h>
|
||||
|
|
@ -116,7 +116,6 @@
|
|||
/* we need it for NLOOP. */
|
||||
#include "loop.h"
|
||||
#include "faith.h"
|
||||
|
||||
#include "gif.h"
|
||||
#include "bpfilter.h"
|
||||
|
||||
|
|
@ -541,7 +540,7 @@ ip6_input(m)
|
|||
&& ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_FAITH) {
|
||||
/* XXX do we need more sanity checks? */
|
||||
ours = 1;
|
||||
deliverifp = ip6_forward_rt.ro_rt->rt_ifp; /*faith*/
|
||||
deliverifp = ip6_forward_rt.ro_rt->rt_ifp; /* faith */
|
||||
goto hbhcheck;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ip6_output.c,v 1.39 2001/10/18 07:44:34 itojun Exp $ */
|
||||
/* $NetBSD: ip6_output.c,v 1.40 2001/10/24 06:36:38 itojun Exp $ */
|
||||
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -515,7 +515,7 @@ skip_ipsec2:;
|
|||
|
||||
exthdrs.ip6e_ip6 = m;
|
||||
}
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
|
||||
if (!IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
|
||||
/* Unicast */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: raw_ip6.c,v 1.37 2001/10/18 09:12:14 itojun Exp $ */
|
||||
/* $NetBSD: raw_ip6.c,v 1.38 2001/10/24 06:36:39 itojun Exp $ */
|
||||
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
#ifdef IPSEC
|
||||
#include <netinet6/ipsec.h>
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
|
||||
#include <machine/stdarg.h>
|
||||
|
||||
|
|
@ -199,7 +199,7 @@ rip6_input(mp, offp, proto)
|
|||
ipsec6stat.in_polvio++;
|
||||
/* do not inject data into pcb */
|
||||
} else
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
|
||||
if (last->in6p_flags & IN6P_CONTROLOPTS)
|
||||
ip6_savecontrol(last, &opts, ip6, n);
|
||||
|
|
@ -230,7 +230,7 @@ rip6_input(mp, offp, proto)
|
|||
ip6stat.ip6s_delivered--;
|
||||
/* do not inject data into pcb */
|
||||
} else
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
if (last) {
|
||||
if (last->in6p_flags & IN6P_CONTROLOPTS)
|
||||
ip6_savecontrol(last, &opts, ip6, m);
|
||||
|
|
@ -509,7 +509,7 @@ rip6_output(m, va_alist)
|
|||
error = ENOBUFS;
|
||||
goto bad;
|
||||
}
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
|
||||
flags = 0;
|
||||
#ifdef IPV6_MINMTU
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: udp6_output.c,v 1.3 2001/10/18 07:44:36 itojun Exp $ */
|
||||
/* $NetBSD: udp6_output.c,v 1.4 2001/10/24 06:36:39 itojun Exp $ */
|
||||
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
|
||||
#ifdef IPSEC
|
||||
#include <netinet6/ipsec.h>
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
|
||||
#include "faith.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: udp6_usrreq.c,v 1.48 2001/10/24 06:04:08 itojun Exp $ */
|
||||
/* $NetBSD: udp6_usrreq.c,v 1.49 2001/10/24 06:36:39 itojun Exp $ */
|
||||
/* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
|
||||
#ifdef IPSEC
|
||||
#include <netinet6/ipsec.h>
|
||||
#endif /*IPSEC*/
|
||||
#endif /* IPSEC */
|
||||
|
||||
#include "faith.h"
|
||||
#if defined(NFAITH) && NFAITH > 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue