diff options
Diffstat (limited to 'usr.sbin/rpcbind')
-rw-r--r-- | usr.sbin/rpcbind/check_bound.c | 2 | ||||
-rw-r--r-- | usr.sbin/rpcbind/pmap_svc.c | 10 | ||||
-rw-r--r-- | usr.sbin/rpcbind/rpcb_svc.c | 10 | ||||
-rw-r--r-- | usr.sbin/rpcbind/rpcb_svc_4.c | 14 | ||||
-rw-r--r-- | usr.sbin/rpcbind/rpcb_svc_com.c | 46 | ||||
-rw-r--r-- | usr.sbin/rpcbind/rpcbind.c | 12 | ||||
-rw-r--r-- | usr.sbin/rpcbind/rpcbind.h | 98 | ||||
-rw-r--r-- | usr.sbin/rpcbind/util.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpcbind/warmstart.c | 4 |
9 files changed, 100 insertions, 100 deletions
diff --git a/usr.sbin/rpcbind/check_bound.c b/usr.sbin/rpcbind/check_bound.c index 192c9ca..03f70b5 100644 --- a/usr.sbin/rpcbind/check_bound.c +++ b/usr.sbin/rpcbind/check_bound.c @@ -71,7 +71,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */ static struct fdlist *fdtail; static char *nullstring = ""; -static bool_t check_bound __P((struct fdlist *, char *uaddr)); +static bool_t check_bound(struct fdlist *, char *uaddr); /* * Returns 1 if the given address is bound for the given addr & transport diff --git a/usr.sbin/rpcbind/pmap_svc.c b/usr.sbin/rpcbind/pmap_svc.c index d74b369..5df3097 100644 --- a/usr.sbin/rpcbind/pmap_svc.c +++ b/usr.sbin/rpcbind/pmap_svc.c @@ -59,11 +59,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro"; #endif #include "rpcbind.h" -static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t, - rpcprot_t)); -static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long)); -static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *)); -static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *)); +static struct pmaplist *find_service_pmap(rpcprog_t, rpcvers_t, + rpcprot_t); +static bool_t pmapproc_change(struct svc_req *, SVCXPRT *, u_long); +static bool_t pmapproc_getport(struct svc_req *, SVCXPRT *); +static bool_t pmapproc_dump(struct svc_req *, SVCXPRT *); /* * Called for all the version 2 inquiries. diff --git a/usr.sbin/rpcbind/rpcb_svc.c b/usr.sbin/rpcbind/rpcb_svc.c index dc3cf05..9ed05347 100644 --- a/usr.sbin/rpcbind/rpcb_svc.c +++ b/usr.sbin/rpcbind/rpcb_svc.c @@ -53,10 +53,10 @@ #include "rpcbind.h" -static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *, - rpcvers_t)); -static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *, - rpcvers_t)); +static void *rpcbproc_getaddr_3_local(void *, struct svc_req *, SVCXPRT *, + rpcvers_t); +static void *rpcbproc_dump_3_local(void *, struct svc_req *, SVCXPRT *, + rpcvers_t); /* * Called by svc_getreqset. There is a separate server handle for @@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp) } argument; char *result; xdrproc_t xdr_argument, xdr_result; - void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); + void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t); rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc); diff --git a/usr.sbin/rpcbind/rpcb_svc_4.c b/usr.sbin/rpcbind/rpcb_svc_4.c index 8e2ed10..86bfc08 100644 --- a/usr.sbin/rpcbind/rpcb_svc_4.c +++ b/usr.sbin/rpcbind/rpcb_svc_4.c @@ -54,13 +54,13 @@ #include <stdlib.h> #include "rpcbind.h" -static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, - rpcvers_t)); -static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); +static void *rpcbproc_getaddr_4_local(void *, struct svc_req *, SVCXPRT *, + rpcvers_t); +static void *rpcbproc_getversaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); static void *rpcbproc_getaddrlist_4_local - __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *)); -static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); + (void *, struct svc_req *, SVCXPRT *, rpcvers_t); +static void free_rpcb_entry_list(rpcb_entry_list_ptr *); +static void *rpcbproc_dump_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); /* * Called by svc_getreqset. There is a separate server handle for @@ -78,7 +78,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp) } argument; char *result; xdrproc_t xdr_argument, xdr_result; - void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); + void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t); rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc); diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c index 0a72b66..ab7c8ff 100644 --- a/usr.sbin/rpcbind/rpcb_svc_com.c +++ b/usr.sbin/rpcbind/rpcb_svc_com.c @@ -92,29 +92,29 @@ struct finfo { static struct finfo FINFO[NFORWARD]; -static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *)); -static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *)); -static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *)); -static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *)); -static int find_rmtcallfd_by_netid __P((char *)); -static SVCXPRT *find_rmtcallxprt_by_fd __P((int)); -static int forward_register __P((u_int32_t, struct netbuf *, int, char *, - rpcproc_t, rpcvers_t, u_int32_t *)); -static struct finfo *forward_find __P((u_int32_t)); -static int free_slot_by_xid __P((u_int32_t)); -static int free_slot_by_index __P((int)); -static int netbufcmp __P((struct netbuf *, struct netbuf *)); -static struct netbuf *netbufdup __P((struct netbuf *)); -static void netbuffree __P((struct netbuf *)); -static int check_rmtcalls __P((struct pollfd *, int)); -static void xprt_set_caller __P((SVCXPRT *, struct finfo *)); -static void send_svcsyserr __P((SVCXPRT *, struct finfo *)); -static void handle_reply __P((int, SVCXPRT *)); -static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *)); -static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *)); -static char *getowner __P((SVCXPRT *, char *, size_t)); -static int add_pmaplist __P((RPCB *)); -static int del_pmaplist __P((RPCB *)); +static bool_t xdr_encap_parms(XDR *, struct encap_parms *); +static bool_t xdr_rmtcall_args(XDR *, struct r_rmtcall_args *); +static bool_t xdr_rmtcall_result(XDR *, struct r_rmtcall_args *); +static bool_t xdr_opaque_parms(XDR *, struct r_rmtcall_args *); +static int find_rmtcallfd_by_netid(char *); +static SVCXPRT *find_rmtcallxprt_by_fd(int); +static int forward_register(u_int32_t, struct netbuf *, int, char *, + rpcproc_t, rpcvers_t, u_int32_t *); +static struct finfo *forward_find(u_int32_t); +static int free_slot_by_xid(u_int32_t); +static int free_slot_by_index(int); +static int netbufcmp(struct netbuf *, struct netbuf *); +static struct netbuf *netbufdup(struct netbuf *); +static void netbuffree(struct netbuf *); +static int check_rmtcalls(struct pollfd *, int); +static void xprt_set_caller(SVCXPRT *, struct finfo *); +static void send_svcsyserr(SVCXPRT *, struct finfo *); +static void handle_reply(int, SVCXPRT *); +static void find_versions(rpcprog_t, char *, rpcvers_t *, rpcvers_t *); +static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *); +static char *getowner(SVCXPRT *, char *, size_t); +static int add_pmaplist(RPCB *); +static int del_pmaplist(RPCB *); /* * Set a mapping of program, version, netid diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c index c1f5603..ed89916 100644 --- a/usr.sbin/rpcbind/rpcbind.c +++ b/usr.sbin/rpcbind/rpcbind.c @@ -112,13 +112,13 @@ char *tcp_uaddr; /* Universal TCP address */ static char servname[] = "rpcbind"; static char superuser[] = "superuser"; -int main __P((int, char *[])); +int main(int, char *[]); -static int init_transport __P((struct netconfig *)); -static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *, - struct netbuf *)); -static void terminate __P((int)); -static void parseargs __P((int, char *[])); +static int init_transport(struct netconfig *); +static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *, + struct netbuf *); +static void terminate(int); +static void parseargs(int, char *[]); int main(int argc, char *argv[]) diff --git a/usr.sbin/rpcbind/rpcbind.h b/usr.sbin/rpcbind/rpcbind.h index 2d52be3..5537ce4 100644 --- a/usr.sbin/rpcbind/rpcbind.h +++ b/usr.sbin/rpcbind/rpcbind.h @@ -80,62 +80,62 @@ extern char *udp_uaddr; /* Universal UDP address */ extern char *tcp_uaddr; /* Universal TCP address */ #endif -int add_bndlist __P((struct netconfig *, struct netbuf *)); -bool_t is_bound __P((char *, char *)); -char *mergeaddr __P((SVCXPRT *, char *, char *, char *)); -struct netconfig *rpcbind_get_conf __P((char *)); - -void rpcbs_init __P((void)); -void rpcbs_procinfo __P((rpcvers_t, rpcproc_t)); -void rpcbs_set __P((rpcvers_t, bool_t)); -void rpcbs_unset __P((rpcvers_t, bool_t)); -void rpcbs_getaddr __P((rpcvers_t, rpcprog_t, rpcvers_t, char *, char *)); -void rpcbs_rmtcall __P((rpcvers_t, rpcproc_t, rpcprog_t, rpcvers_t, rpcproc_t, - char *, rpcblist_ptr)); -void *rpcbproc_getstat __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); - -void rpcb_service_3 __P((struct svc_req *, SVCXPRT *)); -void rpcb_service_4 __P((struct svc_req *, SVCXPRT *)); +int add_bndlist(struct netconfig *, struct netbuf *); +bool_t is_bound(char *, char *); +char *mergeaddr(SVCXPRT *, char *, char *, char *); +struct netconfig *rpcbind_get_conf(char *); + +void rpcbs_init(void); +void rpcbs_procinfo(rpcvers_t, rpcproc_t); +void rpcbs_set(rpcvers_t, bool_t); +void rpcbs_unset(rpcvers_t, bool_t); +void rpcbs_getaddr(rpcvers_t, rpcprog_t, rpcvers_t, char *, char *); +void rpcbs_rmtcall(rpcvers_t, rpcproc_t, rpcprog_t, rpcvers_t, rpcproc_t, + char *, rpcblist_ptr); +void *rpcbproc_getstat(void *, struct svc_req *, SVCXPRT *, rpcvers_t); + +void rpcb_service_3(struct svc_req *, SVCXPRT *); +void rpcb_service_4(struct svc_req *, SVCXPRT *); /* Common functions shared between versions */ -void *rpcbproc_set_com __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -void *rpcbproc_unset_com __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -bool_t map_set __P((RPCB *, char *)); -bool_t map_unset __P((RPCB *, char *)); -void delete_prog __P((unsigned int)); -void *rpcbproc_getaddr_com __P((RPCB *, struct svc_req *, SVCXPRT *, rpcvers_t, - rpcvers_t)); -void *rpcbproc_gettime_com __P((void *, struct svc_req *, SVCXPRT *, - rpcvers_t)); -void *rpcbproc_uaddr2taddr_com __P((void *, struct svc_req *, - SVCXPRT *, rpcvers_t)); -void *rpcbproc_taddr2uaddr_com __P((void *, struct svc_req *, SVCXPRT *, - rpcvers_t)); -int create_rmtcall_fd __P((struct netconfig *)); -void rpcbproc_callit_com __P((struct svc_req *, SVCXPRT *, rpcvers_t, - rpcvers_t)); -void my_svc_run __P((void)); - -void rpcbind_abort __P((void)); -void reap __P((int)); -void toggle_verboselog __P((int)); - -int check_access __P((SVCXPRT *, rpcproc_t, void *, unsigned int)); -int check_callit __P((SVCXPRT *, struct r_rmtcall_args *, int)); -void logit __P((int, struct sockaddr *, rpcproc_t, rpcprog_t, const char *)); -int is_loopback __P((struct netbuf *)); +void *rpcbproc_set_com(void *, struct svc_req *, SVCXPRT *, rpcvers_t); +void *rpcbproc_unset_com(void *, struct svc_req *, SVCXPRT *, rpcvers_t); +bool_t map_set(RPCB *, char *); +bool_t map_unset(RPCB *, char *); +void delete_prog(unsigned int); +void *rpcbproc_getaddr_com(RPCB *, struct svc_req *, SVCXPRT *, rpcvers_t, + rpcvers_t); +void *rpcbproc_gettime_com(void *, struct svc_req *, SVCXPRT *, + rpcvers_t); +void *rpcbproc_uaddr2taddr_com(void *, struct svc_req *, + SVCXPRT *, rpcvers_t); +void *rpcbproc_taddr2uaddr_com(void *, struct svc_req *, SVCXPRT *, + rpcvers_t); +int create_rmtcall_fd(struct netconfig *); +void rpcbproc_callit_com(struct svc_req *, SVCXPRT *, rpcvers_t, + rpcvers_t); +void my_svc_run(void); + +void rpcbind_abort(void); +void reap(int); +void toggle_verboselog(int); + +int check_access(SVCXPRT *, rpcproc_t, void *, unsigned int); +int check_callit(SVCXPRT *, struct r_rmtcall_args *, int); +void logit(int, struct sockaddr *, rpcproc_t, rpcprog_t, const char *); +int is_loopback(struct netbuf *); #ifdef PORTMAP -extern void pmap_service __P((struct svc_req *, SVCXPRT *)); +extern void pmap_service(struct svc_req *, SVCXPRT *); #endif -void write_warmstart __P((void)); -void read_warmstart __P((void)); +void write_warmstart(void); +void read_warmstart(void); -char *addrmerge __P((struct netbuf *caller, char *serv_uaddr, char *clnt_uaddr, - char *netid)); -void network_init __P((void)); -struct sockaddr *local_sa __P((int)); +char *addrmerge(struct netbuf *caller, char *serv_uaddr, char *clnt_uaddr, + char *netid); +void network_init(void); +struct sockaddr *local_sa(int); /* For different getaddr semantics */ #define RPCB_ALLVERS 0 diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c index 4137ce2..66797a7 100644 --- a/usr.sbin/rpcbind/util.c +++ b/usr.sbin/rpcbind/util.c @@ -70,9 +70,9 @@ static struct sockaddr_in *local_in4; static struct sockaddr_in6 *local_in6; #endif -static int bitmaskcmp __P((void *, void *, void *, int)); +static int bitmaskcmp(void *, void *, void *, int); #ifdef INET6 -static void in6_fillscopeid __P((struct sockaddr_in6 *)); +static void in6_fillscopeid(struct sockaddr_in6 *); #endif /* diff --git a/usr.sbin/rpcbind/warmstart.c b/usr.sbin/rpcbind/warmstart.c index 1962e1c..410f270 100644 --- a/usr.sbin/rpcbind/warmstart.c +++ b/usr.sbin/rpcbind/warmstart.c @@ -63,8 +63,8 @@ #define PMAPFILE "/tmp/portmap.file" #endif -static bool_t write_struct __P((char *, xdrproc_t, void *)); -static bool_t read_struct __P((char *, xdrproc_t, void *)); +static bool_t write_struct(char *, xdrproc_t, void *); +static bool_t read_struct(char *, xdrproc_t, void *); static bool_t write_struct(char *filename, xdrproc_t structproc, void *list) |