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.
251 lines
6.6 KiB
C
251 lines
6.6 KiB
C
/*
|
|
* clnt_raw.c
|
|
*
|
|
* 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.
|
|
*
|
|
* Memory based rpc for simple testing and timing.
|
|
* Interface to create an rpc client and server in the same process.
|
|
* This lets us simulate rpc and get round trip overhead, without
|
|
* any interference from the kernel.
|
|
*/
|
|
|
|
#include <rpc/rpc.h>
|
|
#include <rpc/svc.h>
|
|
#include <rpc/xdr.h>
|
|
#include <libintl.h>
|
|
#include <shlib-compat.h>
|
|
|
|
#define MCALL_MSG_SIZE 24
|
|
|
|
/*
|
|
* This is the "network" we will be moving stuff over.
|
|
*/
|
|
struct clntraw_private_s
|
|
{
|
|
CLIENT client_object;
|
|
XDR xdr_stream;
|
|
char _raw_buf[UDPMSGSIZE];
|
|
union
|
|
{
|
|
char msg[MCALL_MSG_SIZE];
|
|
u_long rm_xid;
|
|
} mashl_callmsg;
|
|
u_int mcnt;
|
|
};
|
|
#ifdef _RPC_THREAD_SAFE_
|
|
#define clntraw_private RPC_THREAD_VARIABLE(clntraw_private_s)
|
|
#else
|
|
static struct clntraw_private_s *clntraw_private;
|
|
#endif
|
|
|
|
static enum clnt_stat clntraw_call (CLIENT *, u_long, xdrproc_t, caddr_t,
|
|
xdrproc_t, caddr_t, struct timeval);
|
|
static void clntraw_abort (void);
|
|
static void clntraw_geterr (CLIENT *, struct rpc_err *);
|
|
static bool_t clntraw_freeres (CLIENT *, xdrproc_t, caddr_t);
|
|
static bool_t clntraw_control (CLIENT *, int, char *);
|
|
static void clntraw_destroy (CLIENT *);
|
|
|
|
static const struct clnt_ops client_ops =
|
|
{
|
|
clntraw_call,
|
|
clntraw_abort,
|
|
clntraw_geterr,
|
|
clntraw_freeres,
|
|
clntraw_destroy,
|
|
clntraw_control
|
|
};
|
|
|
|
/*
|
|
* Create a client handle for memory based rpc.
|
|
*/
|
|
CLIENT *
|
|
clntraw_create (u_long prog, u_long vers)
|
|
{
|
|
struct clntraw_private_s *clp = clntraw_private;
|
|
struct rpc_msg call_msg;
|
|
XDR *xdrs;
|
|
CLIENT *client;
|
|
|
|
if (clp == 0)
|
|
{
|
|
clp = (struct clntraw_private_s *) calloc (1, sizeof (*clp));
|
|
if (clp == 0)
|
|
return (0);
|
|
clntraw_private = clp;
|
|
}
|
|
xdrs = &clp->xdr_stream;
|
|
client = &clp->client_object;
|
|
/*
|
|
* pre-serialize the static part of the call msg and stash it away
|
|
*/
|
|
call_msg.rm_direction = CALL;
|
|
call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
|
|
call_msg.rm_call.cb_prog = prog;
|
|
call_msg.rm_call.cb_vers = vers;
|
|
xdrmem_create (xdrs, clp->mashl_callmsg.msg, MCALL_MSG_SIZE, XDR_ENCODE);
|
|
if (!xdr_callhdr (xdrs, &call_msg))
|
|
{
|
|
perror (_ ("clnt_raw.c: fatal header serialization error"));
|
|
}
|
|
clp->mcnt = XDR_GETPOS (xdrs);
|
|
XDR_DESTROY (xdrs);
|
|
|
|
/*
|
|
* Set xdrmem for client/server shared buffer
|
|
*/
|
|
xdrmem_create (xdrs, clp->_raw_buf, UDPMSGSIZE, XDR_FREE);
|
|
|
|
/*
|
|
* create client handle
|
|
*/
|
|
client->cl_ops = (struct clnt_ops *) &client_ops;
|
|
client->cl_auth = authnone_create ();
|
|
return client;
|
|
}
|
|
libc_hidden_nolink_sunrpc (clntraw_create, GLIBC_2_0)
|
|
|
|
static enum clnt_stat
|
|
clntraw_call (CLIENT *h, u_long proc, xdrproc_t xargs, caddr_t argsp,
|
|
xdrproc_t xresults, caddr_t resultsp, struct timeval timeout)
|
|
{
|
|
struct clntraw_private_s *clp = clntraw_private;
|
|
XDR *xdrs = &clp->xdr_stream;
|
|
struct rpc_msg msg;
|
|
enum clnt_stat status;
|
|
struct rpc_err error;
|
|
|
|
if (clp == NULL)
|
|
return RPC_FAILED;
|
|
call_again:
|
|
/*
|
|
* send request
|
|
*/
|
|
xdrs->x_op = XDR_ENCODE;
|
|
XDR_SETPOS (xdrs, 0);
|
|
/* Just checking the union definition to access rm_xid is correct. */
|
|
if (offsetof (struct rpc_msg, rm_xid) != 0)
|
|
abort ();
|
|
clp->mashl_callmsg.rm_xid++;
|
|
if ((!XDR_PUTBYTES (xdrs, clp->mashl_callmsg.msg, clp->mcnt)) ||
|
|
(!XDR_PUTLONG (xdrs, (long *) &proc)) ||
|
|
(!AUTH_MARSHALL (h->cl_auth, xdrs)) ||
|
|
(!(*xargs) (xdrs, argsp)))
|
|
{
|
|
return (RPC_CANTENCODEARGS);
|
|
}
|
|
(void) XDR_GETPOS (xdrs); /* called just to cause overhead */
|
|
|
|
/*
|
|
* We have to call server input routine here because this is
|
|
* all going on in one process. Yuk.
|
|
*/
|
|
svc_getreq (1);
|
|
|
|
/*
|
|
* get results
|
|
*/
|
|
xdrs->x_op = XDR_DECODE;
|
|
XDR_SETPOS (xdrs, 0);
|
|
msg.acpted_rply.ar_verf = _null_auth;
|
|
msg.acpted_rply.ar_results.where = resultsp;
|
|
msg.acpted_rply.ar_results.proc = xresults;
|
|
if (!xdr_replymsg (xdrs, &msg))
|
|
return RPC_CANTDECODERES;
|
|
_seterr_reply (&msg, &error);
|
|
status = error.re_status;
|
|
|
|
if (status == RPC_SUCCESS)
|
|
{
|
|
if (!AUTH_VALIDATE (h->cl_auth, &msg.acpted_rply.ar_verf))
|
|
{
|
|
status = RPC_AUTHERROR;
|
|
}
|
|
} /* end successful completion */
|
|
else
|
|
{
|
|
if (AUTH_REFRESH (h->cl_auth))
|
|
goto call_again;
|
|
} /* end of unsuccessful completion */
|
|
|
|
if (status == RPC_SUCCESS)
|
|
{
|
|
if (!AUTH_VALIDATE (h->cl_auth, &msg.acpted_rply.ar_verf))
|
|
{
|
|
status = RPC_AUTHERROR;
|
|
}
|
|
if (msg.acpted_rply.ar_verf.oa_base != NULL)
|
|
{
|
|
xdrs->x_op = XDR_FREE;
|
|
(void) xdr_opaque_auth (xdrs, &(msg.acpted_rply.ar_verf));
|
|
}
|
|
}
|
|
|
|
return status;
|
|
}
|
|
|
|
static void
|
|
clntraw_geterr (CLIENT *cl, struct rpc_err *err)
|
|
{
|
|
}
|
|
|
|
|
|
static bool_t
|
|
clntraw_freeres (CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr)
|
|
{
|
|
struct clntraw_private_s *clp = clntraw_private;
|
|
XDR *xdrs = &clp->xdr_stream;
|
|
bool_t rval;
|
|
|
|
if (clp == NULL)
|
|
{
|
|
rval = (bool_t) RPC_FAILED;
|
|
return rval;
|
|
}
|
|
xdrs->x_op = XDR_FREE;
|
|
return (*xdr_res) (xdrs, res_ptr);
|
|
}
|
|
|
|
static void
|
|
clntraw_abort (void)
|
|
{
|
|
}
|
|
|
|
static bool_t
|
|
clntraw_control (CLIENT *cl, int i, char *c)
|
|
{
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
clntraw_destroy (CLIENT *cl)
|
|
{
|
|
}
|