From b2bffca2e3b59dd882039e3b0ab835d127bdaf7a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 15 May 2002 00:22:23 +0000 Subject: Update. 2002-05-11 Jakub Jelinek * include/netinet/in.h (bindresvport_internal): Add prototype. * include/rpc/auth.h (authunix_create_internal, authunix_create_default_internal, authnone_create_internal, authdes_pk_create_internal): Add prototypes. * include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal, clntudp_create_internal, clntudp_bufcreate_internal, clntunix_create_internal): Add prototypes. * include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal, svc_getreq_internal, svc_getreq_common_internal, svc_getreqset_internal, svc_getreq_poll_internal, svc_register_internal, svc_unregister_internal, svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes. * include/rpc/svc_auth.h (_authenticate_internal): Add prototype. * include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg, __setsockopt, __getsockname, __bind, __listen): Add prototypes. * inet/rexec.c (rexec_af): Use __listen and __getsockname. * inet/rcmd.c (rcmd_af): Use __listen. (rresvport_af): Use __bind. * sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport, authunix_create, authunix_create_default, authnone_create, authdes_pk_create, clnt_create, clnttcp_create, clntudp_create, clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode, svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll, svc_register, svc_unregister, svcudp_create, svcudp_bufcreate, _authenticate, add INTDEF after such function definitions. Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg, __setsockopt, __getsockname instead of non-__ variants. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/pm_getport.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/svc_auth.c: Likewise. * sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases, __register_frame_info_table_bases, __deregister_frame_info_bases): Add INTDEF. (__register_frame_info_bases_internal, __register_frame_info_table_bases_internal, __deregister_frame_info_bases_internal): Add prototypes. (__register_frame_info, __register_frame): Use INTUSE in call to __register_frame_info_bases. (__register_frame_info_table): Similarly. (__deregister_frame_info, __deregister_frame): Similarly. * sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add sendto as weak alias. * sysdeps/mach/hurd/sendto.c: Likewise. * sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add recvfrom as weak alias. * sysdeps/mach/hurd/recvfrom.c: Likewise. * sysdeps/unix/sysv/aix/recvfrom.c: Likewise. * sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add recvmsg as weak alias. * sysdeps/unix/sysv/aix/recvmsg.c: Likewise. * sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add sendmsg as weak alias. * sysdeps/unix/sysv/aix/sendmsg.c: Likewise. * sysdeps/generic/setsockopt.c (__setsockopt): Renamed from setsockopt, add setsockopt as weak alias. * sysdeps/mach/hurd/setsockopt.c: Likewise. * sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as weak alias. * sysdeps/mach/hurd/bind.c: Likewise. * sysdeps/generic/listen.c (__listen): Renamed from listen, add listen as weak alias. * sysdeps/mach/hurd/listen.c: Likewise. * sysdeps/generic/getsockname.c (__getsockname): Renamed from getsockname, add getsockname as weak alias. * sysdeps/mach/hurd/getsockname.c: Likewise. * sysdeps/unix/sysv/aix/getsockname.c: Likewise. * sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias. * sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias. * sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg, __recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases. * sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg): Add aliases. * sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias. * sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise. * sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise. * sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise. * sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise. * sysdeps/unix/sysv/linux/bind.S (__bind): Likewise. * sysdeps/unix/sysv/linux/listen.S (__listen): Likewise. * sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise. 2002-05-10 Jakub Jelinek * locale/programs/localedef.h (show_archive_content): Add verbose argument. * locale/programs/localedef.c (main): Adjust caller. * locale/programs/locarchive.c (struct nameent, struct dataent): New. (nameentcmp, dataentcmp): New functions. (xstrcmp): Remove. (show_archive_content): Print verbose listing with --list-archive -v. * locale/programs/locarchive.c (open_archive): Take extra argument readonly. If true open file with O_RDONLY and don't create the archive if it doesn't exist. Adapt all callers. (close_archive): Don't do anything if fd element is -1. * locale/programs/localedef.h (open_archive): Adjust prototype. * locale/programs/locfile.c (write_all_categories): Adjust open_archive call. * malloc/malloc.c (__posix_memalign): Correct check for size of alignment value [PR libc/3444]. --- sunrpc/auth_des.c | 3 ++- sunrpc/auth_none.c | 1 + sunrpc/auth_unix.c | 4 +++- sunrpc/bindrsvprt.c | 3 ++- sunrpc/clnt_gen.c | 7 ++++--- sunrpc/clnt_raw.c | 4 ++-- sunrpc/clnt_simp.c | 2 +- sunrpc/clnt_tcp.c | 5 +++-- sunrpc/clnt_udp.c | 25 +++++++++++++------------ sunrpc/clnt_unix.c | 9 +++++---- sunrpc/key_call.c | 14 ++++++++------ sunrpc/pm_getmaps.c | 4 ++-- sunrpc/pm_getport.c | 5 +++-- sunrpc/pmap_clnt.c | 10 ++++++---- sunrpc/pmap_rmt.c | 16 ++++++++-------- sunrpc/rtime.c | 8 ++++---- sunrpc/svc.c | 14 +++++++++++--- sunrpc/svc_auth.c | 1 + sunrpc/svc_run.c | 2 +- sunrpc/svc_simple.c | 14 +++++++------- sunrpc/svc_tcp.c | 8 ++++---- sunrpc/svc_udp.c | 37 +++++++++++++++++++------------------ sunrpc/svc_unix.c | 12 ++++++------ 23 files changed, 116 insertions(+), 92 deletions(-) (limited to 'sunrpc') diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c index bf1b8a6eeb..fc5956dcd7 100644 --- a/sunrpc/auth_des.c +++ b/sunrpc/auth_des.c @@ -115,7 +115,7 @@ authdes_create (const char *servername, u_int window, pkey.n_bytes = (char *) pkey_data; pkey.n_len = strlen ((char *) pkey_data) + 1; - return authdes_pk_create (servername, &pkey, window, syncaddr, ckey); + return INTUSE(authdes_pk_create) (servername, &pkey, window, syncaddr, ckey); } AUTH * @@ -206,6 +206,7 @@ failed: } return NULL; } +INTDEF(authdes_pk_create) /* * Implement the five authentication operations diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c index 4a1b46f274..9c4d3fde66 100644 --- a/sunrpc/auth_none.c +++ b/sunrpc/auth_none.c @@ -96,6 +96,7 @@ authnone_create (void) __libc_once (authnone_private_guard, authnone_create_once); return &authnone_private.no_client; } +INTDEF (authnone_create) static bool_t authnone_marshal (AUTH *client, XDR *xdrs) diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c index aae372c4fb..8c1134fba4 100644 --- a/sunrpc/auth_unix.c +++ b/sunrpc/auth_unix.c @@ -156,6 +156,7 @@ no_memory: marshal_new_auth (auth); return auth; } +INTDEF (authunix_create) /* * Returns an auth handle with parameters determined by doing lots of @@ -182,8 +183,9 @@ authunix_create_default (void) /* This braindamaged Sun code forces us here to truncate the list of groups to NGRPS members since the code in authuxprot.c transforms a fixed array. Grrr. */ - return authunix_create (machname, uid, gid, MIN (NGRPS, len), gids); + return INTUSE(authunix_create) (machname, uid, gid, MIN (NGRPS, len), gids); } +INTDEF (authunix_create_default) /* * authunix operations diff --git a/sunrpc/bindrsvprt.c b/sunrpc/bindrsvprt.c index 0acfd69e09..ba3309a4b3 100644 --- a/sunrpc/bindrsvprt.c +++ b/sunrpc/bindrsvprt.c @@ -78,8 +78,9 @@ bindresvport (int sd, struct sockaddr_in *sin) { port = STARTPORT; } - res = bind (sd, sin, sizeof (struct sockaddr_in)); + res = __bind (sd, sin, sizeof (struct sockaddr_in)); } return res; } +INTDEF (bindresvport) diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c index 251ad88ee5..bd5545025d 100644 --- a/sunrpc/clnt_gen.c +++ b/sunrpc/clnt_gen.c @@ -66,7 +66,7 @@ clnt_create (const char *hostname, u_long prog, u_long vers, sun.sun_family = AF_UNIX; strcpy (sun.sun_path, hostname); sock = RPC_ANYSOCK; - client = clntunix_create (&sun, prog, vers, &sock, 0, 0); + client = INTUSE(clntunix_create) (&sun, prog, vers, &sock, 0, 0); if (client == NULL) return NULL; #if 0 @@ -136,7 +136,7 @@ clnt_create (const char *hostname, u_long prog, u_long vers, case IPPROTO_UDP: tv.tv_sec = 5; tv.tv_usec = 0; - client = clntudp_create (&sin, prog, vers, tv, &sock); + client = INTUSE(clntudp_create) (&sin, prog, vers, tv, &sock); if (client == NULL) { return NULL; @@ -150,7 +150,7 @@ clnt_create (const char *hostname, u_long prog, u_long vers, #endif break; case IPPROTO_TCP: - client = clnttcp_create (&sin, prog, vers, &sock, 0, 0); + client = INTUSE(clnttcp_create) (&sin, prog, vers, &sock, 0, 0); if (client == NULL) { return NULL; @@ -174,3 +174,4 @@ clnt_create (const char *hostname, u_long prog, u_long vers, } return client; } +INTDEF (clnt_create) diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c index 110141fcc8..082a76abeb 100644 --- a/sunrpc/clnt_raw.c +++ b/sunrpc/clnt_raw.c @@ -128,7 +128,7 @@ clntraw_create (u_long prog, u_long vers) * create client handle */ client->cl_ops = &client_ops; - client->cl_auth = authnone_create (); + client->cl_auth = INTUSE(authnone_create) (); return client; } @@ -170,7 +170,7 @@ call_again: * We have to call server input routine here because this is * all going on in one process. Yuk. */ - svc_getreq (1); + INTUSE(svc_getreq) (1); /* * get results diff --git a/sunrpc/clnt_simp.c b/sunrpc/clnt_simp.c index 5c11b479b2..373eeed1a6 100644 --- a/sunrpc/clnt_simp.c +++ b/sunrpc/clnt_simp.c @@ -125,7 +125,7 @@ callrpc (const char *host, u_long prognum, u_long versnum, u_long procnum, memcpy ((char *) &server_addr.sin_addr, hp->h_addr, hp->h_length); server_addr.sin_family = AF_INET; server_addr.sin_port = 0; - if ((crp->client = clntudp_create (&server_addr, (u_long) prognum, + if ((crp->client = INTUSE(clntudp_create) (&server_addr, (u_long) prognum, (u_long) versnum, timeout, &crp->socket)) == NULL) return (int) get_rpc_createerr().cf_stat; crp->valid = 1; diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c index 8c09a15c66..5d02cd99cb 100644 --- a/sunrpc/clnt_tcp.c +++ b/sunrpc/clnt_tcp.c @@ -201,7 +201,7 @@ clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers, * pre-serialize the static part of the call msg and stash it away */ INTUSE(xdrmem_create) (&(ct->ct_xdrs), ct->ct_mcall, MCALL_MSG_SIZE, - XDR_ENCODE); + XDR_ENCODE); if (!INTUSE(xdr_callhdr) (&(ct->ct_xdrs), &call_msg)) { if (ct->ct_closeit) @@ -221,7 +221,7 @@ clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers, (caddr_t) ct, readtcp, writetcp); h->cl_ops = &tcp_ops; h->cl_private = (caddr_t) ct; - h->cl_auth = authnone_create (); + h->cl_auth = INTUSE(authnone_create) (); return h; fooy: @@ -232,6 +232,7 @@ fooy: mem_free ((caddr_t) h, sizeof (CLIENT)); return ((CLIENT *) NULL); } +INTDEF (clnttcp_create) static enum clnt_stat clnttcp_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout) diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c index 82fd3eee51..8f6d269db6 100644 --- a/sunrpc/clnt_udp.c +++ b/sunrpc/clnt_udp.c @@ -191,13 +191,13 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version, goto fooy; } /* attempt to bind to prov port */ - (void) bindresvport (*sockp, (struct sockaddr_in *) 0); + (void) INTUSE(bindresvport) (*sockp, (struct sockaddr_in *) 0); /* the sockets rpc controls are non-blocking */ (void) __ioctl (*sockp, FIONBIO, (char *) &dontblock); #ifdef IP_RECVERR { int on = 1; - setsockopt(*sockp, SOL_IP, IP_RECVERR, &on, sizeof(on)); + __setsockopt (*sockp, SOL_IP, IP_RECVERR, &on, sizeof(on)); } #endif cu->cu_closeit = TRUE; @@ -207,7 +207,7 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version, cu->cu_closeit = FALSE; } cu->cu_sock = *sockp; - cl->cl_auth = authnone_create (); + cl->cl_auth = INTUSE(authnone_create) (); return cl; fooy: if (cu) @@ -216,6 +216,7 @@ fooy: mem_free ((caddr_t) cl, sizeof (CLIENT)); return (CLIENT *) NULL; } +INTDEF (clntudp_bufcreate) CLIENT * clntudp_create (raddr, program, version, wait, sockp) @@ -225,10 +226,10 @@ clntudp_create (raddr, program, version, wait, sockp) struct timeval wait; int *sockp; { - - return clntudp_bufcreate (raddr, program, version, wait, sockp, - UDPMSGSIZE, UDPMSGSIZE); + return INTUSE(clntudp_bufcreate) (raddr, program, version, wait, sockp, + UDPMSGSIZE, UDPMSGSIZE); } +INTDEF (clntudp_create) static int is_network_up (int sock) @@ -312,8 +313,8 @@ call_again: outlen = (int) XDR_GETPOS (xdrs); send_again: - if (sendto (cu->cu_sock, cu->cu_outbuf, outlen, 0, - (struct sockaddr *) &(cu->cu_raddr), cu->cu_rlen) + if (__sendto (cu->cu_sock, cu->cu_outbuf, outlen, 0, + (struct sockaddr *) &(cu->cu_raddr), cu->cu_rlen) != outlen) { cu->cu_error.re_errno = errno; @@ -395,7 +396,7 @@ send_again: msg.msg_flags = 0; msg.msg_control = cbuf; msg.msg_controllen = 256; - ret = recvmsg (cu->cu_sock, &msg, MSG_ERRQUEUE); + ret = __recvmsg (cu->cu_sock, &msg, MSG_ERRQUEUE); if (ret >= 0 && memcmp (cbuf + 256, cu->cu_outbuf, ret) == 0 && (msg.msg_flags & MSG_ERRQUEUE) @@ -419,9 +420,9 @@ send_again: do { fromlen = sizeof (struct sockaddr); - inlen = recvfrom (cu->cu_sock, cu->cu_inbuf, - (int) cu->cu_recvsz, 0, - (struct sockaddr *) &from, &fromlen); + inlen = __recvfrom (cu->cu_sock, cu->cu_inbuf, + (int) cu->cu_recvsz, 0, + (struct sockaddr *) &from, &fromlen); } while (inlen < 0 && errno == EINTR); if (inlen < 0) diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c index 8c2fa40f80..fae1cd8229 100644 --- a/sunrpc/clnt_unix.c +++ b/sunrpc/clnt_unix.c @@ -200,7 +200,7 @@ clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers, (caddr_t) ct, readunix, writeunix); h->cl_ops = &unix_ops; h->cl_private = (caddr_t) ct; - h->cl_auth = authnone_create (); + h->cl_auth = INTUSE(authnone_create) (); return h; fooy: @@ -211,6 +211,7 @@ fooy: mem_free ((caddr_t) h, sizeof (CLIENT)); return (CLIENT *) NULL; } +INTDEF (clntunix_create) static enum clnt_stat clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout) @@ -466,13 +467,13 @@ __msgread (int sock, void *data, size_t cnt) #ifdef SO_PASSCRED { int on = 1; - if (setsockopt (sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on))) + if (__setsockopt (sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on))) return -1; } #endif restart: - len = recvmsg (sock, &msg, 0); + len = __recvmsg (sock, &msg, 0); if (len >= 0) { if (msg.msg_flags & MSG_CTRUNC || len == 0) @@ -523,7 +524,7 @@ __msgwrite (int sock, void *data, size_t cnt) msg.msg_flags = 0; restart: - len = sendmsg (sock, &msg, 0); + len = __sendmsg (sock, &msg, 0); if (len >= 0) return len; if (errno == EINTR) diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c index 61c13ec335..93117fd03f 100644 --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -215,9 +215,9 @@ key_gendes (des_block *key) sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK); __bzero (sin.sin_zero, sizeof (sin.sin_zero)); socket = RPC_ANYSOCK; - client = clntudp_bufcreate (&sin, (u_long) KEY_PROG, (u_long) KEY_VERS, - trytimeout, &socket, RPCSMALLMSGSIZE, - RPCSMALLMSGSIZE); + client = INTUSE(clntudp_bufcreate) (&sin, (u_long) KEY_PROG, + (u_long) KEY_VERS, trytimeout, &socket, + RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); if (client == NULL) return -1; @@ -425,7 +425,7 @@ getkeyserv_handle (int vers) kcp->uid = __geteuid (); auth_destroy (kcp->client->cl_auth); kcp->client->cl_auth = - authunix_create ((char *)"", kcp->uid, 0, 0, NULL); + INTUSE(authunix_create) ((char *)"", kcp->uid, 0, 0, NULL); if (kcp->client->cl_auth == NULL) { clnt_destroy (kcp->client); @@ -440,14 +440,16 @@ getkeyserv_handle (int vers) if ((kcp->client == (CLIENT *) NULL)) /* Use the AF_UNIX transport */ - kcp->client = clnt_create ("/var/run/keyservsock", KEY_PROG, vers, "unix"); + kcp->client = INTUSE(clnt_create) ("/var/run/keyservsock", KEY_PROG, vers, + "unix"); if (kcp->client == (CLIENT *) NULL) return (CLIENT *) NULL; kcp->uid = __geteuid (); kcp->pid = __getpid (); - kcp->client->cl_auth = authunix_create ((char *)"", kcp->uid, 0, 0, NULL); + kcp->client->cl_auth = INTUSE(authunix_create) ((char *)"", kcp->uid, 0, 0, + NULL); if (kcp->client->cl_auth == NULL) { clnt_destroy (kcp->client); diff --git a/sunrpc/pm_getmaps.c b/sunrpc/pm_getmaps.c index 987ed5fe09..d1d4ca8769 100644 --- a/sunrpc/pm_getmaps.c +++ b/sunrpc/pm_getmaps.c @@ -63,8 +63,8 @@ pmap_getmaps (struct sockaddr_in *address) minutetimeout.tv_sec = 60; minutetimeout.tv_usec = 0; address->sin_port = htons (PMAPPORT); - client = clnttcp_create (address, PMAPPROG, - PMAPVERS, &socket, 50, 500); + client = INTUSE(clnttcp_create) (address, PMAPPROG, + PMAPVERS, &socket, 50, 500); if (client != (CLIENT *) NULL) { if (CLNT_CALL (client, PMAPPROC_DUMP, (xdrproc_t)INTUSE(xdr_void), NULL, diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c index c26183d75c..cd65307ee9 100644 --- a/sunrpc/pm_getport.c +++ b/sunrpc/pm_getport.c @@ -66,8 +66,9 @@ pmap_getport (address, program, version, protocol) struct pmap parms; address->sin_port = htons (PMAPPORT); - client = clntudp_bufcreate (address, PMAPPROG, - PMAPVERS, timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); + client = INTUSE(clntudp_bufcreate) (address, PMAPPROG, PMAPVERS, timeout, + &socket, RPCSMALLMSGSIZE, + RPCSMALLMSGSIZE); if (client != (CLIENT *) NULL) { struct rpc_createerr *ce = &get_rpc_createerr (); diff --git a/sunrpc/pmap_clnt.c b/sunrpc/pmap_clnt.c index 6e2c035a69..fa9bbf9373 100644 --- a/sunrpc/pmap_clnt.c +++ b/sunrpc/pmap_clnt.c @@ -121,8 +121,9 @@ pmap_set (u_long program, u_long version, int protocol, u_short port) if (!__get_myaddress (&myaddress)) return FALSE; - client = clntudp_bufcreate (&myaddress, PMAPPROG, PMAPVERS, - timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); + client = INTUSE(clntudp_bufcreate) (&myaddress, PMAPPROG, PMAPVERS, + timeout, &socket, RPCSMALLMSGSIZE, + RPCSMALLMSGSIZE); if (client == (CLIENT *) NULL) return (FALSE); parms.pm_prog = program; @@ -156,8 +157,9 @@ pmap_unset (u_long program, u_long version) if (!__get_myaddress (&myaddress)) return FALSE; - client = clntudp_bufcreate (&myaddress, PMAPPROG, PMAPVERS, - timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); + client = INTUSE(clntudp_bufcreate) (&myaddress, PMAPPROG, PMAPVERS, + timeout, &socket, RPCSMALLMSGSIZE, + RPCSMALLMSGSIZE); if (client == (CLIENT *) NULL) return FALSE; parms.pm_prog = program; diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c index 2f7592eb8e..c02f546b36 100644 --- a/sunrpc/pmap_rmt.c +++ b/sunrpc/pmap_rmt.c @@ -84,7 +84,7 @@ pmap_rmtcall (addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_p enum clnt_stat stat; addr->sin_port = htons (PMAPPORT); - client = clntudp_create (addr, PMAPPROG, PMAPVERS, timeout, &socket); + client = INTUSE(clntudp_create) (addr, PMAPPROG, PMAPVERS, timeout, &socket); if (client != (CLIENT *) NULL) { a.prog = prog; @@ -239,7 +239,7 @@ clnt_broadcast (prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) resultproc_t eachresult; /* call with each result obtained */ { enum clnt_stat stat = RPC_FAILED; - AUTH *unix_auth = authunix_create_default (); + AUTH *unix_auth = INTUSE(authunix_create_default) (); XDR xdr_stream; XDR *xdrs = &xdr_stream; struct timeval t; @@ -271,7 +271,7 @@ clnt_broadcast (prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) goto done_broad; } #ifdef SO_BROADCAST - if (setsockopt (sock, SOL_SOCKET, SO_BROADCAST, &on, sizeof (on)) < 0) + if (__setsockopt (sock, SOL_SOCKET, SO_BROADCAST, &on, sizeof (on)) < 0) { perror (_("Cannot set socket option SO_BROADCAST")); stat = RPC_CANTSEND; @@ -321,9 +321,9 @@ clnt_broadcast (prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) for (i = 0; i < nets; i++) { baddr.sin_addr = addrs[i]; - if (sendto (sock, outbuf, outlen, 0, - (struct sockaddr *) &baddr, - sizeof (struct sockaddr)) != outlen) + if (__sendto (sock, outbuf, outlen, 0, + (struct sockaddr *) &baddr, + sizeof (struct sockaddr)) != outlen) { perror (_("Cannot send broadcast packet")); stat = RPC_CANTSEND; @@ -357,8 +357,8 @@ clnt_broadcast (prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) } /* end of poll results switch */ try_again: fromlen = sizeof (struct sockaddr); - inlen = recvfrom (sock, inbuf, UDPMSGSIZE, 0, - (struct sockaddr *) &raddr, &fromlen); + inlen = __recvfrom (sock, inbuf, UDPMSGSIZE, 0, + (struct sockaddr *) &raddr, &fromlen); if (inlen < 0) { if (errno == EINTR) diff --git a/sunrpc/rtime.c b/sunrpc/rtime.c index 536d018c90..0c6d2effe0 100644 --- a/sunrpc/rtime.c +++ b/sunrpc/rtime.c @@ -96,8 +96,8 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep, addrp->sin_port = htons (IPPORT_TIMESERVER); if (type == SOCK_DGRAM) { - res = sendto (s, (char *) &thetime, sizeof (thetime), 0, - (struct sockaddr *) addrp, sizeof (*addrp)); + res = __sendto (s, (char *) &thetime, sizeof (thetime), 0, + (struct sockaddr *) addrp, sizeof (*addrp)); if (res < 0) { do_close (s); @@ -117,8 +117,8 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep, return (-1); } fromlen = sizeof (from); - res = recvfrom (s, (char *) &thetime, sizeof (thetime), 0, - (struct sockaddr *) &from, &fromlen); + res = __recvfrom (s, (char *) &thetime, sizeof (thetime), 0, + (struct sockaddr *) &from, &fromlen); do_close (s); if (res < 0) return -1; diff --git a/sunrpc/svc.c b/sunrpc/svc.c index 5260634ae2..932813b1c6 100644 --- a/sunrpc/svc.c +++ b/sunrpc/svc.c @@ -192,6 +192,7 @@ pmap_it: return TRUE; } +INTDEF (svc_register) /* Remove a service program from the callout list. */ void @@ -213,6 +214,7 @@ svc_unregister (rpcprog_t prog, rpcvers_t vers) /* now unregister the information with the local binder service */ pmap_unset (prog, vers); } +INTDEF (svc_unregister) /* ******************* REPLY GENERATION ROUTINES ************ */ @@ -231,6 +233,7 @@ svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results, rply.acpted_rply.ar_results.proc = xdr_results; return SVC_REPLY (xprt, &rply); } +INTDEF (svc_sendreply) /* No procedure error reply */ void @@ -257,6 +260,7 @@ svcerr_decode (register SVCXPRT *xprt) rply.acpted_rply.ar_stat = GARBAGE_ARGS; SVC_REPLY (xprt, &rply); } +INTDEF (svcerr_decode) /* Some system error */ void @@ -345,8 +349,9 @@ svc_getreq (int rdfds) FD_ZERO (&readfds); readfds.fds_bits[0] = rdfds; - svc_getreqset (&readfds); + INTUSE(svc_getreqset) (&readfds); } +INTDEF (svc_getreq) void svc_getreqset (fd_set *readfds) @@ -361,8 +366,9 @@ svc_getreqset (fd_set *readfds) maskp = (u_int32_t *) readfds->fds_bits; for (sock = 0; sock < setsize; sock += 32) for (mask = *maskp++; (bit = ffs (mask)); mask ^= (1 << (bit - 1))) - svc_getreq_common (sock + bit - 1); + INTUSE(svc_getreq_common) (sock + bit - 1); } +INTDEF (svc_getreqset) void svc_getreq_poll (struct pollfd *pfdp, int pollretval) @@ -382,10 +388,11 @@ svc_getreq_poll (struct pollfd *pfdp, int pollretval) if (p->revents & POLLNVAL) xprt_unregister (xports[p->fd]); else - svc_getreq_common (p->fd); + INTUSE(svc_getreq_common) (p->fd); } } } +INTDEF (svc_getreq_poll) void @@ -477,6 +484,7 @@ svc_getreq_common (const int fd) } while (stat == XPRT_MOREREQS); } +INTDEF (svc_getreq_common) #ifdef _RPC_THREAD_SAFE_ diff --git a/sunrpc/svc_auth.c b/sunrpc/svc_auth.c index f0aebd5358..68ed4f100b 100644 --- a/sunrpc/svc_auth.c +++ b/sunrpc/svc_auth.c @@ -111,6 +111,7 @@ _authenticate (register struct svc_req *rqst, struct rpc_msg *msg) return AUTH_REJECTEDCRED; } +INTDEF(_authenticate) static enum auth_stat _svcauth_null (struct svc_req *rqst, struct rpc_msg *msg) diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c index 72fb939e78..017910b453 100644 --- a/sunrpc/svc_run.c +++ b/sunrpc/svc_run.c @@ -79,7 +79,7 @@ svc_run (void) free (my_pollfd); continue; default: - svc_getreq_poll (my_pollfd, i); + INTUSE(svc_getreq_poll) (my_pollfd, i); free (my_pollfd); } } diff --git a/sunrpc/svc_simple.c b/sunrpc/svc_simple.c index dbdb8f1501..cd985a201a 100644 --- a/sunrpc/svc_simple.c +++ b/sunrpc/svc_simple.c @@ -91,7 +91,7 @@ registerrpc (u_long prognum, u_long versnum, u_long procnum, } if (transp == 0) { - transp = svcudp_create (RPC_ANYSOCK); + transp = INTUSE(svcudp_create) (RPC_ANYSOCK); if (transp == NULL) { buf = strdup (_("couldn't create an rpc server\n")); @@ -99,8 +99,8 @@ registerrpc (u_long prognum, u_long versnum, u_long procnum, } } (void) pmap_unset ((u_long) prognum, (u_long) versnum); - if (!svc_register (transp, (u_long) prognum, (u_long) versnum, - universal, IPPROTO_UDP)) + if (!INTUSE(svc_register) (transp, (u_long) prognum, (u_long) versnum, + universal, IPPROTO_UDP)) { (void) __asprintf (&buf, _("couldn't register prog %ld vers %ld\n"), prognum, versnum); @@ -146,8 +146,8 @@ universal (struct svc_req *rqstp, SVCXPRT *transp_l) */ if (rqstp->rq_proc == NULLPROC) { - if (svc_sendreply (transp_l, (xdrproc_t)INTUSE(xdr_void), (char *) NULL) - == FALSE) + if (INTUSE(svc_sendreply) (transp_l, (xdrproc_t)INTUSE(xdr_void), + (char *) NULL) == FALSE) { __write (STDERR_FILENO, "xxx\n", 4); exit (1); @@ -163,14 +163,14 @@ universal (struct svc_req *rqstp, SVCXPRT *transp_l) __bzero (xdrbuf, sizeof (xdrbuf)); /* required ! */ if (!svc_getargs (transp_l, pl->p_inproc, xdrbuf)) { - svcerr_decode (transp_l); + INTUSE(svcerr_decode) (transp_l); return; } outdata = (*(pl->p_progname)) (xdrbuf); if (outdata == NULL && pl->p_outproc != (xdrproc_t)INTUSE(xdr_void)) /* there was an error */ return; - if (!svc_sendreply (transp_l, pl->p_outproc, outdata)) + if (!INTUSE(svc_sendreply) (transp_l, pl->p_outproc, outdata)) { (void) __asprintf (&buf, _("trouble replying to prog %d\n"), diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c index 9416b7e78f..0a4a8a2601 100644 --- a/sunrpc/svc_tcp.c +++ b/sunrpc/svc_tcp.c @@ -160,13 +160,13 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize) } __bzero ((char *) &addr, sizeof (addr)); addr.sin_family = AF_INET; - if (bindresvport (sock, &addr)) + if (INTUSE(bindresvport) (sock, &addr)) { addr.sin_port = 0; - (void) bind (sock, (struct sockaddr *) &addr, len); + (void) __bind (sock, (struct sockaddr *) &addr, len); } - if ((getsockname (sock, (struct sockaddr *) &addr, &len) != 0) || - (listen (sock, 2) != 0)) + if ((__getsockname (sock, (struct sockaddr *) &addr, &len) != 0) || + (__listen (sock, 2) != 0)) { perror (_("svc_tcp.c - cannot getsockname or listen")); if (madesock) diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c index 40de3c5e79..b42d6144b9 100644 --- a/sunrpc/svc_udp.c +++ b/sunrpc/svc_udp.c @@ -133,12 +133,12 @@ svcudp_bufcreate (sock, sendsz, recvsz) } __bzero ((char *) &addr, sizeof (addr)); addr.sin_family = AF_INET; - if (bindresvport (sock, &addr)) + if (INTUSE(bindresvport) (sock, &addr)) { addr.sin_port = 0; - (void) bind (sock, (struct sockaddr *) &addr, len); + (void) __bind (sock, (struct sockaddr *) &addr, len); } - if (getsockname (sock, (struct sockaddr *) &addr, &len) != 0) + if (__getsockname (sock, (struct sockaddr *) &addr, &len) != 0) { perror (_("svcudp_create - cannot getsockname")); if (madesock) @@ -188,8 +188,8 @@ svcudp_bufcreate (sock, sendsz, recvsz) return NULL; } pad = 1; - if (setsockopt (sock, SOL_IP, IP_PKTINFO, (void *) &pad, - sizeof (pad)) == 0) + if (__setsockopt (sock, SOL_IP, IP_PKTINFO, (void *) &pad, + sizeof (pad)) == 0) /* Set the padding to all 1s. */ pad = 0xff; else @@ -201,14 +201,15 @@ svcudp_bufcreate (sock, sendsz, recvsz) xprt_register (xprt); return xprt; } +INTDEF (svcudp_bufcreate) SVCXPRT * svcudp_create (sock) int sock; { - - return svcudp_bufcreate (sock, UDPMSGSIZE, UDPMSGSIZE); + return INTUSE(svcudp_bufcreate) (sock, UDPMSGSIZE, UDPMSGSIZE); } +INTDEF (svcudp_create) static enum xprt_stat svcudp_stat (xprt) @@ -256,15 +257,15 @@ again: + sizeof (struct msghdr)]; mesgp->msg_controllen = sizeof(xprt->xp_pad) - sizeof (struct iovec) - sizeof (struct msghdr); - rlen = recvmsg (xprt->xp_sock, mesgp, 0); + rlen = __recvmsg (xprt->xp_sock, mesgp, 0); if (rlen >= 0) len = mesgp->msg_namelen; } else #endif - rlen = recvfrom (xprt->xp_sock, rpc_buffer (xprt), - (int) su->su_iosz, 0, - (struct sockaddr *) &(xprt->xp_raddr), &len); + rlen = __recvfrom (xprt->xp_sock, rpc_buffer (xprt), + (int) su->su_iosz, 0, + (struct sockaddr *) &(xprt->xp_raddr), &len); xprt->xp_addrlen = len; if (rlen == -1 && errno == EINTR) goto again; @@ -284,12 +285,12 @@ again: { iovp->iov_base = reply; iovp->iov_len = replylen; - (void) sendmsg (xprt->xp_sock, mesgp, 0); + (void) __sendmsg (xprt->xp_sock, mesgp, 0); } else #endif - (void) sendto (xprt->xp_sock, reply, (int) replylen, 0, - (struct sockaddr *) &xprt->xp_raddr, len); + (void) __sendto (xprt->xp_sock, reply, (int) replylen, 0, + (struct sockaddr *) &xprt->xp_raddr, len); return TRUE; } } @@ -323,13 +324,13 @@ svcudp_reply (xprt, msg) iovp = (struct iovec *) &xprt->xp_pad [0]; iovp->iov_base = rpc_buffer (xprt); iovp->iov_len = slen; - sent = sendmsg (xprt->xp_sock, mesgp, 0); + sent = __sendmsg (xprt->xp_sock, mesgp, 0); } else #endif - sent = sendto (xprt->xp_sock, rpc_buffer (xprt), slen, 0, - (struct sockaddr *) &(xprt->xp_raddr), - xprt->xp_addrlen); + sent = __sendto (xprt->xp_sock, rpc_buffer (xprt), slen, 0, + (struct sockaddr *) &(xprt->xp_raddr), + xprt->xp_addrlen); if (sent == slen) { stat = TRUE; diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c index afe4494a36..cfbc63866b 100644 --- a/sunrpc/svc_unix.c +++ b/sunrpc/svc_unix.c @@ -158,10 +158,10 @@ svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path) memcpy (addr.sun_path, path, len); len += sizeof (addr.sun_family); - bind (sock, (struct sockaddr *) &addr, len); + __bind (sock, (struct sockaddr *) &addr, len); - if (getsockname (sock, (struct sockaddr *) &addr, &len) != 0 - || listen (sock, 2) != 0) + if (__getsockname (sock, (struct sockaddr *) &addr, &len) != 0 + || __listen (sock, 2) != 0) { perror (_("svc_unix.c - cannot getsockname or listen")); if (madesock) @@ -334,13 +334,13 @@ __msgread (int sock, void *data, size_t cnt) #ifdef SO_PASSCRED { int on = 1; - if (setsockopt (sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on))) + if (__setsockopt (sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on))) return -1; } #endif restart: - len = recvmsg (sock, &msg, 0); + len = __recvmsg (sock, &msg, 0); if (len >= 0) { if (msg.msg_flags & MSG_CTRUNC || len == 0) @@ -391,7 +391,7 @@ __msgwrite (int sock, void *data, size_t cnt) msg.msg_flags = 0; restart: - len = sendmsg (sock, &msg, 0); + len = __sendmsg (sock, &msg, 0); if (len >= 0) return len; if (errno == EINTR) -- cgit v1.2.3