mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +00:00
82f43dd2d1
Every file that uses libc_hidden_nolink_sunrpc or libnsl_hidden_nolink_def needs to include shlib-compat.h. Currently, most of them are getting it via stdio.h, because libio.h refers to SHLIB_COMPAT when _LIBC is defined, so it includes shlib-compat.h. My experimental patch to not install libio.h breaks that chain; stdio.h no longer pulls in libio.h even for internal users. Accordingly, this patch adds #include <shlib-compat.h> to many files in sunrpc/ and nis/. There are also a small number of really obvious fixups to includes that caught my eye while proofreading the patch - not including headers twice in a row, not worrying about portability to Ultrix anymore, sort of thing. * nis/nis_add.c, nis/nis_addmember.c, nis/nis_call.c * nis/nis_checkpoint.c, nis/nis_clone_dir.c, nis/nis_clone_obj.c * nis/nis_clone_res.c, nis/nis_creategroup.c, nis/nis_defaults.c * nis/nis_destroygroup.c, nis/nis_domain_of.c * nis/nis_domain_of_r.c, nis/nis_error.c, nis/nis_file.c * nis/nis_free.c, nis/nis_getservlist.c, nis/nis_ismember.c * nis/nis_local_names.c, nis/nis_lookup.c, nis/nis_mkdir.c * nis/nis_modify.c, nis/nis_ping.c, nis/nis_print.c * nis/nis_print_group_entry.c, nis/nis_remove.c * nis/nis_removemember.c, nis/nis_rmdir.c, nis/nis_server.c * nis/nis_subr.c, nis/nis_table.c, nis/nis_util.c * nis/nis_verifygroup.c, nis/nis_xdr.c, nis/yp_xdr.c * nis/ypclnt.c, nis/ypupdate_xdr.c, sunrpc/auth_des.c * sunrpc/auth_none.c, sunrpc/auth_unix.c, sunrpc/authdes_prot.c * sunrpc/authuxprot.c, sunrpc/clnt_gen.c, sunrpc/clnt_perr.c * sunrpc/clnt_raw.c, sunrpc/clnt_simp.c, sunrpc/clnt_tcp.c * sunrpc/clnt_udp.c, sunrpc/clnt_unix.c, sunrpc/des_crypt.c * sunrpc/des_soft.c, sunrpc/get_myaddr.c, sunrpc/key_call.c * sunrpc/key_prot.c, sunrpc/netname.c, sunrpc/pm_getmaps.c * sunrpc/pm_getport.c, sunrpc/pmap_clnt.c, sunrpc/pmap_prot.c * sunrpc/pmap_prot2.c, sunrpc/pmap_rmt.c, sunrpc/publickey.c * sunrpc/rpc_cmsg.c, sunrpc/rpc_dtable.c, sunrpc/rpc_prot.c * sunrpc/rpc_thread.c, sunrpc/rtime.c, sunrpc/svc.c * sunrpc/svc_auth.c, sunrpc/svc_raw.c, sunrpc/svc_run.c * sunrpc/svc_tcp.c, sunrpc/svc_udp.c, sunrpc/svc_unix.c * sunrpc/svcauth_des.c, sunrpc/xdr.c, sunrpc/xdr_array.c * sunrpc/xdr_float.c, sunrpc/xdr_intXX_t.c, sunrpc/xdr_mem.c * sunrpc/xdr_rec.c, sunrpc/xdr_ref.c, sunrpc/xdr_sizeof.c * sunrpc/xdr_stdio.c: Include shlib-compat.h. * sunrpc/des_crypt.c, sunrpc/des_soft.c: No need to include abi-versions.h as well as shlib-compat.h. * sunrpc/get_myaddr.c: Remove obsolete comment. * sunrpc/pmap_rmt.c: Remove obsolete comment and #undef. * sunrpc/rpc_thread.c: Include libc-lock.h only once. * resolv/res_libc.c: Include shlib-compat.h only once.
139 lines
4.1 KiB
C
139 lines
4.1 KiB
C
/*
|
|
* clnt_simple.c
|
|
* Simplified front end to rpc.
|
|
*
|
|
* Copyright (c) 2010, Oracle America, Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
* * Neither the name of the "Oracle America, Inc." nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
|
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
|
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <alloca.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <rpc/rpc.h>
|
|
#include <sys/socket.h>
|
|
#include <netdb.h>
|
|
#include <string.h>
|
|
#include <shlib-compat.h>
|
|
|
|
struct callrpc_private_s
|
|
{
|
|
CLIENT *client;
|
|
int socket;
|
|
u_long oldprognum, oldversnum, valid;
|
|
char *oldhost;
|
|
};
|
|
#ifdef _RPC_THREAD_SAFE_
|
|
#define callrpc_private RPC_THREAD_VARIABLE(callrpc_private_s)
|
|
#else
|
|
static struct callrpc_private_s *callrpc_private;
|
|
#endif
|
|
|
|
int
|
|
callrpc (const char *host, u_long prognum, u_long versnum, u_long procnum,
|
|
xdrproc_t inproc, const char *in, xdrproc_t outproc, char *out)
|
|
{
|
|
struct callrpc_private_s *crp = callrpc_private;
|
|
struct sockaddr_in server_addr;
|
|
enum clnt_stat clnt_stat;
|
|
struct timeval timeout, tottimeout;
|
|
|
|
if (crp == 0)
|
|
{
|
|
crp = (struct callrpc_private_s *) calloc (1, sizeof (*crp));
|
|
if (crp == 0)
|
|
return 0;
|
|
callrpc_private = crp;
|
|
}
|
|
if (crp->oldhost == NULL)
|
|
{
|
|
crp->oldhost = malloc (256);
|
|
crp->oldhost[0] = 0;
|
|
crp->socket = RPC_ANYSOCK;
|
|
}
|
|
if (crp->valid && crp->oldprognum == prognum && crp->oldversnum == versnum
|
|
&& strcmp (crp->oldhost, host) == 0)
|
|
{
|
|
/* reuse old client */
|
|
}
|
|
else
|
|
{
|
|
crp->valid = 0;
|
|
if (crp->socket != RPC_ANYSOCK)
|
|
{
|
|
(void) __close (crp->socket);
|
|
crp->socket = RPC_ANYSOCK;
|
|
}
|
|
if (crp->client)
|
|
{
|
|
clnt_destroy (crp->client);
|
|
crp->client = NULL;
|
|
}
|
|
|
|
if (__libc_rpc_gethostbyname (host, &server_addr) != 0)
|
|
return (int) get_rpc_createerr().cf_stat;
|
|
|
|
timeout.tv_usec = 0;
|
|
timeout.tv_sec = 5;
|
|
if ((crp->client = clntudp_create (&server_addr, (u_long) prognum,
|
|
(u_long) versnum, timeout, &crp->socket)) == NULL)
|
|
return (int) get_rpc_createerr().cf_stat;
|
|
crp->valid = 1;
|
|
crp->oldprognum = prognum;
|
|
crp->oldversnum = versnum;
|
|
(void) strncpy (crp->oldhost, host, 255);
|
|
crp->oldhost[255] = '\0';
|
|
}
|
|
tottimeout.tv_sec = 25;
|
|
tottimeout.tv_usec = 0;
|
|
clnt_stat = clnt_call (crp->client, procnum, inproc, (char *) in,
|
|
outproc, out, tottimeout);
|
|
/*
|
|
* if call failed, empty cache
|
|
*/
|
|
if (clnt_stat != RPC_SUCCESS)
|
|
crp->valid = 0;
|
|
return (int) clnt_stat;
|
|
}
|
|
libc_hidden_nolink_sunrpc (callrpc, GLIBC_2_0)
|
|
|
|
#ifdef _RPC_THREAD_SAFE_
|
|
void
|
|
__rpc_thread_clnt_cleanup (void)
|
|
{
|
|
struct callrpc_private_s *rcp = RPC_THREAD_VARIABLE(callrpc_private_s);
|
|
|
|
if (rcp) {
|
|
if (rcp->client)
|
|
CLNT_DESTROY (rcp->client);
|
|
free (rcp);
|
|
}
|
|
}
|
|
#endif /* _RPC_THREAD_SAFE_ */
|