Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

De-__P().

This commit is contained in:
dyoung 2007-11-01 20:33:56 +00:00
parent 6cc9c359e3
commit 122b86e247
15 changed files with 169 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sys/netinet6/icmp6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: icmp6.c,v 1.139 2007/10/29 16:54:42 dyoung Exp $ */ /* $NetBSD: icmp6.c,v 1.140 2007/11/01 20:33:56 dyoung Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/* /*
@ -62,7 +62,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.139 2007/10/29 16:54:42 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.140 2007/11/01 20:33:56 dyoung Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "opt_ipsec.h" #include "opt_ipsec.h"
@ -130,7 +130,7 @@ extern int icmp6_nodeinfo;
*/ */
struct icmp6_mtudisc_callback { struct icmp6_mtudisc_callback {
LIST_ENTRY(icmp6_mtudisc_callback) mc_list; LIST_ENTRY(icmp6_mtudisc_callback) mc_list;
void (*mc_func) __P((struct in6_addr *)); void (*mc_func)(struct in6_addr *);
}; };
LIST_HEAD(, icmp6_mtudisc_callback) icmp6_mtudisc_callbacks = LIST_HEAD(, icmp6_mtudisc_callback) icmp6_mtudisc_callbacks =
@ -152,22 +152,22 @@ static struct rttimer_queue *icmp6_redirect_timeout_q = NULL;
static int icmp6_redirect_hiwat = -1; static int icmp6_redirect_hiwat = -1;
static int icmp6_redirect_lowat = -1; static int icmp6_redirect_lowat = -1;
static void icmp6_errcount __P((struct icmp6errstat *, int, int)); static void icmp6_errcount(struct icmp6errstat *, int, int);
static int icmp6_rip6_input __P((struct mbuf **, int)); static int icmp6_rip6_input(struct mbuf **, int);
static int icmp6_ratelimit __P((const struct in6_addr *, const int, const int)); static int icmp6_ratelimit(const struct in6_addr *, const int, const int);
static const char *icmp6_redirect_diag __P((struct in6_addr *, static const char *icmp6_redirect_diag(struct in6_addr *,
struct in6_addr *, struct in6_addr *)); struct in6_addr *, struct in6_addr *);
static struct mbuf *ni6_input __P((struct mbuf *, int)); static struct mbuf *ni6_input(struct mbuf *, int);
static struct mbuf *ni6_nametodns __P((const char *, int, int)); static struct mbuf *ni6_nametodns(const char *, int, int);
static int ni6_dnsmatch __P((const char *, int, const char *, int)); static int ni6_dnsmatch(const char *, int, const char *, int);
static int ni6_addrs __P((struct icmp6_nodeinfo *, struct mbuf *, static int ni6_addrs(struct icmp6_nodeinfo *, struct mbuf *,
struct ifnet **, char *)); struct ifnet **, char *);
static int ni6_store_addrs __P((struct icmp6_nodeinfo *, struct icmp6_nodeinfo *, static int ni6_store_addrs(struct icmp6_nodeinfo *, struct icmp6_nodeinfo *,
struct ifnet *, int)); struct ifnet *, int);
static int icmp6_notify_error __P((struct mbuf *, int, int, int)); static int icmp6_notify_error(struct mbuf *, int, int, int);
static struct rtentry *icmp6_mtudisc_clone __P((struct sockaddr *)); static struct rtentry *icmp6_mtudisc_clone(struct sockaddr *);
static void icmp6_mtudisc_timeout __P((struct rtentry *, struct rttimer *)); static void icmp6_mtudisc_timeout(struct rtentry *, struct rttimer *);
static void icmp6_redirect_timeout __P((struct rtentry *, struct rttimer *)); static void icmp6_redirect_timeout(struct rtentry *, struct rttimer *);
void void
@ -238,7 +238,7 @@ icmp6_errcount(struct icmp6errstat *stat, int type, int code)
* Register a Path MTU Discovery callback. * Register a Path MTU Discovery callback.
*/ */
void void
icmp6_mtudisc_callback_register(void (*func) __P((struct in6_addr *))) icmp6_mtudisc_callback_register(void (*func)(struct in6_addr *))
{ {
struct icmp6_mtudisc_callback *mc; struct icmp6_mtudisc_callback *mc;
@ -888,7 +888,7 @@ icmp6_notify_error(struct mbuf *m, int off, int icmp6len, int code)
/* Detect the upper level protocol */ /* Detect the upper level protocol */
{ {
void (*ctlfunc) __P((int, struct sockaddr *, void *)); void (*ctlfunc)(int, struct sockaddr *, void *);
u_int8_t nxt = eip6->ip6_nxt; u_int8_t nxt = eip6->ip6_nxt;
int eoff = off + sizeof(struct icmp6_hdr) + int eoff = off + sizeof(struct icmp6_hdr) +
sizeof(struct ip6_hdr); sizeof(struct ip6_hdr);
@ -1037,7 +1037,7 @@ icmp6_notify_error(struct mbuf *m, int off, int icmp6len, int code)
ip6cp.ip6c_cmdarg = (void *)&notifymtu; ip6cp.ip6c_cmdarg = (void *)&notifymtu;
} }
ctlfunc = (void (*) __P((int, struct sockaddr *, void *))) ctlfunc = (void (*)(int, struct sockaddr *, void *))
(inet6sw[ip6_protox[nxt]].pr_ctlinput); (inet6sw[ip6_protox[nxt]].pr_ctlinput);
if (ctlfunc) { if (ctlfunc) {
(void) (*ctlfunc)(code, (struct sockaddr *)&icmp6dst, (void) (*ctlfunc)(code, (struct sockaddr *)&icmp6dst,

74
sys/netinet6/in6.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: in6.h,v 1.64 2007/10/24 06:37:21 dyoung Exp $ */ /* $NetBSD: in6.h,v 1.65 2007/11/01 20:33:56 dyoung Exp $ */
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */ /* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
/* /*
@ -752,48 +752,48 @@ typedef _BSD_SIZE_T_ size_t;
__BEGIN_DECLS __BEGIN_DECLS
struct cmsghdr; struct cmsghdr;
void in6_sin6_2_sin __P((struct sockaddr_in *, struct sockaddr_in6 *)); void in6_sin6_2_sin(struct sockaddr_in *, struct sockaddr_in6 *);
void in6_sin_2_v4mapsin6 __P((struct sockaddr_in *, struct sockaddr_in6 *)); void in6_sin_2_v4mapsin6(struct sockaddr_in *, struct sockaddr_in6 *);
void in6_sin6_2_sin_in_sock __P((struct sockaddr *)); void in6_sin6_2_sin_in_sock(struct sockaddr *);
void in6_sin_2_v4mapsin6_in_sock __P((struct sockaddr **)); void in6_sin_2_v4mapsin6_in_sock(struct sockaddr **);
extern int inet6_option_space __P((int)); extern int inet6_option_space(int);
extern int inet6_option_init __P((void *, struct cmsghdr **, int)); extern int inet6_option_init(void *, struct cmsghdr **, int);
extern int inet6_option_append __P((struct cmsghdr *, const uint8_t *, extern int inet6_option_append(struct cmsghdr *, const uint8_t *,
int, int)); int, int);
extern uint8_t *inet6_option_alloc __P((struct cmsghdr *, int, int, int)); extern uint8_t *inet6_option_alloc(struct cmsghdr *, int, int, int);
extern int inet6_option_next __P((const struct cmsghdr *, uint8_t **)); extern int inet6_option_next(const struct cmsghdr *, uint8_t **);
extern int inet6_option_find __P((const struct cmsghdr *, uint8_t **, int)); extern int inet6_option_find(const struct cmsghdr *, uint8_t **, int);
extern size_t inet6_rthdr_space __P((int, int)); extern size_t inet6_rthdr_space(int, int);
extern struct cmsghdr *inet6_rthdr_init __P((void *, int)); extern struct cmsghdr *inet6_rthdr_init(void *, int);
extern int inet6_rthdr_add __P((struct cmsghdr *, const struct in6_addr *, extern int inet6_rthdr_add(struct cmsghdr *, const struct in6_addr *,
unsigned int)); unsigned int);
extern int inet6_rthdr_lasthop __P((struct cmsghdr *, unsigned int)); extern int inet6_rthdr_lasthop(struct cmsghdr *, unsigned int);
#if 0 /* not implemented yet */ #if 0 /* not implemented yet */
extern int inet6_rthdr_reverse __P((const struct cmsghdr *, struct cmsghdr *)); extern int inet6_rthdr_reverse(const struct cmsghdr *, struct cmsghdr *);
#endif #endif
extern int inet6_rthdr_segments __P((const struct cmsghdr *)); extern int inet6_rthdr_segments(const struct cmsghdr *);
extern struct in6_addr *inet6_rthdr_getaddr __P((struct cmsghdr *, int)); extern struct in6_addr *inet6_rthdr_getaddr(struct cmsghdr *, int);
extern int inet6_rthdr_getflags __P((const struct cmsghdr *, int)); extern int inet6_rthdr_getflags(const struct cmsghdr *, int);
extern int inet6_opt_init __P((void *, socklen_t)); extern int inet6_opt_init(void *, socklen_t);
extern int inet6_opt_append __P((void *, socklen_t, int, uint8_t, extern int inet6_opt_append(void *, socklen_t, int, uint8_t,
socklen_t, uint8_t, void **)); socklen_t, uint8_t, void **);
extern int inet6_opt_finish __P((void *, socklen_t, int)); extern int inet6_opt_finish(void *, socklen_t, int);
extern int inet6_opt_set_val __P((void *, int, void *, socklen_t)); extern int inet6_opt_set_val(void *, int, void *, socklen_t);
extern int inet6_opt_next __P((void *, socklen_t, int, uint8_t *, extern int inet6_opt_next(void *, socklen_t, int, uint8_t *,
socklen_t *, void **)); socklen_t *, void **);
extern int inet6_opt_find __P((void *, socklen_t, int, uint8_t, extern int inet6_opt_find(void *, socklen_t, int, uint8_t,
socklen_t *, void **)); socklen_t *, void **);
extern int inet6_opt_get_val __P((void *, int, void *, socklen_t)); extern int inet6_opt_get_val(void *, int, void *, socklen_t);
extern socklen_t inet6_rth_space __P((int, int)); extern socklen_t inet6_rth_space(int, int);
extern void *inet6_rth_init __P((void *, socklen_t, int, int)); extern void *inet6_rth_init(void *, socklen_t, int, int);
extern int inet6_rth_add __P((void *, const struct in6_addr *)); extern int inet6_rth_add(void *, const struct in6_addr *);
extern int inet6_rth_reverse __P((const void *, void *)); extern int inet6_rth_reverse(const void *, void *);
extern int inet6_rth_segments __P((const void *)); extern int inet6_rth_segments(const void *);
extern struct in6_addr *inet6_rth_getaddr __P((const void *, int)); extern struct in6_addr *inet6_rth_getaddr(const void *, int);
__END_DECLS __END_DECLS
#endif /* _NETBSD_SOURCE */ #endif /* _NETBSD_SOURCE */

16
sys/netinet6/in6_ifattach.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in6_ifattach.c,v 1.73 2007/08/10 22:43:26 dyoung Exp $ */ /* $NetBSD: in6_ifattach.c,v 1.74 2007/11/01 20:33:56 dyoung Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/* /*
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.73 2007/08/10 22:43:26 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.74 2007/11/01 20:33:56 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -67,13 +67,13 @@ callout_t in6_tmpaddrtimer_ch;
#if 0 #if 0
static int get_hostid_ifid __P((struct ifnet *, struct in6_addr *)); static int get_hostid_ifid(struct ifnet *, struct in6_addr *);
#endif #endif
static int get_rand_ifid __P((struct ifnet *, struct in6_addr *)); static int get_rand_ifid(struct ifnet *, struct in6_addr *);
static int generate_tmp_ifid __P((u_int8_t *, const u_int8_t *, u_int8_t *)); static int generate_tmp_ifid(u_int8_t *, const u_int8_t *, u_int8_t *);
static int get_ifid __P((struct ifnet *, struct ifnet *, struct in6_addr *)); static int get_ifid(struct ifnet *, struct ifnet *, struct in6_addr *);
static int in6_ifattach_linklocal __P((struct ifnet *, struct ifnet *)); static int in6_ifattach_linklocal(struct ifnet *, struct ifnet *);
static int in6_ifattach_loopback __P((struct ifnet *)); static int in6_ifattach_loopback(struct ifnet *);
#define EUI64_GBIT 0x01 #define EUI64_GBIT 0x01
#define EUI64_UBIT 0x02 #define EUI64_UBIT 0x02

12
sys/netinet6/in6_ifattach.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: in6_ifattach.h,v 1.10 2006/03/05 23:47:08 rpaulo Exp $ */ /* $NetBSD: in6_ifattach.h,v 1.11 2007/11/01 20:33:57 dyoung Exp $ */
/* $KAME: in6_ifattach.h,v 1.8 2000/04/12 03:51:30 itojun Exp $ */ /* $KAME: in6_ifattach.h,v 1.8 2000/04/12 03:51:30 itojun Exp $ */
/* /*
@ -34,11 +34,11 @@
#define _NETINET6_IN6_IFATTACH_H_ #define _NETINET6_IN6_IFATTACH_H_
#ifdef _KERNEL #ifdef _KERNEL
void in6_ifattach __P((struct ifnet *, struct ifnet *)); void in6_ifattach(struct ifnet *, struct ifnet *);
void in6_ifdetach __P((struct ifnet *)); void in6_ifdetach(struct ifnet *);
int in6_get_tmpifid __P((struct ifnet *, u_int8_t *, const u_int8_t *, int)); int in6_get_tmpifid(struct ifnet *, u_int8_t *, const u_int8_t *, int);
void in6_tmpaddrtimer __P((void *)); void in6_tmpaddrtimer(void *);
int in6_get_hw_ifid __P((struct ifnet *, struct in6_addr *)); int in6_get_hw_ifid(struct ifnet *, struct in6_addr *);
int in6_nigroup(struct ifnet *, const char *, int, struct sockaddr_in6 *); int in6_nigroup(struct ifnet *, const char *, int, struct sockaddr_in6 *);
#endif /* _KERNEL */ #endif /* _KERNEL */

34
sys/netinet6/ip6_mroute.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip6_mroute.c,v 1.83 2007/07/09 21:11:12 ad Exp $ */ /* $NetBSD: ip6_mroute.c,v 1.84 2007/11/01 20:33:57 dyoung Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */ /* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/* /*
@ -117,7 +117,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.83 2007/07/09 21:11:12 ad Exp $"); __KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.84 2007/11/01 20:33:57 dyoung Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "opt_mrouting.h" #include "opt_mrouting.h"
@ -155,14 +155,14 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.83 2007/07/09 21:11:12 ad Exp $");
#include <net/net_osdep.h> #include <net/net_osdep.h>
static int ip6_mdq __P((struct mbuf *, struct ifnet *, struct mf6c *)); static int ip6_mdq(struct mbuf *, struct ifnet *, struct mf6c *);
static void phyint_send __P((struct ip6_hdr *, struct mif6 *, struct mbuf *)); static void phyint_send(struct ip6_hdr *, struct mif6 *, struct mbuf *);
static int set_pim6 __P((int *)); static int set_pim6(int *);
static int get_pim6 __P((struct mbuf *)); static int get_pim6(struct mbuf *);
static int socket_send __P((struct socket *, struct mbuf *, static int socket_send(struct socket *, struct mbuf *,
struct sockaddr_in6 *)); struct sockaddr_in6 *);
static int register_send __P((struct ip6_hdr *, struct mif6 *, struct mbuf *)); static int register_send(struct ip6_hdr *, struct mif6 *, struct mbuf *);
/* /*
* Globals. All but ip6_mrouter, ip6_mrtproto and mrt6stat could be static, * Globals. All but ip6_mrouter, ip6_mrtproto and mrt6stat could be static,
@ -189,7 +189,7 @@ u_int mrt6debug = 0; /* debug level */
#define DEBUG_PIM 0x40 #define DEBUG_PIM 0x40
#endif #endif
static void expire_upcalls __P((void *)); static void expire_upcalls(void *);
#define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */ #define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */
#define UPCALL_EXPIRE 6 /* number of timeouts */ #define UPCALL_EXPIRE 6 /* number of timeouts */
@ -282,13 +282,13 @@ u_long upcall_data[UPCALL_MAX + 1];
static void collate(); static void collate();
#endif /* UPCALL_TIMING */ #endif /* UPCALL_TIMING */
static int get_sg_cnt __P((struct sioc_sg_req6 *)); static int get_sg_cnt(struct sioc_sg_req6 *);
static int get_mif6_cnt __P((struct sioc_mif_req6 *)); static int get_mif6_cnt(struct sioc_mif_req6 *);
static int ip6_mrouter_init __P((struct socket *, int, int)); static int ip6_mrouter_init(struct socket *, int, int);
static int add_m6if __P((struct mif6ctl *)); static int add_m6if(struct mif6ctl *);
static int del_m6if __P((mifi_t *)); static int del_m6if(mifi_t *);
static int add_m6fc __P((struct mf6cctl *)); static int add_m6fc(struct mf6cctl *);
static int del_m6fc __P((struct mf6cctl *)); static int del_m6fc(struct mf6cctl *);
static callout_t expire_upcalls_ch; static callout_t expire_upcalls_ch;

12
sys/netinet6/ip6_mroute.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip6_mroute.h,v 1.12 2007/04/25 01:12:46 dyoung Exp $ */ /* $NetBSD: ip6_mroute.h,v 1.13 2007/11/01 20:33:57 dyoung Exp $ */
/* $KAME: ip6_mroute.h,v 1.17 2001/02/10 02:05:52 itojun Exp $ */ /* $KAME: ip6_mroute.h,v 1.17 2001/02/10 02:05:52 itojun Exp $ */
/* /*
@ -267,11 +267,11 @@ struct rtdetq { /* XXX: rtdetq is also defined in ip_mroute.h */
#define MAX_UPQ6 4 /* max. no of pkts in upcall Q */ #define MAX_UPQ6 4 /* max. no of pkts in upcall Q */
int ip6_mrouter_set __P((int, struct socket *, struct mbuf *)); int ip6_mrouter_set(int, struct socket *, struct mbuf *);
int ip6_mrouter_get __P((int, struct socket *, struct mbuf **)); int ip6_mrouter_get(int, struct socket *, struct mbuf **);
int ip6_mrouter_done __P((void)); int ip6_mrouter_done(void);
void ip6_mrouter_detach __P((struct ifnet *)); void ip6_mrouter_detach(struct ifnet *);
int mrt6_ioctl __P((int, void *)); int mrt6_ioctl(int, void *);
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* !_NETINET6_IP6_MROUTE_H_ */ #endif /* !_NETINET6_IP6_MROUTE_H_ */

34
sys/netinet6/ip6_output.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip6_output.c,v 1.121 2007/09/19 04:33:44 dyoung Exp $ */ /* $NetBSD: ip6_output.c,v 1.122 2007/11/01 20:33:57 dyoung Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/* /*
@ -62,7 +62,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.121 2007/09/19 04:33:44 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.122 2007/11/01 20:33:57 dyoung Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "opt_inet6.h" #include "opt_inet6.h"
@ -125,25 +125,25 @@ struct ip6_exthdrs {
struct mbuf *ip6e_dest2; struct mbuf *ip6e_dest2;
}; };
static int ip6_pcbopt __P((int, u_char *, int, struct ip6_pktopts **, static int ip6_pcbopt(int, u_char *, int, struct ip6_pktopts **,
int, int)); int, int);
static int ip6_getpcbopt __P((struct ip6_pktopts *, int, struct mbuf **)); static int ip6_getpcbopt(struct ip6_pktopts *, int, struct mbuf **);
static int ip6_setpktopt __P((int, u_char *, int, struct ip6_pktopts *, int, static int ip6_setpktopt(int, u_char *, int, struct ip6_pktopts *, int,
int, int, int)); int, int, int);
static int ip6_setmoptions __P((int, struct ip6_moptions **, struct mbuf *)); static int ip6_setmoptions(int, struct ip6_moptions **, struct mbuf *);
static int ip6_getmoptions __P((int, struct ip6_moptions *, struct mbuf **)); static int ip6_getmoptions(int, struct ip6_moptions *, struct mbuf **);
static int ip6_copyexthdr __P((struct mbuf **, void *, int)); static int ip6_copyexthdr(struct mbuf **, void *, int);
static int ip6_insertfraghdr __P((struct mbuf *, struct mbuf *, int, static int ip6_insertfraghdr(struct mbuf *, struct mbuf *, int,
struct ip6_frag **)); struct ip6_frag **);
static int ip6_insert_jumboopt __P((struct ip6_exthdrs *, u_int32_t)); static int ip6_insert_jumboopt(struct ip6_exthdrs *, u_int32_t);
static int ip6_splithdr __P((struct mbuf *, struct ip6_exthdrs *)); static int ip6_splithdr(struct mbuf *, struct ip6_exthdrs *);
static int ip6_getpmtu(struct route *, struct route *, struct ifnet *, static int ip6_getpmtu(struct route *, struct route *, struct ifnet *,
const struct in6_addr *, u_long *, int *); const struct in6_addr *, u_long *, int *);
static int copypktopts __P((struct ip6_pktopts *, struct ip6_pktopts *, int)); static int copypktopts(struct ip6_pktopts *, struct ip6_pktopts *, int);
#ifdef RFC2292 #ifdef RFC2292
static int ip6_pcbopts __P((struct ip6_pktopts **, struct mbuf *, static int ip6_pcbopts(struct ip6_pktopts **, struct mbuf *,
struct socket *)); struct socket *);
#endif #endif
#define IN6_NEED_CHECKSUM(ifp, csum_flags) \ #define IN6_NEED_CHECKSUM(ifp, csum_flags) \

18
sys/netinet6/ipcomp.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipcomp.h,v 1.11 2005/12/10 23:39:56 elad Exp $ */ /* $NetBSD: ipcomp.h,v 1.12 2007/11/01 20:33:58 dyoung Exp $ */
/* $KAME: ipcomp.h,v 1.11 2001/09/04 08:43:19 itojun Exp $ */ /* $KAME: ipcomp.h,v 1.11 2001/09/04 08:43:19 itojun Exp $ */
/* /*
@ -57,19 +57,19 @@ struct ipcomp {
#if defined(KERNEL) || defined(_KERNEL) #if defined(KERNEL) || defined(_KERNEL)
struct ipcomp_algorithm { struct ipcomp_algorithm {
int (*compress) __P((struct mbuf *, struct mbuf *, size_t *)); int (*compress)(struct mbuf *, struct mbuf *, size_t *);
int (*decompress) __P((struct mbuf *, struct mbuf *, size_t *)); int (*decompress)(struct mbuf *, struct mbuf *, size_t *);
size_t minplen; /* minimum required length for compression */ size_t minplen; /* minimum required length for compression */
}; };
struct ipsecrequest; struct ipsecrequest;
extern const struct ipcomp_algorithm *ipcomp_algorithm_lookup __P((int)); extern const struct ipcomp_algorithm *ipcomp_algorithm_lookup(int);
extern void ipcomp4_input __P((struct mbuf *, ...)); extern void ipcomp4_input(struct mbuf *, ...);
extern int ipcomp4_output __P((struct mbuf *, struct ipsecrequest *)); extern int ipcomp4_output(struct mbuf *, struct ipsecrequest *);
#ifdef INET6 #ifdef INET6
extern int ipcomp6_input __P((struct mbuf **, int *, int)); extern int ipcomp6_input(struct mbuf **, int *, int);
extern int ipcomp6_output __P((struct mbuf *, u_char *, struct mbuf *, extern int ipcomp6_output(struct mbuf *, u_char *, struct mbuf *,
struct ipsecrequest *)); struct ipsecrequest *);
#endif #endif
#endif /* KERNEL */ #endif /* KERNEL */

14
sys/netinet6/ipcomp_core.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipcomp_core.c,v 1.25 2007/10/19 12:16:46 ad Exp $ */ /* $NetBSD: ipcomp_core.c,v 1.26 2007/11/01 20:33:58 dyoung Exp $ */
/* $KAME: ipcomp_core.c,v 1.25 2001/07/26 06:53:17 jinmei Exp $ */ /* $KAME: ipcomp_core.c,v 1.25 2001/07/26 06:53:17 jinmei Exp $ */
/* /*
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipcomp_core.c,v 1.25 2007/10/19 12:16:46 ad Exp $"); __KERNEL_RCSID(0, "$NetBSD: ipcomp_core.c,v 1.26 2007/11/01 20:33:58 dyoung Exp $");
#include "opt_inet.h" #include "opt_inet.h"
@ -65,11 +65,11 @@ __KERNEL_RCSID(0, "$NetBSD: ipcomp_core.c,v 1.25 2007/10/19 12:16:46 ad Exp $");
#include <net/net_osdep.h> #include <net/net_osdep.h>
static void *deflate_alloc __P((void *, u_int, u_int)); static void *deflate_alloc(void *, u_int, u_int);
static void deflate_free __P((void *, void *)); static void deflate_free(void *, void *);
static int deflate_common __P((struct mbuf *, struct mbuf *, size_t *, int)); static int deflate_common(struct mbuf *, struct mbuf *, size_t *, int);
static int deflate_compress __P((struct mbuf *, struct mbuf *, size_t *)); static int deflate_compress(struct mbuf *, struct mbuf *, size_t *);
static int deflate_decompress __P((struct mbuf *, struct mbuf *, size_t *)); static int deflate_decompress(struct mbuf *, struct mbuf *, size_t *);
/* /*
* We need to use default window size (2^15 = 32Kbytes as of writing) for * We need to use default window size (2^15 = 32Kbytes as of writing) for

8
sys/netinet6/ipcomp_output.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipcomp_output.c,v 1.23 2007/10/19 12:16:46 ad Exp $ */ /* $NetBSD: ipcomp_output.c,v 1.24 2007/11/01 20:33:58 dyoung Exp $ */
/* $KAME: ipcomp_output.c,v 1.24 2001/07/26 06:53:18 jinmei Exp $ */ /* $KAME: ipcomp_output.c,v 1.24 2001/07/26 06:53:18 jinmei Exp $ */
/* /*
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipcomp_output.c,v 1.23 2007/10/19 12:16:46 ad Exp $"); __KERNEL_RCSID(0, "$NetBSD: ipcomp_output.c,v 1.24 2007/11/01 20:33:58 dyoung Exp $");
#include "opt_inet.h" #include "opt_inet.h"
@ -78,8 +78,8 @@ __KERNEL_RCSID(0, "$NetBSD: ipcomp_output.c,v 1.23 2007/10/19 12:16:46 ad Exp $"
#include <net/net_osdep.h> #include <net/net_osdep.h>
static int ipcomp_output __P((struct mbuf *, u_char *, struct mbuf *, static int ipcomp_output(struct mbuf *, u_char *, struct mbuf *,
struct ipsecrequest *, int)); struct ipsecrequest *, int);
/* /*
* Modify the packet so that the payload is compressed. * Modify the packet so that the payload is compressed.

6
sys/netinet6/mld6_var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mld6_var.h,v 1.8 2006/03/05 23:47:08 rpaulo Exp $ */ /* $NetBSD: mld6_var.h,v 1.9 2007/11/01 20:33:58 dyoung Exp $ */
/* $KAME: mld6_var.h,v 1.4 2000/03/25 07:23:54 sumikawa Exp $ */ /* $KAME: mld6_var.h,v 1.4 2000/03/25 07:23:54 sumikawa Exp $ */
/* /*
@ -47,8 +47,8 @@
/* denotes that the MLD max response delay field specifies time in milliseconds */ /* denotes that the MLD max response delay field specifies time in milliseconds */
#define MLD_TIMER_SCALE 1000 #define MLD_TIMER_SCALE 1000
void mld_init __P((void)); void mld_init(void);
void mld_input __P((struct mbuf *, int)); void mld_input(struct mbuf *, int);
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* !_NETINET6_MLD6_VAR_H_ */ #endif /* !_NETINET6_MLD6_VAR_H_ */

20
sys/netinet6/nd6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nd6.c,v 1.120 2007/09/02 19:42:22 dyoung Exp $ */ /* $NetBSD: nd6.c,v 1.121 2007/11/01 20:33:58 dyoung Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */ /* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/* /*
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.120 2007/09/02 19:42:22 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.121 2007/11/01 20:33:58 dyoung Exp $");
#include "opt_ipsec.h" #include "opt_ipsec.h"
@ -109,19 +109,19 @@ struct nd_prhead nd_prefix = { 0 };
int nd6_recalc_reachtm_interval = ND6_RECALC_REACHTM_INTERVAL; int nd6_recalc_reachtm_interval = ND6_RECALC_REACHTM_INTERVAL;
static struct sockaddr_in6 all1_sa; static struct sockaddr_in6 all1_sa;
static void nd6_setmtu0 __P((struct ifnet *, struct nd_ifinfo *)); static void nd6_setmtu0(struct ifnet *, struct nd_ifinfo *);
static void nd6_slowtimo __P((void *)); static void nd6_slowtimo(void *);
static int regen_tmpaddr __P((struct in6_ifaddr *)); static int regen_tmpaddr(struct in6_ifaddr *);
static struct llinfo_nd6 *nd6_free __P((struct rtentry *, int)); static struct llinfo_nd6 *nd6_free(struct rtentry *, int);
static void nd6_llinfo_timer __P((void *)); static void nd6_llinfo_timer(void *);
static void clear_llinfo_pqueue __P((struct llinfo_nd6 *)); static void clear_llinfo_pqueue(struct llinfo_nd6 *);
callout_t nd6_slowtimo_ch; callout_t nd6_slowtimo_ch;
callout_t nd6_timer_ch; callout_t nd6_timer_ch;
extern callout_t in6_tmpaddrtimer_ch; extern callout_t in6_tmpaddrtimer_ch;
static int fill_drlist __P((void *, size_t *, size_t)); static int fill_drlist(void *, size_t *, size_t);
static int fill_prlist __P((void *, size_t *, size_t)); static int fill_prlist(void *, size_t *, size_t);
MALLOC_DEFINE(M_IP6NDP, "NDP", "IPv6 Neighbour Discovery"); MALLOC_DEFINE(M_IP6NDP, "NDP", "IPv6 Neighbour Discovery");

34
sys/netinet6/nd6_rtr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nd6_rtr.c,v 1.67 2007/08/07 02:17:21 dyoung Exp $ */ /* $NetBSD: nd6_rtr.c,v 1.68 2007/11/01 20:33:58 dyoung Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */ /* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/* /*
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.67 2007/08/07 02:17:21 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.68 2007/11/01 20:33:58 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -62,23 +62,23 @@ __KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.67 2007/08/07 02:17:21 dyoung Exp $");
#include <net/net_osdep.h> #include <net/net_osdep.h>
static int rtpref __P((struct nd_defrouter *)); static int rtpref(struct nd_defrouter *);
static struct nd_defrouter *defrtrlist_update __P((struct nd_defrouter *)); static struct nd_defrouter *defrtrlist_update(struct nd_defrouter *);
static int prelist_update __P((struct nd_prefixctl *, struct nd_defrouter *, static int prelist_update(struct nd_prefixctl *, struct nd_defrouter *,
struct mbuf *, int)); struct mbuf *, int);
static struct in6_ifaddr *in6_ifadd __P((struct nd_prefixctl *, int)); static struct in6_ifaddr *in6_ifadd(struct nd_prefixctl *, int);
static struct nd_pfxrouter *pfxrtr_lookup __P((struct nd_prefix *, static struct nd_pfxrouter *pfxrtr_lookup(struct nd_prefix *,
struct nd_defrouter *)); struct nd_defrouter *);
static void pfxrtr_add __P((struct nd_prefix *, struct nd_defrouter *)); static void pfxrtr_add(struct nd_prefix *, struct nd_defrouter *);
static void pfxrtr_del __P((struct nd_pfxrouter *)); static void pfxrtr_del(struct nd_pfxrouter *);
static struct nd_pfxrouter *find_pfxlist_reachable_router static struct nd_pfxrouter *find_pfxlist_reachable_router
__P((struct nd_prefix *)); (struct nd_prefix *);
static void defrouter_delreq __P((struct nd_defrouter *)); static void defrouter_delreq(struct nd_defrouter *);
static void nd6_rtmsg __P((int, struct rtentry *)); static void nd6_rtmsg(int, struct rtentry *);
static int in6_init_prefix_ltimes __P((struct nd_prefix *)); static int in6_init_prefix_ltimes(struct nd_prefix *);
static void in6_init_address_ltimes __P((struct nd_prefix *ndpr, static void in6_init_address_ltimes(struct nd_prefix *ndpr,
struct in6_addrlifetime *lt6)); struct in6_addrlifetime *lt6);
static int rt6_deleteroute(struct rtentry *, void *); static int rt6_deleteroute(struct rtentry *, void *);

6
sys/netinet6/raw_ip6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: raw_ip6.c,v 1.87 2007/09/19 04:33:44 dyoung Exp $ */ /* $NetBSD: raw_ip6.c,v 1.88 2007/11/01 20:33:58 dyoung Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */ /* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/* /*
@ -62,7 +62,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.87 2007/09/19 04:33:44 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.88 2007/11/01 20:33:58 dyoung Exp $");
#include "opt_ipsec.h" #include "opt_ipsec.h"
@ -294,7 +294,7 @@ rip6_ctlinput(int cmd, const struct sockaddr *sa, void *d)
struct ip6ctlparam *ip6cp = NULL; struct ip6ctlparam *ip6cp = NULL;
const struct sockaddr_in6 *sa6_src = NULL; const struct sockaddr_in6 *sa6_src = NULL;
void *cmdarg; void *cmdarg;
void (*notify) __P((struct in6pcb *, int)) = in6_rtchange; void (*notify)(struct in6pcb *, int) = in6_rtchange;
int nxt; int nxt;
if (sa->sa_family != AF_INET6 || if (sa->sa_family != AF_INET6 ||

6
sys/netinet6/udp6_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: udp6_usrreq.c,v 1.77 2007/03/04 06:03:28 christos Exp $ */ /* $NetBSD: udp6_usrreq.c,v 1.78 2007/11/01 20:33:59 dyoung Exp $ */
/* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */ /* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */
/* /*
@ -62,7 +62,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.77 2007/03/04 06:03:28 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.78 2007/11/01 20:33:59 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/malloc.h> #include <sys/malloc.h>
@ -110,7 +110,7 @@ __KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.77 2007/03/04 06:03:28 christos Ex
extern struct inpcbtable udbtable; extern struct inpcbtable udbtable;
struct udp6stat udp6stat; struct udp6stat udp6stat;
static void udp6_notify __P((struct in6pcb *, int)); static void udp6_notify(struct in6pcb *, int);
void void
udp6_init() udp6_init()