summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2002-06-08 20:06:44 +0000
committeritojun <itojun@NetBSD.org>2002-06-08 20:06:44 +0000
commitfc5800e3fd1663f97d886c3d472f8504b2f4a255 (patch)
treee3890c9c835dd06bffe5b9f6afae4b5c4b001aeb /sys
parentb7330b38e8a0761f898d28cf450277b7a0b7e97a (diff)
whitespace cleanup
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet6/esp_core.c8
-rw-r--r--sys/netinet6/esp_input.c6
-rw-r--r--sys/netinet6/icmp6.c11
-rw-r--r--sys/netinet6/in6_gif.c6
-rw-r--r--sys/netinet6/in6_proto.c18
-rw-r--r--sys/netinet6/in6_src.c8
-rw-r--r--sys/netinet6/ip6_mroute.c6
-rw-r--r--sys/netinet6/ipsec.c6
-rw-r--r--sys/netinet6/ipsec.h4
-rw-r--r--sys/netinet6/udp6_output.c8
10 files changed, 42 insertions, 39 deletions
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index 52466c2ccf5..75211c7cffa 100644
--- a/sys/netinet6/esp_core.c
+++ b/sys/netinet6/esp_core.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_core.c,v 1.21 2002/02/27 01:32:17 itojun Exp $ */
+/* $NetBSD: esp_core.c,v 1.22 2002/06/08 20:06:44 itojun Exp $ */
/* $KAME: esp_core.c,v 1.53 2001/11/27 09:47:30 sakane Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_core.c,v 1.21 2002/02/27 01:32:17 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_core.c,v 1.22 2002/06/08 20:06:44 itojun Exp $");
#include "opt_inet.h"
@@ -586,7 +586,7 @@ esp_3des_blockdecrypt(algo, sav, s, d)
/* assumption: d has a good alignment */
p = (des_key_schedule *)sav->sched;
bcopy(s, d, sizeof(DES_LONG) * 2);
- des_ecb3_encrypt((des_cblock *)d, (des_cblock *)d,
+ des_ecb3_encrypt((des_cblock *)d, (des_cblock *)d,
p[0], p[1], p[2], DES_DECRYPT);
return 0;
}
@@ -603,7 +603,7 @@ esp_3des_blockencrypt(algo, sav, s, d)
/* assumption: d has a good alignment */
p = (des_key_schedule *)sav->sched;
bcopy(s, d, sizeof(DES_LONG) * 2);
- des_ecb3_encrypt((des_cblock *)d, (des_cblock *)d,
+ des_ecb3_encrypt((des_cblock *)d, (des_cblock *)d,
p[0], p[1], p[2], DES_ENCRYPT);
return 0;
}
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index 008689add8c..1a2ca518029 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_input.c,v 1.21 2002/03/18 15:30:03 itojun Exp $ */
+/* $NetBSD: esp_input.c,v 1.22 2002/06/08 20:06:44 itojun Exp $ */
/* $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_input.c,v 1.21 2002/03/18 15:30:03 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_input.c,v 1.22 2002/06/08 20:06:44 itojun Exp $");
#include "opt_inet.h"
@@ -794,7 +794,7 @@ noreplaycheck:
}
key_sa_recordxfer(sav, m);
- if (ipsec_addhist(m, IPPROTO_ESP, spi) != 0 ||
+ if (ipsec_addhist(m, IPPROTO_ESP, spi) != 0 ||
ipsec_addhist(m, IPPROTO_IPV6, 0) != 0) {
ipsec6stat.in_nomem++;
goto bad;
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 4c07a3b60a9..88da6915b22 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.80 2002/05/31 04:26:19 itojun Exp $ */
+/* $NetBSD: icmp6.c,v 1.81 2002/06/08 20:06:44 itojun Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.80 2002/05/31 04:26:19 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.81 2002/06/08 20:06:44 itojun Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -728,7 +728,7 @@ icmp6_input(mp, offp, proto)
u_char *p;
int maxlen, maxhlen;
- if ((icmp6_nodeinfo & 5) != 5)
+ if ((icmp6_nodeinfo & 5) != 5)
break;
if (code != 0)
@@ -1232,7 +1232,7 @@ icmp6_mtudisc_update(ip6cp, validated)
/*
* Process a Node Information Query packet, based on
* draft-ietf-ipngwg-icmp-name-lookups-07.
- *
+ *
* Spec incompatibilities:
* - IPv6 Subject address handling
* - IPv4 Subject address handling support missing
@@ -2991,6 +2991,9 @@ icmp6_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
&icmp6_mtudisc_lowat);
case ICMPV6CTL_ND6_DEBUG:
return sysctl_int(oldp, oldlenp, newp, newlen, &nd6_debug);
+ case ICMPV6CTL_ND6_DRLIST:
+ case ICMPV6CTL_ND6_PRLIST:
+ return nd6_sysctl(name[0], oldp, oldlenp, newp, newlen);
default:
return ENOPROTOOPT;
}
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 26539947921..190cb9b83e2 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.c,v 1.27 2001/12/21 06:30:44 itojun Exp $ */
+/* $NetBSD: in6_gif.c,v 1.28 2002/06/08 20:06:44 itojun Exp $ */
/* $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.27 2001/12/21 06:30:44 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.28 2002/06/08 20:06:44 itojun Exp $");
#include "opt_inet.h"
#include "opt_iso.h"
@@ -391,7 +391,7 @@ in6_gif_attach(sc)
bzero(&mask6, sizeof(mask6));
mask6.sin6_len = sizeof(struct sockaddr_in6);
- mask6.sin6_addr.s6_addr32[0] = mask6.sin6_addr.s6_addr32[1] =
+ mask6.sin6_addr.s6_addr32[0] = mask6.sin6_addr.s6_addr32[1] =
mask6.sin6_addr.s6_addr32[2] = mask6.sin6_addr.s6_addr32[3] = ~0;
if (!sc->gif_psrc || !sc->gif_pdst)
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 47f066fedf3..c7420cf45b1 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_proto.c,v 1.41 2002/05/29 02:58:30 itojun Exp $ */
+/* $NetBSD: in6_proto.c,v 1.42 2002/06/08 20:06:44 itojun Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.41 2002/05/29 02:58:30 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.42 2002/06/08 20:06:44 itojun Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -167,37 +167,37 @@ struct ip6protosw inet6sw[] = {
},
{ SOCK_RAW, &inet6domain, IPPROTO_DSTOPTS,PR_ATOMIC|PR_ADDR,
dest6_input, 0, 0, 0,
- 0,
+ 0,
0, 0, 0, 0,
},
{ SOCK_RAW, &inet6domain, IPPROTO_ROUTING,PR_ATOMIC|PR_ADDR,
route6_input, 0, 0, 0,
- 0,
+ 0,
0, 0, 0, 0,
},
{ SOCK_RAW, &inet6domain, IPPROTO_FRAGMENT,PR_ATOMIC|PR_ADDR,
frag6_input, 0, 0, 0,
- 0,
+ 0,
0, 0, 0, 0,
},
#ifdef IPSEC
{ SOCK_RAW, &inet6domain, IPPROTO_AH, PR_ATOMIC|PR_ADDR,
ah6_input, 0, ah6_ctlinput, 0,
- 0,
+ 0,
0, 0, 0, 0,
ipsec6_sysctl,
},
#ifdef IPSEC_ESP
{ SOCK_RAW, &inet6domain, IPPROTO_ESP, PR_ATOMIC|PR_ADDR,
esp6_input, 0, esp6_ctlinput, 0,
- 0,
+ 0,
0, 0, 0, 0,
ipsec6_sysctl,
},
#endif
{ SOCK_RAW, &inet6domain, IPPROTO_IPCOMP, PR_ATOMIC|PR_ADDR,
ipcomp6_input, 0, 0, 0,
- 0,
+ 0,
0, 0, 0, 0,
ipsec6_sysctl,
},
@@ -222,7 +222,7 @@ struct ip6protosw inet6sw[] = {
},
#endif
{ SOCK_RAW, &inet6domain, IPPROTO_PIM, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
- pim6_input, rip6_output, 0, rip6_ctloutput,
+ pim6_input, rip6_output, 0, rip6_ctloutput,
rip6_usrreq,
0, 0, 0, 0,
},
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index e08d3510ac0..3b14553d4ae 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_src.c,v 1.12 2002/05/29 07:53:41 itojun Exp $ */
+/* $NetBSD: in6_src.c,v 1.13 2002/06/08 20:06:44 itojun Exp $ */
/* $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.12 2002/05/29 07:53:41 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.13 2002/06/08 20:06:44 itojun Exp $");
#include "opt_inet.h"
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.12 2002/05/29 07:53:41 itojun Exp $");
#include <netinet6/ip6_var.h>
#include <netinet6/nd6.h>
#ifdef ENABLE_DEFAULT_SCOPE
-#include <netinet6/scope6_var.h>
+#include <netinet6/scope6_var.h>
#endif
#include <net/net_osdep.h>
@@ -241,7 +241,7 @@ in6_selectsrc(dstsock, opts, mopts, ro, laddr, errorp)
* If route is known or can be allocated now,
* our src addr is taken from the i/f, else punt.
* Note that we should check the address family of the
- * cached destination, in case of sharing the cache with IPv4.
+ * cached destination, in case of sharing the cache with IPv4.
*/
if (ro) {
if (ro->ro_rt &&
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 148e165c672..c71e3e7d31a 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.33 2002/06/07 18:19:05 itojun Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.34 2002/06/08 20:06:45 itojun Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/*
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.33 2002/06/07 18:19:05 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.34 2002/06/08 20:06:45 itojun Exp $");
#include "opt_inet.h"
@@ -1795,7 +1795,7 @@ pim6_input(mp, offp, proto)
}
#endif
- rc = looutput(mif6table[reg_mif_num].m6_ifp, m,
+ rc = looutput(mif6table[reg_mif_num].m6_ifp, m,
(struct sockaddr *) &dst,
(struct rtentry *) NULL);
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index 25c4541dc9c..cbdd87a6369 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.48 2002/05/25 10:01:01 itojun Exp $ */
+/* $NetBSD: ipsec.c,v 1.49 2002/06/08 20:06:45 itojun Exp $ */
/* $KAME: ipsec.c,v 1.136 2002/05/19 00:36:39 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.48 2002/05/25 10:01:01 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.49 2002/06/08 20:06:45 itojun Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -3658,7 +3658,7 @@ ipsec_clearhist(m)
n = ipsec_findaux(m);
if ((n) && n->m_len > sizeof(struct ipsecaux))
- n->m_len = sizeof(struct ipsecaux);
+ n->m_len = sizeof(struct ipsecaux);
ipsec_optaux(m, n);
}
diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h
index 9a9391007f8..48771da0bac 100644
--- a/sys/netinet6/ipsec.h
+++ b/sys/netinet6/ipsec.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.24 2001/11/21 06:28:09 itojun Exp $ */
+/* $NetBSD: ipsec.h,v 1.25 2002/06/08 20:06:45 itojun Exp $ */
/* $KAME: ipsec.h,v 1.51 2001/08/05 04:52:58 itojun Exp $ */
/*
@@ -410,7 +410,7 @@ extern struct mbuf *ipsec_copypkt __P((struct mbuf *));
extern void ipsec_delaux __P((struct mbuf *));
extern int ipsec_setsocket __P((struct mbuf *, struct socket *));
extern struct socket *ipsec_getsocket __P((struct mbuf *));
-extern int ipsec_addhist __P((struct mbuf *, int, u_int32_t));
+extern int ipsec_addhist __P((struct mbuf *, int, u_int32_t));
extern int ipsec_getnhist __P((struct mbuf *));
extern struct ipsec_history *ipsec_gethist __P((struct mbuf *, int *));
extern void ipsec_clearhist __P((struct mbuf *));
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 938d423ddfb..d8c3f5f6a1e 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_output.c,v 1.6 2001/12/18 03:04:05 itojun Exp $ */
+/* $NetBSD: udp6_output.c,v 1.7 2002/06/08 20:06:45 itojun Exp $ */
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.6 2001/12/18 03:04:05 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.7 2002/06/08 20:06:45 itojun Exp $");
#include "opt_ipsec.h"
#include "opt_inet.h"
@@ -205,9 +205,9 @@ udp6_output(in6p, m, addr6, control, p)
if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)
&& !IN6_IS_ADDR_V4MAPPED(&in6p->in6p_laddr)) {
/*
- * when remote addr is an IPv4-mapped address,
+ * when remote addr is an IPv4-mapped address,
* local addr should not be an IPv6 address,
- * since you cannot determine how to map IPv6
+ * since you cannot determine how to map IPv6
* source address to IPv4.
*/
error = EINVAL;