diff options
Diffstat (limited to 'sys/net')
43 files changed, 500 insertions, 513 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 7d44697c2b3..24967d48e31 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.c,v 1.30 2001/10/02 18:04:35 deraadt Exp $ */ +/* $OpenBSD: bpf.c,v 1.31 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $ */ /* @@ -79,19 +79,19 @@ struct bpf_if *bpf_iflist; struct bpf_d *bpf_dtab; int nbpfilter; -int bpf_allocbufs __P((struct bpf_d *)); -void bpf_freed __P((struct bpf_d *)); -void bpf_ifname __P((struct ifnet *, struct ifreq *)); -void bpf_mcopy __P((const void *, void *, size_t)); -int bpf_movein __P((struct uio *, int, struct mbuf **, struct sockaddr *)); -void bpf_attachd __P((struct bpf_d *, struct bpf_if *)); -void bpf_detachd __P((struct bpf_d *)); -int bpf_setif __P((struct bpf_d *, struct ifreq *)); -int bpfselect __P((dev_t, int, struct proc *)); -static __inline void bpf_wakeup __P((struct bpf_d *)); +int bpf_allocbufs(struct bpf_d *); +void bpf_freed(struct bpf_d *); +void bpf_ifname(struct ifnet *, struct ifreq *); +void bpf_mcopy(const void *, void *, size_t); +int bpf_movein(struct uio *, int, struct mbuf **, struct sockaddr *); +void bpf_attachd(struct bpf_d *, struct bpf_if *); +void bpf_detachd(struct bpf_d *); +int bpf_setif(struct bpf_d *, struct ifreq *); +int bpfselect(dev_t, int, struct proc *); +static __inline void bpf_wakeup(struct bpf_d *); void bpf_catchpacket __P((struct bpf_d *, u_char *, size_t, size_t, void (*)(const void *, void *, size_t))); -void bpf_reset_d __P((struct bpf_d *)); +void bpf_reset_d(struct bpf_d *); int bpf_movein(uio, linktype, mp, sockp) @@ -1064,7 +1064,7 @@ bpf_catchpacket(d, pkt, pktlen, snaplen, cpfn) register struct bpf_d *d; register u_char *pkt; register size_t pktlen, snaplen; - register void (*cpfn) __P((const void *, void *, size_t)); + register void (*cpfn)(const void *, void *, size_t); { register struct bpf_hdr *hp; register int totlen, curlen; diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 7a8916ec2fd..06b319e0226 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.h,v 1.17 2001/10/02 18:04:35 deraadt Exp $ */ +/* $OpenBSD: bpf.h,v 1.18 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: bpf.h,v 1.15 1996/12/13 07:57:33 mikel Exp $ */ /* @@ -244,13 +244,13 @@ struct bpf_insn { #define BPF_JUMP(code, k, jt, jf) { (u_int16_t)(code), jt, jf, k } #ifdef _KERNEL -int bpf_validate __P((struct bpf_insn *, int)); -void bpf_tap __P((caddr_t, u_char *, u_int)); -void bpf_mtap __P((caddr_t, struct mbuf *)); -void bpfattach __P((caddr_t *, struct ifnet *, u_int, u_int)); -void bpfdetach __P((struct ifnet *)); -void bpfilterattach __P((int)); -u_int bpf_filter __P((struct bpf_insn *, u_char *, u_int, u_int)); +int bpf_validate(struct bpf_insn *, int); +void bpf_tap(caddr_t, u_char *, u_int); +void bpf_mtap(caddr_t, struct mbuf *); +void bpfattach(caddr_t *, struct ifnet *, u_int, u_int); +void bpfdetach(struct ifnet *); +void bpfilterattach(int); +u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); #endif /* _KERNEL */ /* diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c index 095ac146037..2563fe2e9c3 100644 --- a/sys/net/bpf_filter.c +++ b/sys/net/bpf_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf_filter.c,v 1.7 2000/06/19 03:00:54 jason Exp $ */ +/* $OpenBSD: bpf_filter.c,v 1.8 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: bpf_filter.c,v 1.12 1996/02/13 22:00:00 christos Exp $ */ /* @@ -78,8 +78,8 @@ } \ } -int bpf_m_xword __P((struct mbuf *, int, int *)); -int bpf_m_xhalf __P((struct mbuf *, int, int *)); +int bpf_m_xword(struct mbuf *, int, int *); +int bpf_m_xhalf(struct mbuf *, int, int *); int bpf_m_xword(m, k, err) diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h index 4310b6b3769..071a2b22878 100644 --- a/sys/net/bpfdesc.h +++ b/sys/net/bpfdesc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bpfdesc.h,v 1.8 2001/06/09 06:16:37 angelos Exp $ */ +/* $OpenBSD: bpfdesc.h,v 1.9 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: bpfdesc.h,v 1.11 1995/09/27 18:30:42 thorpej Exp $ */ /* @@ -101,6 +101,6 @@ struct bpf_if { }; #ifdef _KERNEL -int bpf_setf __P((struct bpf_d *, struct bpf_program *)); +int bpf_setf(struct bpf_d *, struct bpf_program *); #endif /* _KERNEL */ #endif /* _NET_BPFDESC_H_ */ diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 49d697068c1..021a28f89fc 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.7 2001/06/27 06:07:37 kjc Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.8 2002/03/14 01:27:09 millert Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -127,54 +127,54 @@ struct bstp_tbpdu { u_int8_t bstp_etheraddr[] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; -void bstp_initialization __P((struct bridge_softc *)); -void bstp_stop __P((struct bridge_softc *)); -void bstp_initialize_port __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_ifupdstatus __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_enable_port __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_disable_port __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_enable_change_detection __P((struct bridge_iflist *)); -void bstp_disable_change_detection __P((struct bridge_iflist *)); -int bstp_root_bridge __P((struct bridge_softc *sc)); -int bstp_supersedes_port_info __P((struct bridge_softc *, struct bridge_iflist *, struct bstp_config_unit *)); -int bstp_designated_port __P((struct bridge_softc *, struct bridge_iflist *)); -int bstp_designated_for_some_port __P((struct bridge_softc *)); -void bstp_transmit_config __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_transmit_tcn __P((struct bridge_softc *)); -struct mbuf *bstp_input __P((struct bridge_softc *, struct ifnet *, - struct ether_header *, struct mbuf *)); -void bstp_received_config_bpdu __P((struct bridge_softc *, struct bridge_iflist *, struct bstp_config_unit *)); -void bstp_received_tcn_bpdu __P((struct bridge_softc *, struct bridge_iflist *, struct bstp_tcn_unit *)); -void bstp_record_config_information __P((struct bridge_softc *, struct bridge_iflist *, struct bstp_config_unit *)); -void bstp_record_config_timeout_values __P((struct bridge_softc *, struct bstp_config_unit *)); -void bstp_config_bpdu_generation __P((struct bridge_softc *)); -void bstp_send_config_bpdu __P((struct bridge_iflist *, struct bstp_config_unit *)); -void bstp_configuration_update __P((struct bridge_softc *)); -void bstp_root_selection __P((struct bridge_softc *)); -void bstp_designated_port_selection __P((struct bridge_softc *)); -void bstp_become_designated_port __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_port_state_selection __P((struct bridge_softc *)); -void bstp_make_forwarding __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_make_blocking __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_set_port_state __P((struct bridge_iflist *, u_int8_t)); -void bstp_set_bridge_priority __P((struct bridge_softc *, u_int64_t)); -void bstp_set_port_priority __P((struct bridge_softc *, struct bridge_iflist *, u_int16_t)); -void bstp_set_path_cost __P((struct bridge_softc *, struct bridge_iflist *, u_int32_t)); -void bstp_topology_change_detection __P((struct bridge_softc *)); -void bstp_topology_change_acknowledged __P((struct bridge_softc *)); -void bstp_acknowledge_topology_change __P((struct bridge_softc *, struct bridge_iflist *)); - -void bstp_tick __P((void *)); -void bstp_timer_start __P((struct bridge_timer *, u_int16_t)); -void bstp_timer_stop __P((struct bridge_timer *)); -int bstp_timer_expired __P((struct bridge_timer *, u_int16_t)); - -void bstp_hold_timer_expiry __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_message_age_timer_expiry __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_forward_delay_timer_expiry __P((struct bridge_softc *, struct bridge_iflist *)); -void bstp_topology_change_timer_expiry __P((struct bridge_softc *)); -void bstp_tcn_timer_expiry __P((struct bridge_softc *)); -void bstp_hello_timer_expiry __P((struct bridge_softc *)); +void bstp_initialization(struct bridge_softc *); +void bstp_stop(struct bridge_softc *); +void bstp_initialize_port(struct bridge_softc *, struct bridge_iflist *); +void bstp_ifupdstatus(struct bridge_softc *, struct bridge_iflist *); +void bstp_enable_port(struct bridge_softc *, struct bridge_iflist *); +void bstp_disable_port(struct bridge_softc *, struct bridge_iflist *); +void bstp_enable_change_detection(struct bridge_iflist *); +void bstp_disable_change_detection(struct bridge_iflist *); +int bstp_root_bridge(struct bridge_softc *sc); +int bstp_supersedes_port_info(struct bridge_softc *, struct bridge_iflist *, struct bstp_config_unit *); +int bstp_designated_port(struct bridge_softc *, struct bridge_iflist *); +int bstp_designated_for_some_port(struct bridge_softc *); +void bstp_transmit_config(struct bridge_softc *, struct bridge_iflist *); +void bstp_transmit_tcn(struct bridge_softc *); +struct mbuf *bstp_input(struct bridge_softc *, struct ifnet *, + struct ether_header *, struct mbuf *); +void bstp_received_config_bpdu(struct bridge_softc *, struct bridge_iflist *, struct bstp_config_unit *); +void bstp_received_tcn_bpdu(struct bridge_softc *, struct bridge_iflist *, struct bstp_tcn_unit *); +void bstp_record_config_information(struct bridge_softc *, struct bridge_iflist *, struct bstp_config_unit *); +void bstp_record_config_timeout_values(struct bridge_softc *, struct bstp_config_unit *); +void bstp_config_bpdu_generation(struct bridge_softc *); +void bstp_send_config_bpdu(struct bridge_iflist *, struct bstp_config_unit *); +void bstp_configuration_update(struct bridge_softc *); +void bstp_root_selection(struct bridge_softc *); +void bstp_designated_port_selection(struct bridge_softc *); +void bstp_become_designated_port(struct bridge_softc *, struct bridge_iflist *); +void bstp_port_state_selection(struct bridge_softc *); +void bstp_make_forwarding(struct bridge_softc *, struct bridge_iflist *); +void bstp_make_blocking(struct bridge_softc *, struct bridge_iflist *); +void bstp_set_port_state(struct bridge_iflist *, u_int8_t); +void bstp_set_bridge_priority(struct bridge_softc *, u_int64_t); +void bstp_set_port_priority(struct bridge_softc *, struct bridge_iflist *, u_int16_t); +void bstp_set_path_cost(struct bridge_softc *, struct bridge_iflist *, u_int32_t); +void bstp_topology_change_detection(struct bridge_softc *); +void bstp_topology_change_acknowledged(struct bridge_softc *); +void bstp_acknowledge_topology_change(struct bridge_softc *, struct bridge_iflist *); + +void bstp_tick(void *); +void bstp_timer_start(struct bridge_timer *, u_int16_t); +void bstp_timer_stop(struct bridge_timer *); +int bstp_timer_expired(struct bridge_timer *, u_int16_t); + +void bstp_hold_timer_expiry(struct bridge_softc *, struct bridge_iflist *); +void bstp_message_age_timer_expiry(struct bridge_softc *, struct bridge_iflist *); +void bstp_forward_delay_timer_expiry(struct bridge_softc *, struct bridge_iflist *); +void bstp_topology_change_timer_expiry(struct bridge_softc *); +void bstp_tcn_timer_expiry(struct bridge_softc *); +void bstp_hello_timer_expiry(struct bridge_softc *); void bstp_transmit_config(sc, bif) diff --git a/sys/net/bsd-comp.c b/sys/net/bsd-comp.c index 28cf3f4ea1a..59770e9a215 100644 --- a/sys/net/bsd-comp.c +++ b/sys/net/bsd-comp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bsd-comp.c,v 1.4 1997/09/05 04:26:57 millert Exp $ */ +/* $OpenBSD: bsd-comp.c,v 1.5 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: bsd-comp.c,v 1.6 1996/10/13 02:10:58 christos Exp $ */ /* Because this code is derived from the 4.3BSD compress source: @@ -131,20 +131,20 @@ struct bsd_db { #define BSD_OVHD 2 /* BSD compress overhead/packet */ #define BSD_INIT_BITS BSD_MIN_BITS -static void *bsd_comp_alloc __P((u_char *options, int opt_len)); -static void *bsd_decomp_alloc __P((u_char *options, int opt_len)); -static void bsd_free __P((void *state)); -static int bsd_comp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int debug)); -static int bsd_decomp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int mru, int debug)); -static int bsd_compress __P((void *state, struct mbuf **mret, - struct mbuf *mp, int slen, int maxolen)); -static void bsd_incomp __P((void *state, struct mbuf *dmsg)); -static int bsd_decompress __P((void *state, struct mbuf *cmp, - struct mbuf **dmpp)); -static void bsd_reset __P((void *state)); -static void bsd_comp_stats __P((void *state, struct compstat *stats)); +static void *bsd_comp_alloc(u_char *options, int opt_len); +static void *bsd_decomp_alloc(u_char *options, int opt_len); +static void bsd_free(void *state); +static int bsd_comp_init(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int debug); +static int bsd_decomp_init(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int mru, int debug); +static int bsd_compress(void *state, struct mbuf **mret, + struct mbuf *mp, int slen, int maxolen); +static void bsd_incomp(void *state, struct mbuf *dmsg); +static int bsd_decompress(void *state, struct mbuf *cmp, + struct mbuf **dmpp); +static void bsd_reset(void *state); +static void bsd_comp_stats(void *state, struct compstat *stats); /* * Procedures exported to if_ppp.c. @@ -188,11 +188,11 @@ struct compressor ppp_bsd_compress = { #define RATIO_SCALE (1<<RATIO_SCALE_LOG) #define RATIO_MAX (0x7fffffff>>RATIO_SCALE_LOG) -static void bsd_clear __P((struct bsd_db *)); -static int bsd_check __P((struct bsd_db *)); -static void *bsd_alloc __P((u_char *, int, int)); -static int bsd_init __P((struct bsd_db *, u_char *, int, int, int, int, - int, int)); +static void bsd_clear(struct bsd_db *); +static int bsd_check(struct bsd_db *); +static void *bsd_alloc(u_char *, int, int); +static int bsd_init(struct bsd_db *, u_char *, int, int, int, int, + int, int); /* * clear the dictionary diff --git a/sys/net/if.c b/sys/net/if.c index 97bf45555fa..66fd2ed60ae 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.50 2001/12/09 12:57:26 jason Exp $ */ +/* $OpenBSD: if.c,v 1.51 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -107,23 +107,23 @@ #include <net/if_bridge.h> #endif -void if_attachsetup __P((struct ifnet *)); -int if_detach_rtdelete __P((struct radix_node *, void *)); -int if_mark_ignore __P((struct radix_node *, void *)); -int if_mark_unignore __P((struct radix_node *, void *)); +void if_attachsetup(struct ifnet *); +int if_detach_rtdelete(struct radix_node *, void *); +int if_mark_ignore(struct radix_node *, void *); +int if_mark_unignore(struct radix_node *, void *); int ifqmaxlen = IFQ_MAXLEN; -void if_detached_start __P((struct ifnet *)); -int if_detached_ioctl __P((struct ifnet *, u_long, caddr_t)); -void if_detached_watchdog __P((struct ifnet *)); +void if_detached_start(struct ifnet *); +int if_detached_ioctl(struct ifnet *, u_long, caddr_t); +void if_detached_watchdog(struct ifnet *); #ifdef INET6 /* * XXX: declare here to avoid to include many inet6 related files.. * should be more generalized? */ -extern void nd6_setmtu __P((struct ifnet *)); +extern void nd6_setmtu(struct ifnet *); #endif /* diff --git a/sys/net/if.h b/sys/net/if.h index f89270b5150..e4ba487fcbc 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.32 2002/01/23 19:16:09 fgsch Exp $ */ +/* $OpenBSD: if.h,v 1.33 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -159,17 +159,12 @@ struct ifnet { /* and the entries */ int if_capabilities; /* interface capabilities */ /* procedure handles */ - int (*if_output) /* output routine (enqueue) */ - __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); - void (*if_start) /* initiate output routine */ - __P((struct ifnet *)); - int (*if_ioctl) /* ioctl routine */ - __P((struct ifnet *, u_long, caddr_t)); - int (*if_reset) /* XXX bus reset routine */ - __P((struct ifnet *)); - void (*if_watchdog) /* timer routine */ - __P((struct ifnet *)); + int (*if_output) /* output routine (enqueue) */(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); + void (*if_start) /* initiate output routine */(struct ifnet *); + int (*if_ioctl) /* ioctl routine */(struct ifnet *, u_long, caddr_t); + int (*if_reset) /* XXX bus reset routine */(struct ifnet *); + void (*if_watchdog) /* timer routine */(struct ifnet *); struct ifaltq if_snd; /* output queue (includes altq) */ struct ifprefix *if_prefixlist; /* linked list of prefixes per if */ }; @@ -295,8 +290,7 @@ struct ifaddr { struct sockaddr *ifa_netmask; /* used to determine subnet */ struct ifnet *ifa_ifp; /* back-pointer to interface */ TAILQ_ENTRY(ifaddr) ifa_list; /* list of addresses for interface */ - void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */ - __P((int, struct rtentry *, struct rt_addrinfo *)); + void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */(int, struct rtentry *, struct rt_addrinfo *); u_int ifa_flags; /* mostly rt_flags for cloning */ u_int ifa_refcnt; /* count of references */ int ifa_metric; /* cost of going out this interface */ @@ -425,9 +419,9 @@ struct if_nameindex { #ifndef _KERNEL __BEGIN_DECLS -unsigned int if_nametoindex __P((const char *)); -char *if_indextoname __P((unsigned int, char *)); -struct if_nameindex *if_nameindex __P((void)); +unsigned int if_nametoindex(const char *); +char *if_indextoname(unsigned int, char *); +struct if_nameindex *if_nameindex(void); __END_DECLS #define if_freenameindex(x) free(x) #endif @@ -544,43 +538,43 @@ struct ifnet **ifindex2ifnet; struct ifnet *lo0ifp; int if_index; -void ether_ifattach __P((struct ifnet *)); -void ether_ifdetach __P((struct ifnet *)); -int ether_ioctl __P((struct ifnet *, struct arpcom *, u_long, caddr_t)); -void ether_input_mbuf __P((struct ifnet *, struct mbuf *)); -void ether_input __P((struct ifnet *, struct ether_header *, struct mbuf *)); -int ether_output __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); -char *ether_sprintf __P((u_char *)); - -void if_attach __P((struct ifnet *)); -void if_attachtail __P((struct ifnet *)); -void if_attachhead __P((struct ifnet *)); -void if_detach __P((struct ifnet *)); -void if_down __P((struct ifnet *)); -void if_qflush __P((struct ifqueue *)); -void if_slowtimo __P((void *)); -void if_up __P((struct ifnet *)); -int ifconf __P((u_long, caddr_t)); -void ifinit __P((void)); -int ifioctl __P((struct socket *, u_long, caddr_t, struct proc *)); -int ifpromisc __P((struct ifnet *, int)); -struct ifnet *ifunit __P((char *)); - -struct ifaddr *ifa_ifwithaddr __P((struct sockaddr *)); -struct ifaddr *ifa_ifwithaf __P((int)); -struct ifaddr *ifa_ifwithdstaddr __P((struct sockaddr *)); -struct ifaddr *ifa_ifwithnet __P((struct sockaddr *)); -struct ifaddr *ifa_ifwithroute __P((int, struct sockaddr *, - struct sockaddr *)); -struct ifaddr *ifaof_ifpforaddr __P((struct sockaddr *, struct ifnet *)); -void ifafree __P((struct ifaddr *)); -void link_rtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); - -int loioctl __P((struct ifnet *, u_long, caddr_t)); -void loopattach __P((int)); -int looutput __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); -void lortrequest __P((int, struct rtentry *, struct rt_addrinfo *)); +void ether_ifattach(struct ifnet *); +void ether_ifdetach(struct ifnet *); +int ether_ioctl(struct ifnet *, struct arpcom *, u_long, caddr_t); +void ether_input_mbuf(struct ifnet *, struct mbuf *); +void ether_input(struct ifnet *, struct ether_header *, struct mbuf *); +int ether_output(struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); +char *ether_sprintf(u_char *); + +void if_attach(struct ifnet *); +void if_attachtail(struct ifnet *); +void if_attachhead(struct ifnet *); +void if_detach(struct ifnet *); +void if_down(struct ifnet *); +void if_qflush(struct ifqueue *); +void if_slowtimo(void *); +void if_up(struct ifnet *); +int ifconf(u_long, caddr_t); +void ifinit(void); +int ifioctl(struct socket *, u_long, caddr_t, struct proc *); +int ifpromisc(struct ifnet *, int); +struct ifnet *ifunit(char *); + +struct ifaddr *ifa_ifwithaddr(struct sockaddr *); +struct ifaddr *ifa_ifwithaf(int); +struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *); +struct ifaddr *ifa_ifwithnet(struct sockaddr *); +struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, + struct sockaddr *); +struct ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *); +void ifafree(struct ifaddr *); +void link_rtrequest(int, struct rtentry *, struct rt_addrinfo *); + +int loioctl(struct ifnet *, u_long, caddr_t); +void loopattach(int); +int looutput(struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); +void lortrequest(int, struct rtentry *, struct rt_addrinfo *); #endif /* _KERNEL */ #endif /* _NET_IF_H_ */ diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index 6abb98f05c3..8e2e37db2c4 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_arcsubr.c,v 1.9 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_arcsubr.c,v 1.10 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_arcsubr.c,v 1.8 1996/05/07 02:40:29 thorpej Exp $ */ /* @@ -68,7 +68,7 @@ #define ARC_PHDSMTU 1500 #endif -static struct mbuf *arc_defrag __P((struct ifnet *, struct mbuf *)); +static struct mbuf *arc_defrag(struct ifnet *, struct mbuf *); /* * RC1201 requires us to have this configurable. We have it only per diff --git a/sys/net/if_atm.h b/sys/net/if_atm.h index 160a55bc37c..aaf496f9377 100644 --- a/sys/net/if_atm.h +++ b/sys/net/if_atm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atm.h,v 1.10 2001/06/09 06:16:37 angelos Exp $ */ +/* $OpenBSD: if_atm.h,v 1.11 2002/03/14 01:27:09 millert Exp $ */ /* * @@ -95,10 +95,10 @@ struct atmllc { } #ifdef _KERNEL -void atm_ifattach __P((struct ifnet *)); -void atm_input __P((struct ifnet *, struct atm_pseudohdr *, - struct mbuf *, void *)); -int atm_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); +void atm_ifattach(struct ifnet *); +void atm_input(struct ifnet *, struct atm_pseudohdr *, + struct mbuf *, void *); +int atm_output(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); #endif /* _KERNEL */ #endif /* _NET_IF_ATM_H_ */ diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index bcb6f075ef3..ada2d292a28 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.85 2002/02/14 00:55:49 jason Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.86 2002/03/14 01:27:09 millert Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -112,39 +112,39 @@ extern int ifqmaxlen; struct bridge_softc *bridgectl; int nbridge; -void bridgeattach __P((int)); -int bridge_ioctl __P((struct ifnet *, u_long, caddr_t)); -void bridge_start __P((struct ifnet *)); -void bridgeintr_frame __P((struct bridge_softc *, struct mbuf *)); -void bridge_broadcast __P((struct bridge_softc *, struct ifnet *, - struct ether_header *, struct mbuf *)); -void bridge_span __P((struct bridge_softc *, struct ether_header *, - struct mbuf *)); -void bridge_stop __P((struct bridge_softc *)); -void bridge_init __P((struct bridge_softc *)); -int bridge_bifconf __P((struct bridge_softc *, struct ifbifconf *)); - -void bridge_timer __P((void *)); -int bridge_rtfind __P((struct bridge_softc *, struct ifbaconf *)); -void bridge_rtage __P((struct bridge_softc *)); -void bridge_rttrim __P((struct bridge_softc *)); -void bridge_rtdelete __P((struct bridge_softc *, struct ifnet *)); -int bridge_rtdaddr __P((struct bridge_softc *, struct ether_addr *)); -int bridge_rtflush __P((struct bridge_softc *, int)); -struct ifnet * bridge_rtupdate __P((struct bridge_softc *, - struct ether_addr *, struct ifnet *ifp, int, u_int8_t)); -struct ifnet * bridge_rtlookup __P((struct bridge_softc *, - struct ether_addr *)); -u_int32_t bridge_hash __P((struct bridge_softc *, struct ether_addr *)); -int bridge_blocknonip __P((struct ether_header *, struct mbuf *)); -int bridge_addrule __P((struct bridge_iflist *, - struct ifbrlreq *, int out)); -int bridge_flushrule __P((struct bridge_iflist *)); -int bridge_brlconf __P((struct bridge_softc *, struct ifbrlconf *)); -u_int8_t bridge_filterrule __P((struct brl_head *, struct ether_header *)); +void bridgeattach(int); +int bridge_ioctl(struct ifnet *, u_long, caddr_t); +void bridge_start(struct ifnet *); +void bridgeintr_frame(struct bridge_softc *, struct mbuf *); +void bridge_broadcast(struct bridge_softc *, struct ifnet *, + struct ether_header *, struct mbuf *); +void bridge_span(struct bridge_softc *, struct ether_header *, + struct mbuf *); +void bridge_stop(struct bridge_softc *); +void bridge_init(struct bridge_softc *); +int bridge_bifconf(struct bridge_softc *, struct ifbifconf *); + +void bridge_timer(void *); +int bridge_rtfind(struct bridge_softc *, struct ifbaconf *); +void bridge_rtage(struct bridge_softc *); +void bridge_rttrim(struct bridge_softc *); +void bridge_rtdelete(struct bridge_softc *, struct ifnet *); +int bridge_rtdaddr(struct bridge_softc *, struct ether_addr *); +int bridge_rtflush(struct bridge_softc *, int); +struct ifnet * bridge_rtupdate(struct bridge_softc *, + struct ether_addr *, struct ifnet *ifp, int, u_int8_t); +struct ifnet * bridge_rtlookup(struct bridge_softc *, + struct ether_addr *); +u_int32_t bridge_hash(struct bridge_softc *, struct ether_addr *); +int bridge_blocknonip(struct ether_header *, struct mbuf *); +int bridge_addrule(struct bridge_iflist *, + struct ifbrlreq *, int out); +int bridge_flushrule(struct bridge_iflist *); +int bridge_brlconf(struct bridge_softc *, struct ifbrlconf *); +u_int8_t bridge_filterrule(struct brl_head *, struct ether_header *); #if NPF > 0 -struct mbuf *bridge_filter __P((struct bridge_softc *, int, struct ifnet *, - struct ether_header *, struct mbuf *m)); +struct mbuf *bridge_filter(struct bridge_softc *, int, struct ifnet *, + struct ether_header *, struct mbuf *m); #endif #define ETHERADDR_IS_IP_MCAST(a) \ diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h index 54e5331c875..aff86144c94 100644 --- a/sys/net/if_bridge.h +++ b/sys/net/if_bridge.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.h,v 1.16 2001/12/15 08:40:56 jason Exp $ */ +/* $OpenBSD: if_bridge.h,v 1.17 2002/03/14 01:27:09 millert Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -261,14 +261,14 @@ struct bridge_softc { extern u_int8_t bstp_etheraddr[]; -void bridge_ifdetach __P((struct ifnet *)); -struct mbuf *bridge_input __P((struct ifnet *, struct ether_header *, - struct mbuf *)); -int bridge_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *rt)); -struct mbuf *bstp_input __P((struct bridge_softc *, struct ifnet *, - struct ether_header *, struct mbuf *)); -void bstp_initialization __P((struct bridge_softc *)); -int bstp_ioctl __P((struct ifnet *, u_long, caddr_t)); +void bridge_ifdetach(struct ifnet *); +struct mbuf *bridge_input(struct ifnet *, struct ether_header *, + struct mbuf *); +int bridge_output(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *rt); +struct mbuf *bstp_input(struct bridge_softc *, struct ifnet *, + struct ether_header *, struct mbuf *); +void bstp_initialization(struct bridge_softc *); +int bstp_ioctl(struct ifnet *, u_long, caddr_t); #endif /* _KERNEL */ #endif /* _NET_IF_BRIDGE_H_ */ diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index 87d7c2ab3cc..1bd4bc6afb4 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dl.h,v 1.4 2001/06/09 06:16:37 angelos Exp $ */ +/* $OpenBSD: if_dl.h,v 1.5 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_dl.h,v 1.8 1995/03/26 20:30:13 jtc Exp $ */ /* @@ -79,8 +79,8 @@ struct sockaddr_dl { #include <sys/cdefs.h> __BEGIN_DECLS -void link_addr __P((const char *, struct sockaddr_dl *)); -char *link_ntoa __P((const struct sockaddr_dl *)); +void link_addr(const char *, struct sockaddr_dl *); +char *link_ntoa(const struct sockaddr_dl *); __END_DECLS #endif /* _KERNEL */ diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index 0b93ec01583..b0172555219 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_enc.c,v 1.36 2001/06/27 02:00:30 provos Exp $ */ +/* $OpenBSD: if_enc.c,v 1.37 2002/03/14 01:27:09 millert Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -81,12 +81,12 @@ extern struct ifqueue nsintrq; struct enc_softc encif[NENC]; -void encattach __P((int)); -int encoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); -int encioctl __P((struct ifnet *, u_long, caddr_t)); -void encrtrequest __P((int, struct rtentry *, struct sockaddr *)); -void encstart __P((struct ifnet *)); +void encattach(int); +int encoutput(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); +int encioctl(struct ifnet *, u_long, caddr_t); +void encrtrequest(int, struct rtentry *, struct sockaddr *); +void encstart(struct ifnet *); extern int ifqmaxlen; diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c index 0b1bc9bdcf5..962080f2104 100644 --- a/sys/net/if_faith.c +++ b/sys/net/if_faith.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_faith.c,v 1.9 2001/12/26 06:29:01 itojun Exp $ */ +/* $OpenBSD: if_faith.c,v 1.10 2002/03/14 01:27:09 millert Exp $ */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. @@ -70,12 +70,12 @@ #include "bpfilter.h" -static int faithioctl __P((struct ifnet *, u_long, caddr_t)); -int faithoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); -static void faithrtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); +static int faithioctl(struct ifnet *, u_long, caddr_t); +int faithoutput(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); +static void faithrtrequest(int, struct rtentry *, struct rt_addrinfo *); -void faithattach __P((int)); +void faithattach(int); static struct ifnet faithif[NFAITH]; diff --git a/sys/net/if_fddi.h b/sys/net/if_fddi.h index 3f9a7afe9c0..4840a694e76 100644 --- a/sys/net/if_fddi.h +++ b/sys/net/if_fddi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fddi.h,v 1.3 2001/06/09 06:16:37 angelos Exp $ */ +/* $OpenBSD: if_fddi.h,v 1.4 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_fddi.h,v 1.2 1995/08/19 04:35:28 cgd Exp $ */ /* @@ -76,9 +76,9 @@ struct fddi_header { #define fddi_delmulti ether_delmulti #define fddi_sprintf ether_sprintf -void fddi_ifattach __P((struct ifnet *)); -void fddi_input __P((struct ifnet *, struct fddi_header *, struct mbuf *)); -int fddi_output __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); +void fddi_ifattach(struct ifnet *); +void fddi_input(struct ifnet *, struct fddi_header *, struct mbuf *); +int fddi_output(struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); #endif /* _KERNEL */ #endif /* _NET_IF_FDDI_H_ */ diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 1ee0743c5ea..61d255b849e 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gif.c,v 1.20 2001/07/27 15:48:38 itojun Exp $ */ +/* $OpenBSD: if_gif.c,v 1.21 2002/03/14 01:27:09 millert Exp $ */ /* $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */ /* @@ -64,7 +64,7 @@ extern int ifqmaxlen; int ngif; -void gifattach __P((int)); +void gifattach(int); /* * gif global variable definitions diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h index e0d6e7d24d2..d65ff2775a5 100644 --- a/sys/net/if_gif.h +++ b/sys/net/if_gif.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gif.h,v 1.7 2001/12/26 06:29:01 itojun Exp $ */ +/* $OpenBSD: if_gif.h,v 1.8 2002/03/14 01:27:09 millert Exp $ */ /* $KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $ */ /* @@ -67,8 +67,8 @@ extern int ngif; extern struct gif_softc *gif_softc; /* Prototypes */ -int gif_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *)); -int gif_ioctl __P((struct ifnet *, u_long, caddr_t)); -void gif_start __P((struct ifnet *)); +int gif_output(struct ifnet *, struct mbuf *, + struct sockaddr *, struct rtentry *); +int gif_ioctl(struct ifnet *, u_long, caddr_t); +void gif_start(struct ifnet *); #endif /* _NET_IF_GIF_H_ */ diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h index 1ccda1a9bb2..502d090a169 100644 --- a/sys/net/if_gre.h +++ b/sys/net/if_gre.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.h,v 1.4 2001/06/09 06:16:38 angelos Exp $ */ +/* $OpenBSD: if_gre.h,v 1.5 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_gre.h,v 1.5 1999/11/19 20:41:19 thorpej Exp $ */ /* @@ -143,10 +143,10 @@ extern int ngre; extern int gre_allow; extern int ip_mobile_allow; -void greattach __P((int)); -int gre_ioctl __P((struct ifnet *, u_long, caddr_t)); -int gre_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *rt)); +void greattach(int); +int gre_ioctl(struct ifnet *, u_long, caddr_t); +int gre_output(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *rt); u_short gre_in_cksum(u_short *p, u_int len); #endif /* _KERNEL */ #endif /* _NET_IF_GRE_H_ */ diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 80cad1e86a1..7df89cc0f34 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_loop.c,v 1.22 2002/01/02 20:56:14 dugsong Exp $ */ +/* $OpenBSD: if_loop.c,v 1.23 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $ */ /* @@ -174,7 +174,7 @@ #endif #ifdef ALTQ -static void lo_altqstart __P((struct ifnet *)); +static void lo_altqstart(struct ifnet *); #endif void diff --git a/sys/net/if_media.c b/sys/net/if_media.c index e2c4fb5edc6..3f5fc45d939 100644 --- a/sys/net/if_media.c +++ b/sys/net/if_media.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_media.c,v 1.6 2000/11/28 15:09:41 art Exp $ */ +/* $OpenBSD: if_media.c,v 1.7 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_media.c,v 1.10 2000/03/13 23:52:39 soren Exp $ */ /*- @@ -103,7 +103,7 @@ #ifdef IFMEDIA_DEBUG int ifmedia_debug = 0; -static void ifmedia_printword __P((int)); +static void ifmedia_printword(int); #endif /* diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 6da8fc3c53f..4ab75610aa1 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_media.h,v 1.7 2000/08/26 20:04:16 nate Exp $ */ +/* $OpenBSD: if_media.h,v 1.8 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_media.h,v 1.22 2000/02/17 21:53:16 sommerfeld Exp $ */ /*- @@ -94,8 +94,8 @@ /* * Driver callbacks for media status and change requests. */ -typedef int (*ifm_change_cb_t) __P((struct ifnet *ifp)); -typedef void (*ifm_stat_cb_t) __P((struct ifnet *ifp, struct ifmediareq *req)); +typedef int (*ifm_change_cb_t)(struct ifnet *ifp); +typedef void (*ifm_stat_cb_t)(struct ifnet *ifp, struct ifmediareq *req); /* * In-kernel representation of a single supported media type. @@ -121,32 +121,32 @@ struct ifmedia { }; /* Initialize an interface's struct if_media field. */ -void ifmedia_init __P((struct ifmedia *ifm, int dontcare_mask, - ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback)); +void ifmedia_init(struct ifmedia *ifm, int dontcare_mask, + ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback); /* Add one supported medium to a struct ifmedia. */ -void ifmedia_add __P((struct ifmedia *ifm, int mword, int data, void *aux)); +void ifmedia_add(struct ifmedia *ifm, int mword, int data, void *aux); /* Add an array (of ifmedia_entry) media to a struct ifmedia. */ void ifmedia_list_add(struct ifmedia *mp, struct ifmedia_entry *lp, int count); /* Set default media type on initialization. */ -void ifmedia_set __P((struct ifmedia *ifm, int mword)); +void ifmedia_set(struct ifmedia *ifm, int mword); /* Common ioctl function for getting/setting media, called by driver. */ -int ifmedia_ioctl __P((struct ifnet *ifp, struct ifreq *ifr, - struct ifmedia *ifm, u_long cmd)); +int ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, + struct ifmedia *ifm, u_long cmd); /* Locate a media entry */ -struct ifmedia_entry *ifmedia_match __P((struct ifmedia *ifm, - int flags, int mask)); +struct ifmedia_entry *ifmedia_match(struct ifmedia *ifm, + int flags, int mask); /* Delete all media for a given media instance */ -void ifmedia_delete_instance __P((struct ifmedia *, int)); +void ifmedia_delete_instance(struct ifmedia *, int); /* Compute baudrate for a given media. */ -int ifmedia_baudrate __P((int)); +int ifmedia_baudrate(int); #endif /*_KERNEL */ /* diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 5cb33cce206..e9f513425ff 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ppp.c,v 1.26 2002/02/13 08:14:48 kjc Exp $ */ +/* $OpenBSD: if_ppp.c,v 1.27 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $ */ /* @@ -130,14 +130,14 @@ #include <net/ppp-comp.h> #endif -static int pppsioctl __P((struct ifnet *, u_long, caddr_t)); -static void ppp_requeue __P((struct ppp_softc *)); -static void ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd)); -static void ppp_ccp_closed __P((struct ppp_softc *)); -static void ppp_inproc __P((struct ppp_softc *, struct mbuf *)); -static void pppdumpm __P((struct mbuf *m0)); +static int pppsioctl(struct ifnet *, u_long, caddr_t); +static void ppp_requeue(struct ppp_softc *); +static void ppp_ccp(struct ppp_softc *, struct mbuf *m, int rcvd); +static void ppp_ccp_closed(struct ppp_softc *); +static void ppp_inproc(struct ppp_softc *, struct mbuf *); +static void pppdumpm(struct mbuf *m0); #ifdef ALTQ -static void ppp_ifstart __P((struct ifnet *ifp)); +static void ppp_ifstart(struct ifnet *ifp); #endif /* diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h index 1720dc86d9e..6129ddfcfe1 100644 --- a/sys/net/if_ppp.h +++ b/sys/net/if_ppp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ppp.h,v 1.6 2001/06/09 06:16:38 angelos Exp $ */ +/* $OpenBSD: if_ppp.h,v 1.7 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_ppp.h,v 1.11 1996/03/15 02:28:05 paulus Exp $ */ /* @@ -127,9 +127,9 @@ struct ifpppcstatsreq { #define SIOCGPPPCSTATS _IOWR('i', 122, struct ifpppcstatsreq) #ifdef _KERNEL -void pppattach __P((void)); -int pppoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); -void pppintr __P((void)); +void pppattach(void); +int pppoutput(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); +void pppintr(void); #endif #endif /* _NET_IF_PPP_H_ */ diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h index 6effbced66c..167142bbf5e 100644 --- a/sys/net/if_pppvar.h +++ b/sys/net/if_pppvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppvar.h,v 1.9 2001/06/09 06:16:38 angelos Exp $ */ +/* $OpenBSD: if_pppvar.h,v 1.10 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_pppvar.h,v 1.5 1997/01/03 07:23:29 mikel Exp $ */ /* * if_pppvar.h - private structures and declarations for PPP. @@ -61,9 +61,9 @@ struct ppp_softc { int sc_unit; /* XXX unit number */ u_int sc_flags; /* control/status bits; see if_ppp.h */ void *sc_devp; /* pointer to device-dep structure */ - void (*sc_start) __P((struct ppp_softc *)); /* start output proc */ - void (*sc_ctlp) __P((struct ppp_softc *)); /* rcvd control pkt */ - void (*sc_relinq) __P((struct ppp_softc *)); /* relinquish ifunit */ + void (*sc_start)(struct ppp_softc *); /* start output proc */ + void (*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */ + void (*sc_relinq)(struct ppp_softc *); /* relinquish ifunit */ u_int16_t sc_mru; /* max receive unit */ pid_t sc_xfer; /* used in transferring unit */ struct ifqueue sc_rawq; /* received packets */ @@ -104,14 +104,14 @@ struct ppp_softc { #ifdef _KERNEL struct ppp_softc ppp_softc[NPPP]; -struct ppp_softc *pppalloc __P((pid_t pid)); -void pppdealloc __P((struct ppp_softc *sc)); -int pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data, - int flag, struct proc *p)); -void ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost)); -struct mbuf *ppp_dequeue __P((struct ppp_softc *sc)); -void ppp_restart __P((struct ppp_softc *sc)); -int pppoutput __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *)); +struct ppp_softc *pppalloc(pid_t pid); +void pppdealloc(struct ppp_softc *sc); +int pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data, + int flag, struct proc *p); +void ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost); +struct mbuf *ppp_dequeue(struct ppp_softc *sc); +void ppp_restart(struct ppp_softc *sc); +int pppoutput(struct ifnet *, struct mbuf *, + struct sockaddr *, struct rtentry *); #endif /* _KERNEL */ #endif /* _NET_IF_PPPVAR_H_ */ diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index 7b7898ac805..93e4e69cd5b 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sl.c,v 1.14 2001/06/27 06:07:43 kjc Exp $ */ +/* $OpenBSD: if_sl.c,v 1.15 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_sl.c,v 1.39.4.1 1996/06/02 16:26:31 thorpej Exp $ */ /* @@ -186,8 +186,8 @@ int nsl; #define TRANS_FRAME_END 0xdc /* transposed frame end */ #define TRANS_FRAME_ESCAPE 0xdd /* transposed frame esc */ -static int slinit __P((struct sl_softc *)); -static struct mbuf *sl_btom __P((struct sl_softc *, int)); +static int slinit(struct sl_softc *); +static struct mbuf *sl_btom(struct sl_softc *, int); /* * Called from boot code to establish sl interfaces. diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h index 892273732bb..ac35a8daf3b 100644 --- a/sys/net/if_slvar.h +++ b/sys/net/if_slvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_slvar.h,v 1.9 2001/06/15 03:38:34 itojun Exp $ */ +/* $OpenBSD: if_slvar.h,v 1.10 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_slvar.h,v 1.16 1996/05/07 02:40:46 thorpej Exp $ */ /*- @@ -118,14 +118,14 @@ struct ifslstatsreq { #define SIOCGSLSTATS _IOWR('i', 123, struct ifslstatsreq) #ifdef _KERNEL -void slattach __P((int)); -void slclose __P((struct tty *)); -void slinput __P((int, struct tty *)); -int slioctl __P((struct ifnet *, u_long, caddr_t)); -int slopen __P((dev_t, struct tty *)); -int sloutput __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); -void slstart __P((struct tty *)); -int sltioctl __P((struct tty *, u_long, caddr_t, int)); +void slattach(int); +void slclose(struct tty *); +void slinput(int, struct tty *); +int slioctl(struct ifnet *, u_long, caddr_t); +int slopen(dev_t, struct tty *); +int sloutput(struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); +void slstart(struct tty *); +int sltioctl(struct tty *, u_long, caddr_t, int); #endif /* _KERNEL */ #endif /* _NET_IF_SLVAR_H_ */ diff --git a/sys/net/if_strip.c b/sys/net/if_strip.c index aff2308b1fc..e9c1a0c5085 100644 --- a/sys/net/if_strip.c +++ b/sys/net/if_strip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_strip.c,v 1.16 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_strip.c,v 1.17 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_strip.c,v 1.2.4.3 1996/08/03 00:58:32 jtc Exp $ */ /* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */ @@ -229,8 +229,8 @@ struct st_softc st_softc[NSTRIP]; #define STRIP_FRAME_END 0x0D /* carriage return */ -static int stripinit __P((struct st_softc *)); -static struct mbuf *strip_btom __P((struct st_softc *, int)); +static int stripinit(struct st_softc *); +static struct mbuf *strip_btom(struct st_softc *, int); /* * STRIP header: '*' + modem address (dddd-dddd) + '*' + mactype ('SIP0') @@ -259,23 +259,23 @@ struct st_header { * different STRIP implementations: *BSD, Linux, etc. * */ -static u_char* UnStuffData __P((u_char *src, u_char *end, u_char - *dest, u_long dest_length)); - -static u_char* StuffData __P((u_char *src, u_long length, u_char *dest, - u_char **code_ptr_ptr)); - -static void RecvErr __P((char *msg, struct st_softc *sc)); -static void RecvErr_Message __P((struct st_softc *strip_info, - u_char *sendername, u_char *msg)); -void strip_resetradio __P((struct st_softc *sc, struct tty *tp)); -void strip_proberadio __P((struct st_softc *sc, struct tty *tp)); -void strip_watchdog __P((struct ifnet *ifp)); -void strip_sendbody __P((struct st_softc *sc, struct mbuf *m)); -int strip_newpacket __P((struct st_softc *sc, u_char *ptr, u_char *end)); -struct mbuf * strip_send __P((struct st_softc *sc, struct mbuf *m0)); - -void strip_timeout __P((void *x)); +static u_char* UnStuffData(u_char *src, u_char *end, u_char + *dest, u_long dest_length); + +static u_char* StuffData(u_char *src, u_long length, u_char *dest, + u_char **code_ptr_ptr); + +static void RecvErr(char *msg, struct st_softc *sc); +static void RecvErr_Message(struct st_softc *strip_info, + u_char *sendername, u_char *msg); +void strip_resetradio(struct st_softc *sc, struct tty *tp); +void strip_proberadio(struct st_softc *sc, struct tty *tp); +void strip_watchdog(struct ifnet *ifp); +void strip_sendbody(struct st_softc *sc, struct mbuf *m); +int strip_newpacket(struct st_softc *sc, u_char *ptr, u_char *end); +struct mbuf * strip_send(struct st_softc *sc, struct mbuf *m0); + +void strip_timeout(void *x); diff --git a/sys/net/if_stripvar.h b/sys/net/if_stripvar.h index efee4af3ca7..a83c83d2c7b 100644 --- a/sys/net/if_stripvar.h +++ b/sys/net/if_stripvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_stripvar.h,v 1.7 2001/06/15 03:38:34 itojun Exp $ */ +/* $OpenBSD: if_stripvar.h,v 1.8 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_stripvar.h,v 1.2.4.1 1996/08/05 20:37:51 jtc Exp $ */ #ifndef _NET_IF_STRIPVAR_H_ @@ -55,14 +55,14 @@ struct st_softc { #define SC_AUTOCOMP IFF_LINK2 /* auto-enable TCP compression */ #ifdef _KERNEL -void stripattach __P((int n)); -void stripclose __P((struct tty *)); -void stripinput __P((int, struct tty *)); -int stripioctl __P((struct ifnet *, u_long, caddr_t)); -int stripopen __P((dev_t, struct tty *)); -int stripoutput __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); -void stripstart __P((struct tty *)); -int striptioctl __P((struct tty *, u_long, caddr_t, int)); +void stripattach(int n); +void stripclose(struct tty *); +void stripinput(int, struct tty *); +int stripioctl(struct ifnet *, u_long, caddr_t); +int stripopen(dev_t, struct tty *); +int stripoutput(struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); +void stripstart(struct tty *); +int striptioctl(struct tty *, u_long, caddr_t, int); #endif /* _KERNEL */ #endif /* _NET_IF_STRIPVAR_H_ */ diff --git a/sys/net/if_token.h b/sys/net/if_token.h index 1549869432f..1db70d42779 100644 --- a/sys/net/if_token.h +++ b/sys/net/if_token.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_token.h,v 1.2 2001/06/09 06:16:38 angelos Exp $ */ +/* $OpenBSD: if_token.h,v 1.3 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_token.h,v 1.6 1999/11/19 20:41:19 thorpej Exp $ */ /* @@ -125,8 +125,8 @@ struct token_rif { #define token_delmulti ether_delmulti #define token_sprintf ether_sprintf -void token_ifattach __P((struct ifnet *)); -void token_input __P((struct ifnet *, struct mbuf *)); +void token_ifattach(struct ifnet *); +void token_input(struct ifnet *, struct mbuf *); #endif #endif /* _NET_IF_TOKEN_H_ */ diff --git a/sys/net/if_tokensubr.c b/sys/net/if_tokensubr.c index e039960fa36..9c99f468cad 100644 --- a/sys/net/if_tokensubr.c +++ b/sys/net/if_tokensubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tokensubr.c,v 1.5 2001/12/09 13:09:13 jason Exp $ */ +/* $OpenBSD: if_tokensubr.c,v 1.6 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_tokensubr.c,v 1.7 1999/05/30 00:39:07 bad Exp $ */ /* @@ -123,8 +123,8 @@ extern struct ifqueue pkintrq; #define llc_snap llc_un.type_snap #endif -int token_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); +int token_output(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); /* * Token Ring output routine. diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index c0febffec45..d34a5611e92 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.40 2001/12/10 06:10:53 jason Exp $ */ +/* $OpenBSD: if_tun.c,v 1.41 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -99,21 +99,21 @@ int ntun; extern int ifqmaxlen; -void tunattach __P((int)); -int tunopen __P((dev_t, int, int, struct proc *)); -int tunclose __P((dev_t, int, int, struct proc *)); -int tun_ioctl __P((struct ifnet *, u_long, caddr_t)); -int tun_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *rt)); -int tunioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int tunread __P((dev_t, struct uio *, int)); -int tunwrite __P((dev_t, struct uio *, int)); -int tunselect __P((dev_t, int, struct proc *)); +void tunattach(int); +int tunopen(dev_t, int, int, struct proc *); +int tunclose(dev_t, int, int, struct proc *); +int tun_ioctl(struct ifnet *, u_long, caddr_t); +int tun_output(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *rt); +int tunioctl(dev_t, u_long, caddr_t, int, struct proc *); +int tunread(dev_t, struct uio *, int); +int tunwrite(dev_t, struct uio *, int); +int tunselect(dev_t, int, struct proc *); -static int tuninit __P((struct tun_softc *)); +static int tuninit(struct tun_softc *); #ifdef ALTQ -static void tunstart __P((struct ifnet *)); +static void tunstart(struct ifnet *); #endif void diff --git a/sys/net/netisr.h b/sys/net/netisr.h index 56179b3adbf..cff6eb8026e 100644 --- a/sys/net/netisr.h +++ b/sys/net/netisr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: netisr.h,v 1.16 2001/09/23 10:44:10 mickey Exp $ */ +/* $OpenBSD: netisr.h,v 1.17 2002/03/14 01:27:09 millert Exp $ */ /* $NetBSD: netisr.h,v 1.12 1995/08/12 23:59:24 mycroft Exp $ */ /* @@ -74,17 +74,17 @@ #ifdef _KERNEL int netisr; /* scheduling bits for network */ -void arpintr __P((void)); -void ipintr __P((void)); -void ip6intr __P((void)); -void atintr __P((void)); -void nsintr __P((void)); -void ipxintr __P((void)); -void clnlintr __P((void)); -void natmintr __P((void)); -void pppintr __P((void)); -void ccittintr __P((void)); -void bridgeintr __P((void)); +void arpintr(void); +void ipintr(void); +void ip6intr(void); +void atintr(void); +void nsintr(void); +void ipxintr(void); +void clnlintr(void); +void natmintr(void); +void pppintr(void); +void ccittintr(void); +void bridgeintr(void); #include <dev/rndvar.h> #define schednetisr(anisr) \ diff --git a/sys/net/ppp-comp.h b/sys/net/ppp-comp.h index 9d4201139c0..0dc49154592 100644 --- a/sys/net/ppp-comp.h +++ b/sys/net/ppp-comp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ppp-comp.h,v 1.5 2001/06/09 06:16:39 angelos Exp $ */ +/* $OpenBSD: ppp-comp.h,v 1.6 2002/03/14 01:27:10 millert Exp $ */ /* * ppp-comp.h - Definitions for doing PPP packet compression. @@ -53,36 +53,36 @@ struct compressor { int compress_proto; /* CCP compression protocol number */ /* Allocate space for a compressor (transmit side) */ - void *(*comp_alloc) __P((u_char *options, int opt_len)); + void *(*comp_alloc)(u_char *options, int opt_len); /* Free space used by a compressor */ - void (*comp_free) __P((void *state)); + void (*comp_free)(void *state); /* Initialize a compressor */ - int (*comp_init) __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int debug)); + int (*comp_init)(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int debug); /* Reset a compressor */ - void (*comp_reset) __P((void *state)); + void (*comp_reset)(void *state); /* Compress a packet */ - int (*compress) __P((void *state, PACKETPTR *mret, - PACKETPTR mp, int orig_len, int max_len)); + int (*compress)(void *state, PACKETPTR *mret, + PACKETPTR mp, int orig_len, int max_len); /* Return compression statistics */ - void (*comp_stat) __P((void *state, struct compstat *stats)); + void (*comp_stat)(void *state, struct compstat *stats); /* Allocate space for a decompressor (receive side) */ - void *(*decomp_alloc) __P((u_char *options, int opt_len)); + void *(*decomp_alloc)(u_char *options, int opt_len); /* Free space used by a decompressor */ - void (*decomp_free) __P((void *state)); + void (*decomp_free)(void *state); /* Initialize a decompressor */ - int (*decomp_init) __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int mru, int debug)); + int (*decomp_init)(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int mru, int debug); /* Reset a decompressor */ - void (*decomp_reset) __P((void *state)); + void (*decomp_reset)(void *state); /* Decompress a packet. */ - int (*decompress) __P((void *state, PACKETPTR mp, - PACKETPTR *dmpp)); + int (*decompress)(void *state, PACKETPTR mp, + PACKETPTR *dmpp); /* Update state for an incompressible packet received */ - void (*incomp) __P((void *state, PACKETPTR mp)); + void (*incomp)(void *state, PACKETPTR mp); /* Return decompression statistics */ - void (*decomp_stat) __P((void *state, struct compstat *stats)); + void (*decomp_stat)(void *state, struct compstat *stats); }; #endif /* PACKETPTR */ diff --git a/sys/net/ppp-deflate.c b/sys/net/ppp-deflate.c index bb391cadfcf..963b7782d00 100644 --- a/sys/net/ppp-deflate.c +++ b/sys/net/ppp-deflate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppp-deflate.c,v 1.5 1998/05/08 05:02:07 millert Exp $ */ +/* $OpenBSD: ppp-deflate.c,v 1.6 2002/03/14 01:27:10 millert Exp $ */ /* $NetBSD: ppp-deflate.c,v 1.1 1996/03/15 02:28:09 paulus Exp $ */ /* @@ -58,24 +58,24 @@ struct deflate_state { #define DEFLATE_OVHD 2 /* Deflate overhead/packet */ -static void *zalloc __P((void *, u_int items, u_int size)); -static void zfree __P((void *, void *ptr, u_int nb)); -static void *z_comp_alloc __P((u_char *options, int opt_len)); -static void *z_decomp_alloc __P((u_char *options, int opt_len)); -static void z_comp_free __P((void *state)); -static void z_decomp_free __P((void *state)); -static int z_comp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int debug)); -static int z_decomp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int mru, int debug)); -static int z_compress __P((void *state, struct mbuf **mret, - struct mbuf *mp, int slen, int maxolen)); -static void z_incomp __P((void *state, struct mbuf *dmsg)); -static int z_decompress __P((void *state, struct mbuf *cmp, - struct mbuf **dmpp)); -static void z_comp_reset __P((void *state)); -static void z_decomp_reset __P((void *state)); -static void z_comp_stats __P((void *state, struct compstat *stats)); +static void *zalloc(void *, u_int items, u_int size); +static void zfree(void *, void *ptr, u_int nb); +static void *z_comp_alloc(u_char *options, int opt_len); +static void *z_decomp_alloc(u_char *options, int opt_len); +static void z_comp_free(void *state); +static void z_decomp_free(void *state); +static int z_comp_init(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int debug); +static int z_decomp_init(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int mru, int debug); +static int z_compress(void *state, struct mbuf **mret, + struct mbuf *mp, int slen, int maxolen); +static void z_incomp(void *state, struct mbuf *dmsg); +static int z_decompress(void *state, struct mbuf *cmp, + struct mbuf **dmpp); +static void z_comp_reset(void *state); +static void z_decomp_reset(void *state); +static void z_comp_stats(void *state, struct compstat *stats); /* * Procedures exported to if_ppp.c. diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c index e1f397e4956..8e3ff717875 100644 --- a/sys/net/ppp_tty.c +++ b/sys/net/ppp_tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppp_tty.c,v 1.13 2002/02/13 08:14:48 kjc Exp $ */ +/* $OpenBSD: ppp_tty.c,v 1.14 2002/03/14 01:27:10 millert Exp $ */ /* $NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $ */ /* @@ -110,23 +110,23 @@ #include <net/if_ppp.h> #include <net/if_pppvar.h> -int pppopen __P((dev_t dev, struct tty *tp)); -int pppclose __P((struct tty *tp, int flag)); -int pppread __P((struct tty *tp, struct uio *uio, int flag)); -int pppwrite __P((struct tty *tp, struct uio *uio, int flag)); -int ppptioctl __P((struct tty *tp, u_long cmd, caddr_t data, int flag, - struct proc *)); -int pppinput __P((int c, struct tty *tp)); -int pppstart __P((struct tty *tp, int)); - -u_int16_t pppfcs __P((u_int16_t fcs, u_char *cp, int len)); -void pppasyncstart __P((struct ppp_softc *)); -void pppasyncctlp __P((struct ppp_softc *)); -void pppasyncrelinq __P((struct ppp_softc *)); -void ppp_timeout __P((void *)); -void pppgetm __P((struct ppp_softc *sc)); -void pppdumpb __P((u_char *b, int l)); -void ppplogchar __P((struct ppp_softc *, int)); +int pppopen(dev_t dev, struct tty *tp); +int pppclose(struct tty *tp, int flag); +int pppread(struct tty *tp, struct uio *uio, int flag); +int pppwrite(struct tty *tp, struct uio *uio, int flag); +int ppptioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, + struct proc *); +int pppinput(int c, struct tty *tp); +int pppstart(struct tty *tp, int); + +u_int16_t pppfcs(u_int16_t fcs, u_char *cp, int len); +void pppasyncstart(struct ppp_softc *); +void pppasyncctlp(struct ppp_softc *); +void pppasyncrelinq(struct ppp_softc *); +void ppp_timeout(void *); +void pppgetm(struct ppp_softc *sc); +void pppdumpb(u_char *b, int l); +void ppplogchar(struct ppp_softc *, int); /* * Some useful mbuf macros not in mbuf.h. diff --git a/sys/net/radix.c b/sys/net/radix.c index 7bb33174b3c..752273c3483 100644 --- a/sys/net/radix.c +++ b/sys/net/radix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radix.c,v 1.7 2001/07/21 14:34:47 itojun Exp $ */ +/* $OpenBSD: radix.c,v 1.8 2002/03/14 01:27:10 millert Exp $ */ /* $NetBSD: radix.c,v 1.11 1996/03/16 23:55:36 christos Exp $ */ /* @@ -65,10 +65,10 @@ static char *rn_zeros, *rn_ones; #define Bcmp(a, b, l) (l == 0 ? 0 : bcmp((caddr_t)(a), (caddr_t)(b), (u_long)l)) -static int rn_satsifies_leaf __P((char *, struct radix_node *, int)); -static int rn_lexobetter __P((void *, void *)); -static struct radix_mask *rn_new_radix_mask __P((struct radix_node *, - struct radix_mask *)); +static int rn_satsifies_leaf(char *, struct radix_node *, int); +static int rn_lexobetter(void *, void *); +static struct radix_mask *rn_new_radix_mask(struct radix_node *, + struct radix_mask *); /* * The data structure for the keys is a radix tree with one way * branching removed. The index rn_b at an internal node n represents a bit @@ -808,7 +808,7 @@ out: int rn_walktree(h, f, w) struct radix_node_head *h; - register int (*f) __P((struct radix_node *, void *)); + register int (*f)(struct radix_node *, void *); void *w; { int error; diff --git a/sys/net/radix.h b/sys/net/radix.h index 11f98d653b2..e2835f7dcc9 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -1,4 +1,4 @@ -/* $OpenBSD: radix.h,v 1.5 2001/06/09 06:16:39 angelos Exp $ */ +/* $OpenBSD: radix.h,v 1.6 2002/03/14 01:27:10 millert Exp $ */ /* $NetBSD: radix.h,v 1.8 1996/02/13 22:00:37 christos Exp $ */ /* @@ -111,22 +111,15 @@ struct radix_node_head { struct radix_node *rnh_treetop; int rnh_addrsize; /* permit, but not require fixed keys */ int rnh_pktsize; /* permit, but not require fixed keys */ - struct radix_node *(*rnh_addaddr) /* add based on sockaddr */ - __P((void *v, void *mask, - struct radix_node_head *head, struct radix_node nodes[])); - struct radix_node *(*rnh_addpkt) /* add based on packet hdr */ - __P((void *v, void *mask, - struct radix_node_head *head, struct radix_node nodes[])); - struct radix_node *(*rnh_deladdr) /* remove based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); - struct radix_node *(*rnh_delpkt) /* remove based on packet hdr */ - __P((void *v, void *mask, struct radix_node_head *head)); - struct radix_node *(*rnh_matchaddr) /* locate based on sockaddr */ - __P((void *v, struct radix_node_head *head)); - struct radix_node *(*rnh_lookup) /* locate based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); - struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */ - __P((void *v, struct radix_node_head *head)); + struct radix_node *(*rnh_addaddr) /* add based on sockaddr */(void *v, void *mask, + struct radix_node_head *head, struct radix_node nodes[]); + struct radix_node *(*rnh_addpkt) /* add based on packet hdr */(void *v, void *mask, + struct radix_node_head *head, struct radix_node nodes[]); + struct radix_node *(*rnh_deladdr) /* remove based on sockaddr */(void *v, void *mask, struct radix_node_head *head); + struct radix_node *(*rnh_delpkt) /* remove based on packet hdr */(void *v, void *mask, struct radix_node_head *head); + struct radix_node *(*rnh_matchaddr) /* locate based on sockaddr */(void *v, struct radix_node_head *head); + struct radix_node *(*rnh_lookup) /* locate based on sockaddr */(void *v, void *mask, struct radix_node_head *head); + struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */(void *v, struct radix_node_head *head); int (*rnh_walktree) /* traverse tree */ __P((struct radix_node_head *, int (*)(struct radix_node *, void *), void *)); @@ -149,22 +142,22 @@ struct radix_node_head { #endif /* !_KERNEL */ #if defined(_KERNEL) || defined(_ROUTED) -void rn_init __P((void)); -int rn_inithead __P((void **, int)); -int rn_refines __P((void *, void *)); +void rn_init(void); +int rn_inithead(void **, int); +int rn_refines(void *, void *); int rn_walktree __P((struct radix_node_head *, int (*)(struct radix_node *, void *), void *)); struct radix_node - *rn_addmask __P((void *, int, int)), - *rn_addroute __P((void *, void *, struct radix_node_head *, - struct radix_node [2])), - *rn_delete __P((void *, void *, struct radix_node_head *)), - *rn_insert __P((void *, struct radix_node_head *, int *, - struct radix_node [2])), - *rn_lookup __P((void *, void *, struct radix_node_head *)), - *rn_match __P((void *, struct radix_node_head *)), - *rn_newpair __P((void *, int, struct radix_node[2])), - *rn_search __P((void *, struct radix_node *)), - *rn_search_m __P((void *, struct radix_node *, void *)); + *rn_addmask(void *, int, int), + *rn_addroute(void *, void *, struct radix_node_head *, + struct radix_node [2]), + *rn_delete(void *, void *, struct radix_node_head *), + *rn_insert(void *, struct radix_node_head *, int *, + struct radix_node [2]), + *rn_lookup(void *, void *, struct radix_node_head *), + *rn_match(void *, struct radix_node_head *), + *rn_newpair(void *, int, struct radix_node[2]), + *rn_search(void *, struct radix_node *), + *rn_search_m(void *, struct radix_node *, void *); #endif /* define(_KERNEL) || defined(_ROUTED) */ #endif /* _NET_RADIX_H_ */ diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h index 75e12d82f38..34531bec4e1 100644 --- a/sys/net/raw_cb.h +++ b/sys/net/raw_cb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_cb.h,v 1.3 2001/06/09 06:16:39 angelos Exp $ */ +/* $OpenBSD: raw_cb.h,v 1.4 2002/03/14 01:27:10 millert Exp $ */ /* $NetBSD: raw_cb.h,v 1.9 1996/02/13 22:00:41 christos Exp $ */ /* @@ -62,14 +62,14 @@ struct rawcb { #ifdef _KERNEL LIST_HEAD(, rawcb) rawcb; /* head of list */ -int raw_attach __P((struct socket *, int)); -void *raw_ctlinput __P((int, struct sockaddr *, void *)); -void raw_detach __P((struct rawcb *)); -void raw_disconnect __P((struct rawcb *)); -void raw_init __P((void)); -void raw_input __P((struct mbuf *, ...)); -int raw_usrreq __P((struct socket *, - int, struct mbuf *, struct mbuf *, struct mbuf *)); +int raw_attach(struct socket *, int); +void *raw_ctlinput(int, struct sockaddr *, void *); +void raw_detach(struct rawcb *); +void raw_disconnect(struct rawcb *); +void raw_init(void); +void raw_input(struct mbuf *, ...); +int raw_usrreq(struct socket *, + int, struct mbuf *, struct mbuf *, struct mbuf *); #endif /* _KERNEL */ #endif /* _NET_RAW_CB_H_ */ diff --git a/sys/net/route.c b/sys/net/route.c index ccef36f9320..7e7035e4b3c 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.28 2002/01/23 00:39:48 art Exp $ */ +/* $OpenBSD: route.c,v 1.29 2002/03/14 01:27:10 millert Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -138,7 +138,7 @@ extern struct ifnet encif; int rttrash; /* routes not in table but not freed */ struct sockaddr wildcard; /* zero valued cookie for wildcard searches */ -static int okaytoclone __P((u_int, int)); +static int okaytoclone(u_int, int); #ifdef IPSEC @@ -988,7 +988,7 @@ rt_timer_remove_all(rt) int rt_timer_add(rt, func, queue) struct rtentry *rt; - void(*func) __P((struct rtentry *, struct rttimer *)); + void(*func)(struct rtentry *, struct rttimer *); struct rttimer_queue *queue; { struct rttimer *r; diff --git a/sys/net/route.h b/sys/net/route.h index 83b753e2074..2efa1615755 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $OpenBSD: route.h,v 1.12 2001/06/09 06:16:39 angelos Exp $ */ +/* $OpenBSD: route.h,v 1.13 2002/03/14 01:27:10 millert Exp $ */ /* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */ /* @@ -257,8 +257,8 @@ struct rttimer { LIST_ENTRY(rttimer) rtt_link; /* multiple timers per rtentry */ struct rttimer_queue *rtt_queue;/* back pointer to queue */ struct rtentry *rtt_rt; /* Back pointer to the route */ - void (*rtt_func) __P((struct rtentry *, - struct rttimer *)); + void (*rtt_func)(struct rtentry *, + struct rttimer *); time_t rtt_time; /* When this timer was registered */ }; @@ -289,46 +289,46 @@ struct rtstat rtstat; struct radix_node_head *rt_tables[AF_MAX+1]; struct socket; -void route_init __P((void)); -int route_output __P((struct mbuf *, ...)); -int route_usrreq __P((struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *)); -void rt_ifmsg __P((struct ifnet *)); -void rt_maskedcopy __P((struct sockaddr *, - struct sockaddr *, struct sockaddr *)); -void rt_missmsg __P((int, struct rt_addrinfo *, int, int)); -void rt_newaddrmsg __P((int, struct ifaddr *, int, struct rtentry *)); -int rt_setgate __P((struct rtentry *, struct sockaddr *, - struct sockaddr *)); -void rt_setmetrics __P((u_long, struct rt_metrics *, struct rt_metrics *)); +void route_init(void); +int route_output(struct mbuf *, ...); +int route_usrreq(struct socket *, int, struct mbuf *, + struct mbuf *, struct mbuf *); +void rt_ifmsg(struct ifnet *); +void rt_maskedcopy(struct sockaddr *, + struct sockaddr *, struct sockaddr *); +void rt_missmsg(int, struct rt_addrinfo *, int, int); +void rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *); +int rt_setgate(struct rtentry *, struct sockaddr *, + struct sockaddr *); +void rt_setmetrics(u_long, struct rt_metrics *, struct rt_metrics *); int rt_timer_add __P((struct rtentry *, void(*)(struct rtentry *, struct rttimer *), struct rttimer_queue *)); -void rt_timer_init __P((void)); +void rt_timer_init(void); struct rttimer_queue * - rt_timer_queue_create __P((u_int)); -void rt_timer_queue_change __P((struct rttimer_queue *, long)); -void rt_timer_queue_destroy __P((struct rttimer_queue *, int)); -void rt_timer_remove_all __P((struct rtentry *)); -unsigned long rt_timer_count __P((struct rttimer_queue *)); -void rt_timer_timer __P((void *)); -void rtable_init __P((void **)); -void rtalloc __P((struct route *)); + rt_timer_queue_create(u_int); +void rt_timer_queue_change(struct rttimer_queue *, long); +void rt_timer_queue_destroy(struct rttimer_queue *, int); +void rt_timer_remove_all(struct rtentry *); +unsigned long rt_timer_count(struct rttimer_queue *); +void rt_timer_timer(void *); +void rtable_init(void **); +void rtalloc(struct route *); struct rtentry * - rtalloc1 __P((struct sockaddr *, int)); -void rtalloc_noclone __P((struct route *, int)); + rtalloc1(struct sockaddr *, int); +void rtalloc_noclone(struct route *, int); struct rtentry * - rtalloc2 __P((struct sockaddr *, int, int)); -void rtfree __P((struct rtentry *)); -int rt_getifa __P((struct rt_addrinfo *)); -int rtinit __P((struct ifaddr *, int, int)); -int rtioctl __P((u_long, caddr_t, struct proc *)); -void rtredirect __P((struct sockaddr *, struct sockaddr *, + rtalloc2(struct sockaddr *, int, int); +void rtfree(struct rtentry *); +int rt_getifa(struct rt_addrinfo *); +int rtinit(struct ifaddr *, int, int); +int rtioctl(u_long, caddr_t, struct proc *); +void rtredirect(struct sockaddr *, struct sockaddr *, struct sockaddr *, int, struct sockaddr *, - struct rtentry **)); -int rtrequest __P((int, struct sockaddr *, + struct rtentry **); +int rtrequest(int, struct sockaddr *, struct sockaddr *, struct sockaddr *, int, - struct rtentry **)); -int rtrequest1 __P((int, struct rt_addrinfo *, struct rtentry **)); + struct rtentry **); +int rtrequest1(int, struct rt_addrinfo *, struct rtentry **); #endif /* _KERNEL */ #endif /* _NET_ROUTE_H_ */ diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index d60219dd494..8375c732d23 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsock.c,v 1.19 2001/12/10 06:10:53 jason Exp $ */ +/* $OpenBSD: rtsock.c,v 1.20 2002/03/14 01:27:10 millert Exp $ */ /* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */ /* @@ -93,10 +93,10 @@ struct walkarg { }; static struct mbuf * - rt_msg1 __P((int, struct rt_addrinfo *)); -static int rt_msg2 __P((int, - struct rt_addrinfo *, caddr_t, struct walkarg *)); -static void rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *)); + rt_msg1(int, struct rt_addrinfo *); +static int rt_msg2(int, + struct rt_addrinfo *, caddr_t, struct walkarg *); +static void rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); /* Sleazy use of local variables throughout file, warning!!!! */ #define dst info.rti_info[RTAX_DST] diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h index 40a07d7905f..53dd58cab8d 100644 --- a/sys/net/slcompress.h +++ b/sys/net/slcompress.h @@ -1,4 +1,4 @@ -/* $OpenBSD: slcompress.h,v 1.4 1998/05/08 05:02:02 millert Exp $ */ +/* $OpenBSD: slcompress.h,v 1.5 2002/03/14 01:27:10 millert Exp $ */ /* $NetBSD: slcompress.h,v 1.11 1997/05/17 21:12:11 christos Exp $ */ /* @@ -158,12 +158,12 @@ struct slcompress { /* flag values */ #define SLF_TOSS 1 /* tossing rcvd frames because of input err */ -void sl_compress_init __P((struct slcompress *)); -void sl_compress_setup __P((struct slcompress *, int)); -u_int sl_compress_tcp __P((struct mbuf *, - struct ip *, struct slcompress *, int)); -int sl_uncompress_tcp __P((u_char **, int, u_int, struct slcompress *)); -int sl_uncompress_tcp_core __P((u_char *, int, int, u_int, - struct slcompress *, u_char **, u_int *)); +void sl_compress_init(struct slcompress *); +void sl_compress_setup(struct slcompress *, int); +u_int sl_compress_tcp(struct mbuf *, + struct ip *, struct slcompress *, int); +int sl_uncompress_tcp(u_char **, int, u_int, struct slcompress *); +int sl_uncompress_tcp_core(u_char *, int, int, u_int, + struct slcompress *, u_char **, u_int *); #endif /* _NET_SLCOMPRESS_H_ */ |