diff options
34 files changed, 439 insertions, 449 deletions
diff --git a/sys/netatalk/at_extern.h b/sys/netatalk/at_extern.h index 583bbec..7a6189c 100644 --- a/sys/netatalk/at_extern.h +++ b/sys/netatalk/at_extern.h @@ -6,42 +6,42 @@ struct sockaddr_at; #ifdef _NET_IF_ARP_H_ extern timeout_t aarpprobe; -extern int aarpresolve __P((struct arpcom *, +extern int aarpresolve (struct arpcom *, struct mbuf *, struct sockaddr_at *, - u_char *)); -extern void aarpinput __P(( struct arpcom *, struct mbuf *)); -extern int at_broadcast __P((struct sockaddr_at *)); + u_char *); +extern void aarpinput (struct arpcom *, struct mbuf *); +extern int at_broadcast (struct sockaddr_at *); #endif #ifdef _NETATALK_AARP_H_ -extern void aarptfree __P((struct aarptab *)); +extern void aarptfree (struct aarptab *); #endif struct ifnet; struct thread; struct socket; -extern void aarp_clean __P((void)); -extern int at_control __P(( struct socket *so, +extern void aarp_clean (void); +extern int at_control (struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, - struct thread *td )); -extern u_short at_cksum __P(( struct mbuf *m, int skip)); -extern void ddp_init __P((void )); -extern struct at_ifaddr *at_ifawithnet __P((struct sockaddr_at *)); + struct thread *td); +extern u_short at_cksum (struct mbuf *m, int skip); +extern void ddp_init (void); +extern struct at_ifaddr *at_ifawithnet (struct sockaddr_at *); #ifdef _NETATALK_DDP_VAR_H_ -extern int ddp_output __P((struct mbuf *m, struct socket *so)); +extern int ddp_output (struct mbuf *m, struct socket *so); #endif #if defined (_NETATALK_DDP_VAR_H_) && defined(_NETATALK_AT_VAR_H_) -extern struct ddpcb *ddp_search __P((struct sockaddr_at *, +extern struct ddpcb *ddp_search(struct sockaddr_at *, struct sockaddr_at *, - struct at_ifaddr *)); + struct at_ifaddr *); #endif #ifdef _NET_ROUTE_H_ -int ddp_route( struct mbuf *m, struct route *ro); +int ddp_route(struct mbuf *m, struct route *ro); #endif diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c index f0beaca..74a622a 100644 --- a/sys/netatm/atm_aal5.c +++ b/sys/netatm/atm_aal5.c @@ -68,28 +68,28 @@ u_long atm_aal5_recvspace = 64 * 1024; /* XXX */ /* * Local functions */ -static int atm_aal5_attach __P((struct socket *, int, struct thread *td)); -static int atm_aal5_detach __P((struct socket *)); -static int atm_aal5_bind __P((struct socket *, struct sockaddr *, - struct thread *td)); -static int atm_aal5_listen __P((struct socket *, struct thread *td)); -static int atm_aal5_connect __P((struct socket *, struct sockaddr *, - struct thread *td)); -static int atm_aal5_accept __P((struct socket *, struct sockaddr **)); -static int atm_aal5_disconnect __P((struct socket *)); -static int atm_aal5_shutdown __P((struct socket *)); -static int atm_aal5_send __P((struct socket *, int, KBuffer *, - struct sockaddr *, KBuffer *, struct thread *td)); -static int atm_aal5_abort __P((struct socket *)); -static int atm_aal5_control __P((struct socket *, u_long, caddr_t, - struct ifnet *, struct thread *td)); -static int atm_aal5_sense __P((struct socket *, struct stat *)); -static int atm_aal5_sockaddr __P((struct socket *, struct sockaddr **)); -static int atm_aal5_peeraddr __P((struct socket *, struct sockaddr **)); -static int atm_aal5_incoming __P((void *, Atm_connection *, - Atm_attributes *, void **)); -static void atm_aal5_cpcs_data __P((void *, KBuffer *)); -static caddr_t atm_aal5_getname __P((void *)); +static int atm_aal5_attach(struct socket *, int, struct thread *td); +static int atm_aal5_detach(struct socket *); +static int atm_aal5_bind(struct socket *, struct sockaddr *, + struct thread *td); +static int atm_aal5_listen(struct socket *, struct thread *td); +static int atm_aal5_connect(struct socket *, struct sockaddr *, + struct thread *td); +static int atm_aal5_accept(struct socket *, struct sockaddr **); +static int atm_aal5_disconnect(struct socket *); +static int atm_aal5_shutdown(struct socket *); +static int atm_aal5_send(struct socket *, int, KBuffer *, + struct sockaddr *, KBuffer *, struct thread *td); +static int atm_aal5_abort(struct socket *); +static int atm_aal5_control(struct socket *, u_long, caddr_t, + struct ifnet *, struct thread *td); +static int atm_aal5_sense(struct socket *, struct stat *); +static int atm_aal5_sockaddr(struct socket *, struct sockaddr **); +static int atm_aal5_peeraddr(struct socket *, struct sockaddr **); +static int atm_aal5_incoming(void *, Atm_connection *, + Atm_attributes *, void **); +static void atm_aal5_cpcs_data(void *, KBuffer *); +static caddr_t atm_aal5_getname(void *); #if (defined(__FreeBSD__) && (BSD >= 199506)) diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c index 13a16d2..e4d1aee 100644 --- a/sys/netatm/atm_cm.c +++ b/sys/netatm/atm_cm.c @@ -69,17 +69,17 @@ struct atm_cm_stat atm_cm_stat = {0}; /* * Local functions */ -static void atm_cm_cpcs_upper __P((int, void *, int, int)); -static void atm_cm_saal_upper __P((int, void *, int, int)); -static void atm_cm_sscop_upper __P((int, void *, int, int)); -static Atm_connvc * atm_cm_share_llc __P((Atm_attributes *)); -static void atm_cm_closeconn __P((Atm_connection *, - struct t_atm_cause *)); -static void atm_cm_closevc __P((Atm_connvc *)); -static void atm_cm_timeout __P((struct atm_time *)); -static KTimeout_ret atm_cm_procinq __P((void *)); -static void atm_cm_incall __P((Atm_connvc *)); -static int atm_cm_accept __P((Atm_connvc *, Atm_connection *)); +static void atm_cm_cpcs_upper(int, void *, int, int); +static void atm_cm_saal_upper(int, void *, int, int); +static void atm_cm_sscop_upper(int, void *, int, int); +static Atm_connvc * atm_cm_share_llc(Atm_attributes *); +static void atm_cm_closeconn(Atm_connection *, + struct t_atm_cause *); +static void atm_cm_closevc(Atm_connvc *); +static void atm_cm_timeout(struct atm_time *); +static KTimeout_ret atm_cm_procinq(void *); +static void atm_cm_incall(Atm_connvc *); +static int atm_cm_accept(Atm_connvc *, Atm_connection *); /* * Local variables @@ -164,7 +164,7 @@ atm_cm_connect(epp, token, ap, copp) struct atm_pif *pip; struct sigmgr *smp; struct stack_list sl; - void (*upf)__P((int, void *, int, int)); + void (*upf)(int, void *, int, int); int s, sli, err, err2; *copp = NULL; @@ -1765,7 +1765,7 @@ atm_cm_accept(cvp, cop) Atm_connection *cop; { struct stack_list sl; - void (*upf)__P((int, void *, int, int)); + void (*upf)(int, void *, int, int); int sli, err, err2; diff --git a/sys/netatm/atm_cm.h b/sys/netatm/atm_cm.h index bbeb18a..9c1b50c 100644 --- a/sys/netatm/atm_cm.h +++ b/sys/netatm/atm_cm.h @@ -58,40 +58,40 @@ struct atm_endpoint { /* Exported functions: Miscellaneous */ int (*ep_ioctl) /* Ioctl */ - __P((int, caddr_t, caddr_t)); + (int, caddr_t, caddr_t); caddr_t (*ep_getname) /* Get application/owner name */ - __P((void *)); + (void *); /* Exported functions: Connection Manager Control API */ void (*ep_connected) /* Call connected */ - __P((void *)); + (void *); void (*ep_cleared) /* Call cleared */ - __P((void *, struct t_atm_cause *)); + (void *, struct t_atm_cause *); int (*ep_incoming) /* Incoming call */ - __P((void *, struct atm_connection *, - struct atm_attributes *, void **)); + (void *, struct atm_connection *, + struct atm_attributes *, void **); int (*ep_addparty) /* Add Party notification */ - __P((void *, int, int)); + (void *, int, int); int (*ep_dropparty) /* Drop Party notification */ - __P((void *, int, int)); + (void *, int, int); /* Exported functions: Connection Manager Data API: CPCS */ void (*ep_cpcs_ctl) /* Control operation */ - __P((int, void *, void *)); + (int, void *, void *); void (*ep_cpcs_data) /* Received data */ - __P((void *, KBuffer *)); + (void *, KBuffer *); /* Exported functions: Connection Manager Data API: SAAL */ void (*ep_saal_ctl) /* Control operation */ - __P((int, void *, void *)); + (int, void *, void *); void (*ep_saal_data) /* Received data */ - __P((void *, KBuffer *)); + (void *, KBuffer *); /* Exported functions: Connection Manager Data API: SSCOP */ void (*ep_sscop_ctl) /* Control operation */ - __P((int, void *, void *, void *)); + (int, void *, void *, void *); void (*ep_sscop_data) /* Received data */ - __P((void *, KBuffer *, u_int)); + (void *, KBuffer *, u_int); }; typedef struct atm_endpoint Atm_endpoint; #endif /* _KERNEL */ @@ -288,7 +288,7 @@ struct atm_connvc { u_char cvc_state; /* CM - VCC state (see below) */ void *cvc_tokl; /* Stack lower layer token */ void (*cvc_lower) /* Stack lower layer handler */ - __P((int, void *, int, int)); + (int, void *, int, int); u_short cvc_upcnt; /* Up stack calls in progress */ u_short cvc_downcnt; /* Down stack calls in progress */ KBuffer *cvc_rcvq; /* Packet receive queue */ diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c index 86d783a..8116e76 100644 --- a/sys/netatm/atm_if.c +++ b/sys/netatm/atm_if.c @@ -72,18 +72,18 @@ extern int ifqmaxlen; /* * Local functions */ -static int atm_physif_ioctl __P((int, caddr_t, caddr_t)); +static int atm_physif_ioctl(int, caddr_t, caddr_t); #if (defined(BSD) && (BSD >= 199306)) -static int atm_netif_rtdel __P((struct radix_node *, void *)); +static int atm_netif_rtdel(struct radix_node *, void *); #endif -static int atm_if_ioctl __P((struct ifnet *, u_long, caddr_t)); -static int atm_ifparse __P((char *, char *, int, int *)); +static int atm_if_ioctl(struct ifnet *, u_long, caddr_t); +static int atm_ifparse(char *, char *, int, int *); /* * Local variables */ static int (*atm_ifouttbl[AF_MAX+1]) - __P((struct ifnet *, KBuffer *, struct sockaddr *)) + (struct ifnet *, KBuffer *, struct sockaddr *) = {NULL}; @@ -1018,8 +1018,8 @@ atm_ifoutput(ifp, m, dst) #endif { u_short fam = dst->sa_family; - int (*func)__P((struct ifnet *, KBuffer *, - struct sockaddr *)); + int (*func)(struct ifnet *, KBuffer *, + struct sockaddr *); /* * Validate address family diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h index fada781..ca2f411 100644 --- a/sys/netatm/atm_if.h +++ b/sys/netatm/atm_if.h @@ -162,7 +162,7 @@ struct atm_pif { /* Exported functions */ int (*pif_ioctl) /* Interface ioctl handler */ - __P((int, caddr_t, caddr_t)); + (int, caddr_t, caddr_t); /* Interface statistics */ long pif_ipdus; /* PDUs received from interface */ @@ -216,7 +216,7 @@ struct cmn_vcc { struct cmn_vcc *cv_next; /* Next in list */ void *cv_toku; /* Upper layer's token */ void (*cv_upper) /* Upper layer's interface */ - __P((int, void *, int, int)); + (int, void *, int, int); Atm_connvc *cv_connvc; /* Associated connection VCC */ u_char cv_state; /* VCC state (see below) */ u_char cv_flags; /* VCC flags (see below) */ @@ -260,15 +260,15 @@ struct cmn_unit { struct sp_info *cu_nif_pool; /* Device NIF pool */ int (*cu_ioctl) /* Interface ioctl handler */ - __P((int, caddr_t, caddr_t)); + (int, caddr_t, caddr_t); int (*cu_instvcc) /* VCC stack instantion handler */ - __P((struct cmn_unit *, Cmn_vcc *)); + (struct cmn_unit *, Cmn_vcc *); int (*cu_openvcc) /* Open VCC handler */ - __P((struct cmn_unit *, Cmn_vcc *)); + (struct cmn_unit *, Cmn_vcc *); int (*cu_closevcc) /* Close VCC handler */ - __P((struct cmn_unit *, Cmn_vcc *)); + (struct cmn_unit *, Cmn_vcc *); void (*cu_output) /* Data output handler */ - __P((struct cmn_unit *, Cmn_vcc *, KBuffer *)); + (struct cmn_unit *, Cmn_vcc *, KBuffer *); Atm_config cu_config; /* Device configuration data */ }; @@ -293,10 +293,9 @@ struct atm_ncm { u_short ncm_family; /* Protocol family */ /* Exported functions */ int (*ncm_ifoutput) /* Interface if_output handler */ - __P((struct ifnet *, KBuffer *, - struct sockaddr *)); + (struct ifnet *, KBuffer *, struct sockaddr *); int (*ncm_stat) /* Network i/f status handler */ - __P((int, struct atm_nif *, int)); + (int, struct atm_nif *, int); }; /* @@ -346,7 +345,7 @@ struct atm_ncm { /* * Macro to schedule the ATM interrupt queue handler */ -typedef void (atm_intr_t) __P((void *, KBuffer *)); /* Callback function type */ +typedef void (atm_intr_t)(void *, KBuffer *); /* Callback function type */ typedef atm_intr_t *atm_intr_func_t; /* Pointer to callback function */ #define SCHED_ATM schednetisr(NETISR_ATM) diff --git a/sys/netatm/atm_sigmgr.h b/sys/netatm/atm_sigmgr.h index 6b1d63d..227b71f 100644 --- a/sys/netatm/atm_sigmgr.h +++ b/sys/netatm/atm_sigmgr.h @@ -50,21 +50,21 @@ struct sigmgr { struct siginst *sm_prinst; /* List of protocol instances */ /* Exported functions */ int (*sm_attach) /* Attach interface */ - __P((struct sigmgr *, struct atm_pif *)); + (struct sigmgr *, struct atm_pif *); int (*sm_detach) /* Detach interface */ - __P((struct atm_pif *)); + (struct atm_pif *); int (*sm_setup) /* Connection setup */ - __P((Atm_connvc *, int *)); + (Atm_connvc *, int *); int (*sm_accept) /* Call accepted */ - __P((struct vccb *, int *)); + (struct vccb *, int *); int (*sm_reject) /* Call rejected */ - __P((struct vccb *, int *)); + (struct vccb *, int *); int (*sm_release) /* Connection release */ - __P((struct vccb *, int *)); + (struct vccb *, int *); int (*sm_free) /* Free connection resources */ - __P((struct vccb *)); + (struct vccb *); int (*sm_ioctl) /* Ioctl handler */ - __P((int, caddr_t, caddr_t)); + (int, caddr_t, caddr_t); }; #endif /* _KERNEL */ diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c index dc31cfe..b0e9b73 100644 --- a/sys/netatm/atm_signal.c +++ b/sys/netatm/atm_signal.c @@ -431,7 +431,7 @@ int atm_create_stack(cvp, tlp, upf) Atm_connvc *cvp; struct stack_list *tlp; - void (*upf)__P((int, void *, int, int)); + void (*upf)(int, void *, int, int); { struct stack_defn *sdp, usd; struct stack_inst svs; diff --git a/sys/netatm/atm_stack.h b/sys/netatm/atm_stack.h index 345a1af..45ae22c 100644 --- a/sys/netatm/atm_stack.h +++ b/sys/netatm/atm_stack.h @@ -53,11 +53,11 @@ struct stack_defn { u_char sd_flag; /* Flags (see below) */ /* Exported functions */ int (*sd_inst) /* Stack instantiation */ - __P((struct stack_defn **, Atm_connvc *)); + (struct stack_defn **, Atm_connvc *); void (*sd_lower) /* Lower (from above) command handler */ - __P((int, void *, int, int)); + (int, void *, int, int); void (*sd_upper) /* Upper (from below) command handler */ - __P((int, void *, int, int)); + (int, void *, int, int); /* Variables used during stack instantiation */ void *sd_toku; /* Stack service instance token */ }; @@ -266,7 +266,7 @@ struct stackq_entry { struct stackq_entry *sq_next; /* Next entry in queue */ int sq_cmd; /* Stack command */ void (*sq_func) /* Destination function */ - __P((int, void *, int, int)); + (int, void *, int, int); void *sq_token; /* Destination token */ int sq_arg1; /* Command-specific argument */ int sq_arg2; /* Command-specific argument */ diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c index 4fa917b..0ebfed8 100644 --- a/sys/netatm/atm_subr.c +++ b/sys/netatm/atm_subr.c @@ -92,8 +92,8 @@ struct sp_info atm_attributes_pool = { /* * Local functions */ -static void atm_compact __P((struct atm_time *)); -static KTimeout_ret atm_timexp __P((void *)); +static void atm_compact(struct atm_time *); +static KTimeout_ret atm_timexp(void *); /* * Local variables @@ -541,7 +541,7 @@ atm_timexp(arg) * Dispatch expired timers */ while (((tip = atm_timeq) != NULL) && (tip->ti_ticks == 0)) { - void (*func)__P((struct atm_time *)); + void (*func)(struct atm_time *); /* * Remove expired block from queue @@ -600,7 +600,7 @@ void atm_timeout(tip, t, func) struct atm_time *tip; int t; - void (*func)__P((struct atm_time *)); + void (*func)(struct atm_time *); { struct atm_time *tip1, *tip2; int s; @@ -735,7 +735,7 @@ atm_untimeout(tip) int atm_stack_enq(cmd, func, token, cvp, arg1, arg2) int cmd; - void (*func)__P((int, void *, int, int)); + void (*func)(int, void *, int, int); void *token; Atm_connvc *cvp; int arg1; diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h index 0c71bec..313cfe6 100644 --- a/sys/netatm/atm_sys.h +++ b/sys/netatm/atm_sys.h @@ -161,7 +161,7 @@ struct atm_time { u_short ti_ticks; /* Delta of ticks until timeout */ u_char ti_flag; /* Timer flag bits (see below) */ void (*ti_func) /* Call at timeout expiration */ - __P((struct atm_time *)); + (struct atm_time *); struct atm_time *ti_next; /* Next on queue */ }; diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c index 361665b..979a656 100644 --- a/sys/netatm/atm_usrreq.c +++ b/sys/netatm/atm_usrreq.c @@ -62,10 +62,10 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static int atm_dgram_attach __P((struct socket *, int, struct thread *)); -static int atm_dgram_control __P((struct socket *, u_long, caddr_t, - struct ifnet *, struct thread *)); -static int atm_dgram_info __P((caddr_t)); +static int atm_dgram_attach(struct socket *, int, struct thread *); +static int atm_dgram_control(struct socket *, u_long, caddr_t, + struct ifnet *, struct thread *); +static int atm_dgram_info(caddr_t); /* diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h index 7668b60..6ea3ec7 100644 --- a/sys/netatm/atm_var.h +++ b/sys/netatm/atm_var.h @@ -81,126 +81,123 @@ extern struct pr_usrreqs atm_dgram_usrreqs; * Global function declarations */ /* atm_aal5.c */ -int atm_aal5_ctloutput __P((struct socket *, struct sockopt *)); -void atm_aal5_init __P((void)); +int atm_aal5_ctloutput(struct socket *, struct sockopt *); +void atm_aal5_init(void); /* atm_cm.c */ -int atm_cm_connect __P((Atm_endpoint *, void *, Atm_attributes *, - Atm_connection **)); -int atm_cm_listen __P((Atm_endpoint *, void *, Atm_attributes *, - Atm_connection **)); -int atm_cm_addllc __P((Atm_endpoint *, void *, struct attr_llc *, - Atm_connection *, Atm_connection **)); -int atm_cm_addparty __P((Atm_connection *, int, - struct t_atm_sap *)); -int atm_cm_dropparty __P((Atm_connection *, int, - struct t_atm_cause *)); -int atm_cm_release __P((Atm_connection *, struct t_atm_cause *)); -int atm_cm_abort __P((Atm_connvc *, struct t_atm_cause *)); -int atm_cm_incoming __P((struct vccb *, Atm_attributes *)); -void atm_cm_connected __P((Atm_connvc *)); -void atm_cm_cleared __P((Atm_connvc *)); -Atm_connection *atm_cm_match __P((Atm_attributes *, Atm_connection *)); -int atm_cm_cpcs_ctl __P((int, Atm_connection *, void *)); -int atm_cm_cpcs_data __P((Atm_connection *, KBuffer *)); -int atm_cm_saal_ctl __P((int, Atm_connection *, void *)); -int atm_cm_saal_data __P((Atm_connection *, KBuffer *)); -int atm_cm_sscop_ctl __P((int, Atm_connection *, void *, void *)); -int atm_cm_sscop_data __P((Atm_connection *, KBuffer *)); -int atm_endpoint_register __P((Atm_endpoint *)); -int atm_endpoint_deregister __P((Atm_endpoint *)); +int atm_cm_connect(Atm_endpoint *, void *, Atm_attributes *, + Atm_connection **); +int atm_cm_listen(Atm_endpoint *, void *, Atm_attributes *, + Atm_connection **); +int atm_cm_addllc(Atm_endpoint *, void *, struct attr_llc *, + Atm_connection *, Atm_connection **); +int atm_cm_addparty(Atm_connection *, int, struct t_atm_sap *); +int atm_cm_dropparty(Atm_connection *, int, struct t_atm_cause *); +int atm_cm_release(Atm_connection *, struct t_atm_cause *); +int atm_cm_abort(Atm_connvc *, struct t_atm_cause *); +int atm_cm_incoming(struct vccb *, Atm_attributes *); +void atm_cm_connected(Atm_connvc *); +void atm_cm_cleared(Atm_connvc *); +Atm_connection *atm_cm_match(Atm_attributes *, Atm_connection *); +int atm_cm_cpcs_ctl(int, Atm_connection *, void *); +int atm_cm_cpcs_data(Atm_connection *, KBuffer *); +int atm_cm_saal_ctl(int, Atm_connection *, void *); +int atm_cm_saal_data(Atm_connection *, KBuffer *); +int atm_cm_sscop_ctl(int, Atm_connection *, void *, void *); +int atm_cm_sscop_data(Atm_connection *, KBuffer *); +int atm_endpoint_register(Atm_endpoint *); +int atm_endpoint_deregister(Atm_endpoint *); /* atm_device.c */ -int atm_dev_inst __P((struct stack_defn **, Atm_connvc *)); -void atm_dev_lower __P((int, void *, int, int)); -void * atm_dev_alloc __P((u_int, u_int, u_int)); -void atm_dev_free __P((volatile void *)); +int atm_dev_inst(struct stack_defn **, Atm_connvc *); +void atm_dev_lower(int, void *, int, int); +void * atm_dev_alloc(u_int, u_int, u_int); +void atm_dev_free(volatile void *); #if defined(sun4m) -void * atm_dma_map __P((caddr_t, int, int)); -void atm_dma_free __P((caddr_t, int)); +void * atm_dma_map(caddr_t, int, int); +void atm_dma_free(caddr_t, int); #endif -KBuffer * atm_dev_compress __P((KBuffer *)); -Cmn_vcc * atm_dev_vcc_find __P((Cmn_unit *, u_int, u_int, u_int)); -void atm_dev_pdu_print __P((Cmn_unit *, Cmn_vcc *, KBuffer *, - char *)); +KBuffer * atm_dev_compress(KBuffer *); +Cmn_vcc * atm_dev_vcc_find(Cmn_unit *, u_int, u_int, u_int); +void atm_dev_pdu_print(Cmn_unit *, Cmn_vcc *, KBuffer *, char *); /* atm_if.c */ -int atm_physif_register __P((Cmn_unit *, char *, - struct stack_defn *)); -int atm_physif_deregister __P((Cmn_unit *)); -void atm_physif_freenifs __P((struct atm_pif *)); -int atm_netconv_register __P((struct atm_ncm *)); -int atm_netconv_deregister __P((struct atm_ncm *)); -int atm_nif_attach __P((struct atm_nif *)); -void atm_nif_detach __P((struct atm_nif *)); -int atm_nif_setaddr __P((struct atm_nif *, struct ifaddr *)); +int atm_physif_register(Cmn_unit *, char *, + struct stack_defn *); +int atm_physif_deregister(Cmn_unit *); +void atm_physif_freenifs(struct atm_pif *); +int atm_netconv_register(struct atm_ncm *); +int atm_netconv_deregister(struct atm_ncm *); +int atm_nif_attach(struct atm_nif *); +void atm_nif_detach(struct atm_nif *); +int atm_nif_setaddr(struct atm_nif *, struct ifaddr *); #if (defined(BSD) && (BSD >= 199103)) -int atm_ifoutput __P((struct ifnet *, KBuffer *, - struct sockaddr *, struct rtentry *)); +int atm_ifoutput(struct ifnet *, KBuffer *, + struct sockaddr *, struct rtentry *); #else -int atm_ifoutput __P((struct ifnet *, KBuffer *, - struct sockaddr *)); +int atm_ifoutput(struct ifnet *, KBuffer *, + struct sockaddr *); #endif struct atm_pif * - atm_pifname __P((char *)); + atm_pifname(char *); struct atm_nif * - atm_nifname __P((char *)); + atm_nifname(char *); /* atm_proto.c */ #if (defined(__FreeBSD__) && (BSD >= 199506)) -int atm_proto_notsupp1 __P((struct socket *)); -int atm_proto_notsupp2 __P((struct socket *, struct sockaddr *, - struct thread *)); -int atm_proto_notsupp3 __P((struct socket *, struct sockaddr **)); -int atm_proto_notsupp4 __P((struct socket *, int, KBuffer *, - struct sockaddr *, KBuffer *, struct thread *)); +int atm_proto_notsupp1(struct socket *); +int atm_proto_notsupp2(struct socket *, struct sockaddr *, + struct thread *); +int atm_proto_notsupp3(struct socket *, struct sockaddr **); +int atm_proto_notsupp4(struct socket *, int, KBuffer *, + struct sockaddr *, KBuffer *, struct thread *); #endif /* atm_signal.c */ -int atm_sigmgr_register __P((struct sigmgr *)); -int atm_sigmgr_deregister __P((struct sigmgr *)); -int atm_sigmgr_attach __P((struct atm_pif *, u_char)); -int atm_sigmgr_detach __P((struct atm_pif *)); -int atm_stack_register __P((struct stack_defn *)); -int atm_stack_deregister __P((struct stack_defn *)); -int atm_create_stack __P((Atm_connvc *, struct stack_list *, - void (*)__P((int, void *, int, int)) )); +int atm_sigmgr_register(struct sigmgr *); +int atm_sigmgr_deregister(struct sigmgr *); +int atm_sigmgr_attach(struct atm_pif *, u_char); +int atm_sigmgr_detach(struct atm_pif *); +int atm_stack_register(struct stack_defn *); +int atm_stack_deregister(struct stack_defn *); +int atm_create_stack(Atm_connvc *, struct stack_list *, + void (*)(int, void *, int, int) ); /* atm_socket.c */ -int atm_sock_attach __P((struct socket *, u_long, u_long)); -int atm_sock_detach __P((struct socket *)); -int atm_sock_bind __P((struct socket *, struct sockaddr *)); -int atm_sock_listen __P((struct socket *, Atm_endpoint *)); -int atm_sock_connect __P((struct socket *, struct sockaddr *, - Atm_endpoint *)); -int atm_sock_disconnect __P((struct socket *)); -int atm_sock_sockaddr __P((struct socket *, struct sockaddr **)); -int atm_sock_peeraddr __P((struct socket *, struct sockaddr **)); -int atm_sock_setopt __P((struct socket *, struct sockopt *, - Atm_pcb *)); -int atm_sock_getopt __P((struct socket *, struct sockopt *, - Atm_pcb *)); -void atm_sock_connected __P((void *)); -void atm_sock_cleared __P((void *, struct t_atm_cause *)); +int atm_sock_attach(struct socket *, u_long, u_long); +int atm_sock_detach(struct socket *); +int atm_sock_bind(struct socket *, struct sockaddr *); +int atm_sock_listen(struct socket *, Atm_endpoint *); +int atm_sock_connect(struct socket *, struct sockaddr *, + Atm_endpoint *); +int atm_sock_disconnect(struct socket *); +int atm_sock_sockaddr(struct socket *, struct sockaddr **); +int atm_sock_peeraddr(struct socket *, struct sockaddr **); +int atm_sock_setopt(struct socket *, struct sockopt *, + Atm_pcb *); +int atm_sock_getopt(struct socket *, struct sockopt *, + Atm_pcb *); +void atm_sock_connected(void *); +void atm_sock_cleared(void *, struct t_atm_cause *); /* atm_subr.c */ -void atm_initialize __P((void)); -void * atm_allocate __P((struct sp_info *)); -void atm_free __P((void *)); -void atm_release_pool __P((struct sp_info *)); -void atm_timeout __P((struct atm_time *, int, - void (*) __P((struct atm_time *)) )); -int atm_untimeout __P((struct atm_time *)); -int atm_stack_enq __P((int, void (*) __P((int, void *, int, int)), - void *, Atm_connvc *, int, int)); -void atm_stack_drain __P((void)); -void atm_intr __P((void)); -void atm_pdu_print __P((KBuffer *, char *)); +void atm_initialize(void); +void * atm_allocate(struct sp_info *); +void atm_free(void *); +void atm_release_pool(struct sp_info *); +void atm_timeout(struct atm_time *, int, + void (*)(struct atm_time *) ); +int atm_untimeout(struct atm_time *); +int atm_stack_enq(int, void (*)(int, void *, int, int), + void *, Atm_connvc *, int, int); +void atm_stack_drain(void); +void atm_intr(void); +void atm_pdu_print(KBuffer *, char *); /* atm_usrreq.c */ #if (!(defined(__FreeBSD__) && (BSD >= 199506))) -int atm_dgram_usrreq __P((struct socket *, int, KBuffer *, - KBuffer *, KBuffer *)); +int atm_dgram_usrreq(struct socket *, int, KBuffer *, + KBuffer *, KBuffer *); #endif #endif /* _KERNEL */ diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h index f282d40..e633efb 100644 --- a/sys/netipx/ipx.h +++ b/sys/netipx/ipx.h @@ -162,8 +162,8 @@ struct ipx { #include <sys/cdefs.h> __BEGIN_DECLS -struct ipx_addr ipx_addr __P((const char *)); -char *ipx_ntoa __P((struct ipx_addr)); +struct ipx_addr ipx_addr(const char *); +char *ipx_ntoa(struct ipx_addr); __END_DECLS #endif /* !_NETIPX_IPX_H_ */ diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h index 1086735..48a4d08 100644 --- a/sys/netipx/ipx_if.h +++ b/sys/netipx/ipx_if.h @@ -91,7 +91,7 @@ struct ipxip_req { extern struct ifqueue ipxintrq; /* IPX input packet queue */ extern struct ipx_ifaddr *ipx_ifaddr; -struct ipx_ifaddr *ipx_iaonnetof __P((struct ipx_addr *dst)); +struct ipx_ifaddr *ipx_iaonnetof(struct ipx_addr *dst); #endif #endif /* !_NETIPX_IPX_IF_H_ */ diff --git a/sys/netipx/ipx_ip.h b/sys/netipx/ipx_ip.h index 2aeac7b..2eb3c8e 100644 --- a/sys/netipx/ipx_ip.h +++ b/sys/netipx/ipx_ip.h @@ -51,9 +51,9 @@ struct ifnet_en { #ifdef _KERNEL -void ipxip_ctlinput __P((int cmd, struct sockaddr *sa, void *arg)); -void ipxip_input __P((struct mbuf *m, int hlen)); -int ipxip_route __P((struct socket *so, struct sockopt *sopt)); +void ipxip_ctlinput(int cmd, struct sockaddr *sa, void *arg); +void ipxip_input(struct mbuf *m, int hlen); +int ipxip_route(struct socket *so, struct sockopt *sopt); #endif diff --git a/sys/netipx/ipx_pcb.h b/sys/netipx/ipx_pcb.h index 482f812..cd1bfe5 100644 --- a/sys/netipx/ipx_pcb.h +++ b/sys/netipx/ipx_pcb.h @@ -82,20 +82,20 @@ struct ipxpcb { #ifdef _KERNEL extern struct ipxpcb ipxpcb; /* head of list */ -int ipx_pcballoc __P((struct socket *so, struct ipxpcb *head, - struct thread *p)); -int ipx_pcbbind __P((struct ipxpcb *ipxp, struct sockaddr *nam, - struct thread *p)); -int ipx_pcbconnect __P((struct ipxpcb *ipxp, struct sockaddr *nam, - struct thread *p)); -void ipx_pcbdetach __P((struct ipxpcb *ipxp)); -void ipx_pcbdisconnect __P((struct ipxpcb *ipxp)); +int ipx_pcballoc(struct socket *so, struct ipxpcb *head, + struct thread *p); +int ipx_pcbbind(struct ipxpcb *ipxp, struct sockaddr *nam, + struct thread *p); +int ipx_pcbconnect(struct ipxpcb *ipxp, struct sockaddr *nam, + struct thread *p); +void ipx_pcbdetach(struct ipxpcb *ipxp); +void ipx_pcbdisconnect(struct ipxpcb *ipxp); struct ipxpcb * - ipx_pcblookup __P((struct ipx_addr *faddr, int lport, int wildp)); -void ipx_pcbnotify __P((struct ipx_addr *dst, int errno, - void (*notify)(struct ipxpcb *), long param)); -void ipx_setpeeraddr __P((struct ipxpcb *ipxp, struct sockaddr **nam)); -void ipx_setsockaddr __P((struct ipxpcb *ipxp, struct sockaddr **nam)); + ipx_pcblookup(struct ipx_addr *faddr, int lport, int wildp); +void ipx_pcbnotify(struct ipx_addr *dst, int errno, + void (*notify)(struct ipxpcb *), long param); +void ipx_setpeeraddr(struct ipxpcb *ipxp, struct sockaddr **nam); +void ipx_setsockaddr(struct ipxpcb *ipxp, struct sockaddr **nam); #endif /* _KERNEL */ #endif /* !_NETIPX_IPX_PCB_H_ */ diff --git a/sys/netipx/ipx_var.h b/sys/netipx/ipx_var.h index 7e7b5ef..de67691 100644 --- a/sys/netipx/ipx_var.h +++ b/sys/netipx/ipx_var.h @@ -86,22 +86,22 @@ struct sockaddr; struct socket; struct sockopt; -void ipx_abort __P((struct ipxpcb *ipxp)); -u_short ipx_cksum __P((struct mbuf *m, int len)); -int ipx_control __P((struct socket *so, u_long cmd, caddr_t data, - struct ifnet *ifp, struct thread *td)); -void ipx_ctlinput __P((int cmd, struct sockaddr *arg_as_sa, void *dummy)); -int ipx_ctloutput __P((struct socket *so, struct sockopt *sopt)); -void ipx_drop __P((struct ipxpcb *ipxp, int errno)); -void ipx_init __P((void)); -void ipx_input __P((struct mbuf *m, struct ipxpcb *ipxp)); -void ipxintr __P((void)); -int ipx_outputfl __P((struct mbuf *m0, struct route *ro, int flags)); -int ipx_output_type20 __P((struct mbuf *)); -int ipx_peeraddr __P((struct socket *so, struct sockaddr **nam)); -void ipx_printhost __P((struct ipx_addr *addr)); -int ipx_sockaddr __P((struct socket *so, struct sockaddr **nam)); -void ipx_watch_output __P((struct mbuf *m, struct ifnet *ifp)); +void ipx_abort(struct ipxpcb *ipxp); +u_short ipx_cksum(struct mbuf *m, int len); +int ipx_control(struct socket *so, u_long cmd, caddr_t data, + struct ifnet *ifp, struct thread *td); +void ipx_ctlinput(int cmd, struct sockaddr *arg_as_sa, void *dummy); +int ipx_ctloutput(struct socket *so, struct sockopt *sopt); +void ipx_drop(struct ipxpcb *ipxp, int errno); +void ipx_init(void); +void ipx_input(struct mbuf *m, struct ipxpcb *ipxp); +void ipxintr(void); +int ipx_outputfl(struct mbuf *m0, struct route *ro, int flags); +int ipx_output_type20(struct mbuf *); +int ipx_peeraddr(struct socket *so, struct sockaddr **nam); +void ipx_printhost(struct ipx_addr *addr); +int ipx_sockaddr(struct socket *so, struct sockaddr **nam); +void ipx_watch_output(struct mbuf *m, struct ifnet *ifp); #endif /* _KERNEL */ diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h index 0cf9829..e496aec 100644 --- a/sys/netipx/spx.h +++ b/sys/netipx/spx.h @@ -172,12 +172,12 @@ struct spxpcb { extern struct pr_usrreqs spx_usrreqs; extern struct pr_usrreqs spx_usrreq_sps; -void spx_ctlinput __P((int cmd, struct sockaddr *arg_as_sa, void *dummy)); -int spx_ctloutput __P((struct socket *so, struct sockopt *sopt)); -void spx_fasttimo __P((void)); -void spx_init __P((void)); -void spx_input __P((struct mbuf *m, struct ipxpcb *ipxp)); -void spx_slowtimo __P((void)); +void spx_ctlinput(int cmd, struct sockaddr *arg_as_sa, void *dummy); +int spx_ctloutput(struct socket *so, struct sockopt *sopt); +void spx_fasttimo(void); +void spx_init(void); +void spx_input(struct mbuf *m, struct ipxpcb *ipxp); +void spx_slowtimo(void); #endif /* _KERNEL */ diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h index e602bb9d..b60618c 100644 --- a/sys/netipx/spx_debug.h +++ b/sys/netipx/spx_debug.h @@ -72,8 +72,8 @@ extern char *prurequests[]; extern char *sanames[]; extern char *tcpstates[]; -void spx_trace __P((int act, int ostate, struct spxpcb *sp, struct spx *si, - int req)); +void spx_trace(int act, int ostate, struct spxpcb *sp, struct spx *si, + int req); #endif #endif /* !_NETIPX_SPX_DEBUG_H_ */ diff --git a/sys/netkey/key.c b/sys/netkey/key.c index 91080d2..849a91d 100644 --- a/sys/netkey/key.c +++ b/sys/netkey/key.c @@ -364,60 +364,60 @@ struct sadb_msghdr { int extlen[SADB_EXT_MAX + 1]; }; -static struct secasvar *key_allocsa_policy __P((struct secasindex *)); -static void key_freesp_so __P((struct secpolicy **)); -static struct secasvar *key_do_allocsa_policy __P((struct secashead *, u_int)); -static void key_delsp __P((struct secpolicy *)); -static struct secpolicy *key_getsp __P((struct secpolicyindex *)); -static struct secpolicy *key_getspbyid __P((u_int32_t)); -static u_int32_t key_newreqid __P((void)); -static struct mbuf *key_gather_mbuf __P((struct mbuf *, - const struct sadb_msghdr *, int, int, ...)); -static int key_spdadd __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static u_int32_t key_getnewspid __P((void)); -static int key_spddelete __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_spddelete2 __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_spdget __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_spdflush __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_spddump __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static struct mbuf *key_setdumpsp __P((struct secpolicy *, - u_int8_t, u_int32_t, u_int32_t)); -static u_int key_getspreqmsglen __P((struct secpolicy *)); -static int key_spdexpire __P((struct secpolicy *)); -static struct secashead *key_newsah __P((struct secasindex *)); -static void key_delsah __P((struct secashead *)); -static struct secasvar *key_newsav __P((struct mbuf *, - const struct sadb_msghdr *, struct secashead *, int *)); -static void key_delsav __P((struct secasvar *)); -static struct secashead *key_getsah __P((struct secasindex *)); -static struct secasvar *key_checkspidup __P((struct secasindex *, u_int32_t)); -static struct secasvar *key_getsavbyspi __P((struct secashead *, u_int32_t)); -static int key_setsaval __P((struct secasvar *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_mature __P((struct secasvar *)); -static struct mbuf *key_setdumpsa __P((struct secasvar *, u_int8_t, - u_int8_t, u_int32_t, u_int32_t)); -static struct mbuf *key_setsadbmsg __P((u_int8_t, u_int16_t, u_int8_t, - u_int32_t, pid_t, u_int16_t)); -static struct mbuf *key_setsadbsa __P((struct secasvar *)); -static struct mbuf *key_setsadbaddr __P((u_int16_t, - struct sockaddr *, u_int8_t, u_int16_t)); +static struct secasvar *key_allocsa_policy(struct secasindex *); +static void key_freesp_so(struct secpolicy **); +static struct secasvar *key_do_allocsa_policy(struct secashead *, u_int); +static void key_delsp(struct secpolicy *); +static struct secpolicy *key_getsp(struct secpolicyindex *); +static struct secpolicy *key_getspbyid(u_int32_t); +static u_int32_t key_newreqid(void); +static struct mbuf *key_gather_mbuf(struct mbuf *, + const struct sadb_msghdr *, int, int, ...); +static int key_spdadd(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static u_int32_t key_getnewspid(void); +static int key_spddelete(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_spddelete2(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_spdget(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_spdflush(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_spddump(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static struct mbuf *key_setdumpsp(struct secpolicy *, + u_int8_t, u_int32_t, u_int32_t); +static u_int key_getspreqmsglen(struct secpolicy *); +static int key_spdexpire(struct secpolicy *); +static struct secashead *key_newsah(struct secasindex *); +static void key_delsah(struct secashead *); +static struct secasvar *key_newsav(struct mbuf *, + const struct sadb_msghdr *, struct secashead *, int *); +static void key_delsav(struct secasvar *); +static struct secashead *key_getsah(struct secasindex *); +static struct secasvar *key_checkspidup(struct secasindex *, u_int32_t); +static struct secasvar *key_getsavbyspi(struct secashead *, u_int32_t); +static int key_setsaval(struct secasvar *, struct mbuf *, + const struct sadb_msghdr *); +static int key_mature(struct secasvar *); +static struct mbuf *key_setdumpsa(struct secasvar *, u_int8_t, + u_int8_t, u_int32_t, u_int32_t); +static struct mbuf *key_setsadbmsg(u_int8_t, u_int16_t, u_int8_t, + u_int32_t, pid_t, u_int16_t); +static struct mbuf *key_setsadbsa(struct secasvar *); +static struct mbuf *key_setsadbaddr(u_int16_t, + struct sockaddr *, u_int8_t, u_int16_t); #if 0 -static struct mbuf *key_setsadbident __P((u_int16_t, u_int16_t, caddr_t, - int, u_int64_t)); +static struct mbuf *key_setsadbident(u_int16_t, u_int16_t, caddr_t, + int, u_int64_t); #endif -static struct mbuf *key_setsadbxsa2 __P((u_int8_t, u_int32_t, u_int32_t)); -static struct mbuf *key_setsadbxpolicy __P((u_int16_t, u_int8_t, - u_int32_t)); -static void *key_newbuf __P((const void *, u_int)); +static struct mbuf *key_setsadbxsa2(u_int8_t, u_int32_t, u_int32_t); +static struct mbuf *key_setsadbxpolicy(u_int16_t, u_int8_t, + u_int32_t); +static void *key_newbuf(const void *, u_int); #ifdef INET6 -static int key_ismyaddr6 __P((struct sockaddr_in6 *)); +static int key_ismyaddr6(struct sockaddr_in6 *); #endif /* flags for key_cmpsaidx() */ @@ -426,74 +426,74 @@ static int key_ismyaddr6 __P((struct sockaddr_in6 *)); #define CMP_REQID 3 /* additionally HEAD, reaid. */ #define CMP_EXACTLY 4 /* all elements. */ static int key_cmpsaidx - __P((struct secasindex *, struct secasindex *, int)); + (struct secasindex *, struct secasindex *, int); static int key_cmpspidx_exactly - __P((struct secpolicyindex *, struct secpolicyindex *)); + (struct secpolicyindex *, struct secpolicyindex *); static int key_cmpspidx_withmask - __P((struct secpolicyindex *, struct secpolicyindex *)); -static int key_sockaddrcmp __P((struct sockaddr *, struct sockaddr *, int)); -static int key_bbcmp __P((caddr_t, caddr_t, u_int)); -static void key_srandom __P((void)); -static u_int16_t key_satype2proto __P((u_int8_t)); -static u_int8_t key_proto2satype __P((u_int16_t)); - -static int key_getspi __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static u_int32_t key_do_getnewspi __P((struct sadb_spirange *, - struct secasindex *)); -static int key_update __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); + (struct secpolicyindex *, struct secpolicyindex *); +static int key_sockaddrcmp(struct sockaddr *, struct sockaddr *, int); +static int key_bbcmp(caddr_t, caddr_t, u_int); +static void key_srandom(void); +static u_int16_t key_satype2proto(u_int8_t); +static u_int8_t key_proto2satype(u_int16_t); + +static int key_getspi(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static u_int32_t key_do_getnewspi(struct sadb_spirange *, + struct secasindex *); +static int key_update(struct socket *, struct mbuf *, + const struct sadb_msghdr *); #ifdef IPSEC_DOSEQCHECK -static struct secasvar *key_getsavbyseq __P((struct secashead *, u_int32_t)); +static struct secasvar *key_getsavbyseq(struct secashead *, u_int32_t); #endif -static int key_add __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_setident __P((struct secashead *, struct mbuf *, - const struct sadb_msghdr *)); -static struct mbuf *key_getmsgbuf_x1 __P((struct mbuf *, - const struct sadb_msghdr *)); -static int key_delete __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_get __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); - -static void key_getcomb_setlifetime __P((struct sadb_comb *)); +static int key_add(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_setident(struct secashead *, struct mbuf *, + const struct sadb_msghdr *); +static struct mbuf *key_getmsgbuf_x1(struct mbuf *, + const struct sadb_msghdr *); +static int key_delete(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_get(struct socket *, struct mbuf *, + const struct sadb_msghdr *); + +static void key_getcomb_setlifetime(struct sadb_comb *); #ifdef IPSEC_ESP -static struct mbuf *key_getcomb_esp __P((void)); +static struct mbuf *key_getcomb_esp(void); #endif -static struct mbuf *key_getcomb_ah __P((void)); -static struct mbuf *key_getcomb_ipcomp __P((void)); -static struct mbuf *key_getprop __P((const struct secasindex *)); +static struct mbuf *key_getcomb_ah(void); +static struct mbuf *key_getcomb_ipcomp(void); +static struct mbuf *key_getprop(const struct secasindex *); -static int key_acquire __P((struct secasindex *, struct secpolicy *)); +static int key_acquire(struct secasindex *, struct secpolicy *); #ifndef IPSEC_NONBLOCK_ACQUIRE -static struct secacq *key_newacq __P((struct secasindex *)); -static struct secacq *key_getacq __P((struct secasindex *)); -static struct secacq *key_getacqbyseq __P((u_int32_t)); +static struct secacq *key_newacq(struct secasindex *); +static struct secacq *key_getacq(struct secasindex *); +static struct secacq *key_getacqbyseq(u_int32_t); #endif -static struct secspacq *key_newspacq __P((struct secpolicyindex *)); -static struct secspacq *key_getspacq __P((struct secpolicyindex *)); -static int key_acquire2 __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_register __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_expire __P((struct secasvar *)); -static int key_flush __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_dump __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_promisc __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)); -static int key_senderror __P((struct socket *, struct mbuf *, int)); -static int key_validate_ext __P((const struct sadb_ext *, int)); -static int key_align __P((struct mbuf *, struct sadb_msghdr *)); +static struct secspacq *key_newspacq(struct secpolicyindex *); +static struct secspacq *key_getspacq(struct secpolicyindex *); +static int key_acquire2(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_register(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_expire(struct secasvar *); +static int key_flush(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_dump(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_promisc(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_senderror(struct socket *, struct mbuf *, int); +static int key_validate_ext(const struct sadb_ext *, int); +static int key_align(struct mbuf *, struct sadb_msghdr *); #if 0 -static const char *key_getfqdn __P((void)); -static const char *key_getuserfqdn __P((void)); +static const char *key_getfqdn(void); +static const char *key_getuserfqdn(void); #endif -static void key_sa_chgstate __P((struct secasvar *, u_int8_t)); -static struct mbuf *key_alloc_mbuf __P((int)); +static void key_sa_chgstate(struct secasvar *, u_int8_t); +static struct mbuf *key_alloc_mbuf(int); /* %%% IPsec policy management */ /* @@ -5210,8 +5210,8 @@ key_getmsgbuf_x1(m, mhp) return n; } -static int key_delete_all __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *, u_int16_t)); +static int key_delete_all(struct socket *, struct mbuf *, + const struct sadb_msghdr *, u_int16_t); /* * SADB_DELETE processing @@ -6718,8 +6718,8 @@ key_promisc(so, m, mhp) } } -static int (*key_typesw[]) __P((struct socket *, struct mbuf *, - const struct sadb_msghdr *)) = { +static int (*key_typesw[])(struct socket *, struct mbuf *, + const struct sadb_msghdr *) = { NULL, /* SADB_RESERVED */ key_getspi, /* SADB_GETSPI */ key_update, /* SADB_UPDATE */ diff --git a/sys/netkey/key.h b/sys/netkey/key.h index 20bcaa0..ed03ba4 100644 --- a/sys/netkey/key.h +++ b/sys/netkey/key.h @@ -46,33 +46,30 @@ struct socket; struct sadb_msg; struct sadb_x_policy; -extern struct secpolicy *key_allocsp __P((struct secpolicyindex *, u_int)); -extern struct secpolicy *key_gettunnel __P((struct sockaddr *, - struct sockaddr *, struct sockaddr *, struct sockaddr *)); +extern struct secpolicy *key_allocsp(struct secpolicyindex *, u_int); +extern struct secpolicy *key_gettunnel(struct sockaddr *, + struct sockaddr *, struct sockaddr *, struct sockaddr *); extern int key_checkrequest - __P((struct ipsecrequest *isr, struct secasindex *)); -extern struct secasvar *key_allocsa __P((u_int, caddr_t, caddr_t, - u_int, u_int32_t)); -extern void key_freesp __P((struct secpolicy *)); -extern void key_freeso __P((struct socket *)); -extern void key_freesav __P((struct secasvar *)); -extern struct secpolicy *key_newsp __P((void)); -extern struct secpolicy *key_msg2sp __P((struct sadb_x_policy *, - size_t, int *)); -extern struct mbuf *key_sp2msg __P((struct secpolicy *)); -extern int key_ismyaddr __P((struct sockaddr *)); -extern int key_spdacquire __P((struct secpolicy *)); -extern void key_timehandler __P((void)); -extern u_long key_random __P((void)); -extern void key_randomfill __P((void *, size_t)); -extern void key_freereg __P((struct socket *)); -extern int key_parse __P((struct mbuf *, struct socket *)); -extern void key_init __P((void)); -extern int key_checktunnelsanity __P((struct secasvar *, u_int, - caddr_t, caddr_t)); -extern void key_sa_recordxfer __P((struct secasvar *, struct mbuf *)); -extern void key_sa_routechange __P((struct sockaddr *)); -extern void key_sa_stir_iv __P((struct secasvar *)); + (struct ipsecrequest *isr, struct secasindex *); +extern struct secasvar *key_allocsa(u_int, caddr_t, caddr_t, u_int, u_int32_t); +extern void key_freesp(struct secpolicy *); +extern void key_freeso(struct socket *); +extern void key_freesav(struct secasvar *); +extern struct secpolicy *key_newsp(void); +extern struct secpolicy *key_msg2sp(struct sadb_x_policy *, size_t, int *); +extern struct mbuf *key_sp2msg(struct secpolicy *); +extern int key_ismyaddr(struct sockaddr *); +extern int key_spdacquire(struct secpolicy *); +extern void key_timehandler(void); +extern u_long key_random(void); +extern void key_randomfill(void *, size_t); +extern void key_freereg(struct socket *); +extern int key_parse(struct mbuf *, struct socket *); +extern void key_init(void); +extern int key_checktunnelsanity(struct secasvar *, u_int, caddr_t, caddr_t); +extern void key_sa_recordxfer(struct secasvar *, struct mbuf *); +extern void key_sa_routechange(struct sockaddr *); +extern void key_sa_stir_iv(struct secasvar *); #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_SECA); diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c index 816d57d..8e7c5d9 100644 --- a/sys/netkey/key_debug.c +++ b/sys/netkey/key_debug.c @@ -59,17 +59,17 @@ #include <stdlib.h> #endif /* !_KERNEL */ -static void kdebug_sadb_prop __P((struct sadb_ext *)); -static void kdebug_sadb_identity __P((struct sadb_ext *)); -static void kdebug_sadb_supported __P((struct sadb_ext *)); -static void kdebug_sadb_lifetime __P((struct sadb_ext *)); -static void kdebug_sadb_sa __P((struct sadb_ext *)); -static void kdebug_sadb_address __P((struct sadb_ext *)); -static void kdebug_sadb_key __P((struct sadb_ext *)); -static void kdebug_sadb_x_sa2 __P((struct sadb_ext *)); +static void kdebug_sadb_prop(struct sadb_ext *); +static void kdebug_sadb_identity(struct sadb_ext *); +static void kdebug_sadb_supported(struct sadb_ext *); +static void kdebug_sadb_lifetime(struct sadb_ext *); +static void kdebug_sadb_sa(struct sadb_ext *); +static void kdebug_sadb_address(struct sadb_ext *); +static void kdebug_sadb_key(struct sadb_ext *); +static void kdebug_sadb_x_sa2(struct sadb_ext *); #ifdef _KERNEL -static void kdebug_secreplay __P((struct secreplay *)); +static void kdebug_secreplay(struct secreplay *); #endif #ifndef _KERNEL diff --git a/sys/netkey/key_debug.h b/sys/netkey/key_debug.h index eaa9dd0..9284255 100644 --- a/sys/netkey/key_debug.h +++ b/sys/netkey/key_debug.h @@ -61,8 +61,8 @@ extern u_int32_t key_debug_level; struct sadb_msg; struct sadb_ext; -extern void kdebug_sadb __P((struct sadb_msg *)); -extern void kdebug_sadb_x_policy __P((struct sadb_ext *)); +extern void kdebug_sadb(struct sadb_msg *); +extern void kdebug_sadb_x_policy(struct sadb_ext *); #ifdef _KERNEL struct secpolicy; @@ -71,18 +71,18 @@ struct secasindex; struct secasvar; struct secreplay; struct mbuf; -extern void kdebug_secpolicy __P((struct secpolicy *)); -extern void kdebug_secpolicyindex __P((struct secpolicyindex *)); -extern void kdebug_secasindex __P((struct secasindex *)); -extern void kdebug_secasv __P((struct secasvar *)); -extern void kdebug_mbufhdr __P((struct mbuf *)); -extern void kdebug_mbuf __P((struct mbuf *)); +extern void kdebug_secpolicy(struct secpolicy *); +extern void kdebug_secpolicyindex(struct secpolicyindex *); +extern void kdebug_secasindex(struct secasindex *); +extern void kdebug_secasv(struct secasvar *); +extern void kdebug_mbufhdr(struct mbuf *); +extern void kdebug_mbuf(struct mbuf *); #endif /*_KERNEL*/ struct sockaddr; -extern void kdebug_sockaddr __P((struct sockaddr *)); +extern void kdebug_sockaddr(struct sockaddr *); -extern void ipsec_hexdump __P((caddr_t, int)); -extern void ipsec_bindump __P((caddr_t, int)); +extern void ipsec_hexdump(caddr_t, int); +extern void ipsec_bindump(caddr_t, int); #endif /* _NETKEY_KEY_DEBUG_H_ */ diff --git a/sys/netkey/keydb.c b/sys/netkey/keydb.c index dd1fb17..22a269d 100644 --- a/sys/netkey/keydb.c +++ b/sys/netkey/keydb.c @@ -55,7 +55,7 @@ MALLOC_DEFINE(M_SECA, "key mgmt", "security associations, key management"); -static void keydb_delsecasvar __P((struct secasvar *)); +static void keydb_delsecasvar(struct secasvar *); /* * secpolicy management diff --git a/sys/netkey/keydb.h b/sys/netkey/keydb.h index 1aff5be..8b36e56 100644 --- a/sys/netkey/keydb.h +++ b/sys/netkey/keydb.h @@ -139,21 +139,21 @@ struct key_cb { }; /* secpolicy */ -extern struct secpolicy *keydb_newsecpolicy __P((void)); -extern void keydb_delsecpolicy __P((struct secpolicy *)); +extern struct secpolicy *keydb_newsecpolicy(void); +extern void keydb_delsecpolicy(struct secpolicy *); /* secashead */ -extern struct secashead *keydb_newsecashead __P((void)); -extern void keydb_delsecashead __P((struct secashead *)); +extern struct secashead *keydb_newsecashead(void); +extern void keydb_delsecashead(struct secashead *); /* secasvar */ -extern struct secasvar *keydb_newsecasvar __P((void)); -extern void keydb_refsecasvar __P((struct secasvar *)); -extern void keydb_freesecasvar __P((struct secasvar *)); +extern struct secasvar *keydb_newsecasvar(void); +extern void keydb_refsecasvar(struct secasvar *); +extern void keydb_freesecasvar(struct secasvar *); /* secreplay */ -extern struct secreplay *keydb_newsecreplay __P((size_t)); -extern void keydb_delsecreplay __P((struct secreplay *)); +extern struct secreplay *keydb_newsecreplay(size_t); +extern void keydb_delsecreplay(struct secreplay *); /* secreg */ -extern struct secreg *keydb_newsecreg __P((void)); -extern void keydb_delsecreg __P((struct secreg *)); +extern struct secreg *keydb_newsecreg(void); +extern void keydb_delsecreg(struct secreg *); #endif /* _KERNEL */ diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c index 8467b87..6d00e48 100644 --- a/sys/netkey/keysock.c +++ b/sys/netkey/keysock.c @@ -63,7 +63,7 @@ struct sockaddr key_dst = { 2, PF_KEY, }; struct sockaddr key_src = { 2, PF_KEY, }; -static int key_sendup0 __P((struct rawcb *, struct mbuf *, int)); +static int key_sendup0(struct rawcb *, struct mbuf *, int); struct pfkeystat pfkeystat; diff --git a/sys/netkey/keysock.h b/sys/netkey/keysock.h index 5eed3eb..8d439b9 100644 --- a/sys/netkey/keysock.h +++ b/sys/netkey/keysock.h @@ -71,12 +71,12 @@ struct keycb { extern struct pfkeystat pfkeystat; -extern int key_output __P((struct mbuf *, ...)); -extern int key_usrreq __P((struct socket *, - int, struct mbuf *, struct mbuf *, struct mbuf *)); +extern int key_output(struct mbuf *, ...); +extern int key_usrreq(struct socket *, + int, struct mbuf *, struct mbuf *, struct mbuf *); -extern int key_sendup __P((struct socket *, struct sadb_msg *, u_int, int)); -extern int key_sendup_mbuf __P((struct socket *, struct mbuf *, int)); +extern int key_sendup(struct socket *, struct sadb_msg *, u_int, int); +extern int key_sendup_mbuf(struct socket *, struct mbuf *, int); #endif /* _KERNEL */ #endif /*_NETKEY_KEYSOCK_H_*/ diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c index 12465c1..1e9da08 100644 --- a/sys/netnatm/natm.c +++ b/sys/netnatm/natm.c @@ -69,22 +69,19 @@ static u_long natm0_recvspace = 16*1024; /* * FreeBSD new usrreqs supersedes pr_usrreq. */ -static int natm_usr_attach __P((struct socket *, int, d_thread_t *)); -static int natm_usr_detach __P((struct socket *)); -static int natm_usr_connect __P((struct socket *, struct sockaddr *, - d_thread_t *)); -static int natm_usr_disconnect __P((struct socket *)); -static int natm_usr_shutdown __P((struct socket *)); -static int natm_usr_send __P((struct socket *, int, struct mbuf *, - struct sockaddr *, struct mbuf *, - d_thread_t *)); -static int natm_usr_peeraddr __P((struct socket *, struct sockaddr **)); -static int natm_usr_control __P((struct socket *, u_long, caddr_t, - struct ifnet *, d_thread_t *)); -static int natm_usr_abort __P((struct socket *)); -static int natm_usr_bind __P((struct socket *, struct sockaddr *, - d_thread_t *)); -static int natm_usr_sockaddr __P((struct socket *, struct sockaddr **)); +static int natm_usr_attach(struct socket *, int, d_thread_t *); +static int natm_usr_detach(struct socket *); +static int natm_usr_connect(struct socket *, struct sockaddr *, d_thread_t *); +static int natm_usr_disconnect(struct socket *); +static int natm_usr_shutdown(struct socket *); +static int natm_usr_send(struct socket *, int, struct mbuf *, + struct sockaddr *, struct mbuf *, d_thread_t *); +static int natm_usr_peeraddr(struct socket *, struct sockaddr **); +static int natm_usr_control(struct socket *, u_long, caddr_t, + struct ifnet *, d_thread_t *); +static int natm_usr_abort(struct socket *); +static int natm_usr_bind(struct socket *, struct sockaddr *, d_thread_t *); +static int natm_usr_sockaddr(struct socket *, struct sockaddr **); static int natm_usr_attach(struct socket *so, int proto, d_thread_t *p) diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h index 431eb35..b695006 100644 --- a/sys/netnatm/natm.h +++ b/sys/netnatm/natm.h @@ -130,14 +130,14 @@ struct atm_rawioctl { /* external functions */ /* natm_pcb.c */ -struct natmpcb *npcb_alloc __P((int)); -void npcb_free __P((struct natmpcb *, int)); -struct natmpcb *npcb_add __P((struct natmpcb *, struct ifnet *, int, int)); +struct natmpcb *npcb_alloc(int); +void npcb_free(struct natmpcb *, int); +struct natmpcb *npcb_add(struct natmpcb *, struct ifnet *, int, int); /* natm.c */ #if defined(__NetBSD__) || defined(__OpenBSD__) -int natm_usrreq __P((struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *, struct proc *)); +int natm_usrreq(struct socket *, int, struct mbuf *, + struct mbuf *, struct mbuf *, struct proc *); #elif defined(__FreeBSD__) #if __FreeBSD__ > 2 /* @@ -147,12 +147,12 @@ int natm_usrreq __P((struct socket *, int, struct mbuf *, #define FREEBSD_USRREQS extern struct pr_usrreqs natm_usrreqs; #else /* !( __FreeBSD__ > 2) */ -int natm_usrreq __P((struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *)); +int natm_usrreq(struct socket *, int, struct mbuf *, + struct mbuf *, struct mbuf *); #endif /* !( __FreeBSD__ > 2) */ #endif -int natm0_sysctl __P((int *, u_int, void *, size_t *, void *, size_t)); -int natm5_sysctl __P((int *, u_int, void *, size_t *, void *, size_t)); -void natmintr __P((void)); +int natm0_sysctl(int *, u_int, void *, size_t *, void *, size_t); +int natm5_sysctl(int *, u_int, void *, size_t *, void *, size_t); +void natmintr(void); #endif diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c index ccb253a..7016e33 100644 --- a/sys/netnatm/natm_pcb.c +++ b/sys/netnatm/natm_pcb.c @@ -169,7 +169,7 @@ done: #ifdef DDB -int npcb_dump __P((void)); +int npcb_dump(void); int npcb_dump() diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c index 3843f81..6222799 100644 --- a/sys/netnatm/natm_proto.c +++ b/sys/netnatm/natm_proto.c @@ -54,7 +54,7 @@ extern struct domain natmdomain; -static void natm_init __P((void)); +static void natm_init(void); static struct protosw natmsw[] = { { SOCK_STREAM, &natmdomain, PROTO_NATMAAL5, PR_CONNREQUIRED, diff --git a/sys/netns/ns.h b/sys/netns/ns.h index 3ede3b2..4138849 100644 --- a/sys/netns/ns.h +++ b/sys/netns/ns.h @@ -145,8 +145,8 @@ u_short ns_cksum(); #include <sys/cdefs.h> __BEGIN_DECLS -extern struct ns_addr ns_addr __P((const char *)); -extern char *ns_ntoa __P((struct ns_addr)); +extern struct ns_addr ns_addr(const char *); +extern char *ns_ntoa(struct ns_addr); __END_DECLS #endif diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h index e5eb4ef..07cd9f2 100644 --- a/sys/netns/ns_if.h +++ b/sys/netns/ns_if.h @@ -82,7 +82,7 @@ struct nsip_req { #ifdef _KERNEL struct ns_ifaddr *ns_ifaddr; struct ns_ifaddr *ns_iaonnetof(); -void nsintr __P((void)); +void nsintr(void); struct ifqueue nsintrq; /* XNS input packet queue */ #endif |
