mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-15 19:08:21 +08:00
Update to FreeBSD head 2016-08-23
Git mirror commit 9fe7c416e6abb28b1398fd3e5687099846800cfd.
This commit is contained in:
@@ -90,14 +90,8 @@ static bool_t rpc_wrap_bcast(char *, struct netbuf *, struct netconfig *);
|
||||
* A common clnt create routine
|
||||
*/
|
||||
static CLIENT *
|
||||
clnt_com_create(raddr, prog, vers, sockp, sendsz, recvsz, tp)
|
||||
struct sockaddr_in *raddr;
|
||||
rpcprog_t prog;
|
||||
rpcvers_t vers;
|
||||
int *sockp;
|
||||
u_int sendsz;
|
||||
u_int recvsz;
|
||||
char *tp;
|
||||
clnt_com_create(struct sockaddr_in *raddr, rpcprog_t prog, rpcvers_t vers, int *sockp,
|
||||
u_int sendsz, u_int recvsz, char *tp)
|
||||
{
|
||||
CLIENT *cl;
|
||||
int madefd = FALSE;
|
||||
@@ -166,14 +160,8 @@ err: if (madefd == TRUE)
|
||||
}
|
||||
|
||||
CLIENT *
|
||||
clntudp_bufcreate(raddr, prog, vers, wait, sockp, sendsz, recvsz)
|
||||
struct sockaddr_in *raddr;
|
||||
u_long prog;
|
||||
u_long vers;
|
||||
struct timeval wait;
|
||||
int *sockp;
|
||||
u_int sendsz;
|
||||
u_int recvsz;
|
||||
clntudp_bufcreate(struct sockaddr_in *raddr, u_long prog, u_long vers,
|
||||
struct timeval wait, int *sockp, u_int sendsz, u_int recvsz)
|
||||
{
|
||||
CLIENT *cl;
|
||||
|
||||
@@ -187,12 +175,8 @@ clntudp_bufcreate(raddr, prog, vers, wait, sockp, sendsz, recvsz)
|
||||
}
|
||||
|
||||
CLIENT *
|
||||
clntudp_create(raddr, program, version, wait, sockp)
|
||||
struct sockaddr_in *raddr;
|
||||
u_long program;
|
||||
u_long version;
|
||||
struct timeval wait;
|
||||
int *sockp;
|
||||
clntudp_create(struct sockaddr_in *raddr, u_long program, u_long version,
|
||||
struct timeval wait, int *sockp)
|
||||
{
|
||||
|
||||
return clntudp_bufcreate(raddr, program, version, wait, sockp,
|
||||
@@ -200,13 +184,8 @@ clntudp_create(raddr, program, version, wait, sockp)
|
||||
}
|
||||
|
||||
CLIENT *
|
||||
clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
|
||||
struct sockaddr_in *raddr;
|
||||
u_long prog;
|
||||
u_long vers;
|
||||
int *sockp;
|
||||
u_int sendsz;
|
||||
u_int recvsz;
|
||||
clnttcp_create(struct sockaddr_in *raddr, u_long prog, u_long vers, int *sockp,
|
||||
u_int sendsz, u_int recvsz)
|
||||
{
|
||||
|
||||
return clnt_com_create(raddr, (rpcprog_t)prog, (rpcvers_t)vers, sockp,
|
||||
@@ -214,9 +193,7 @@ clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
|
||||
}
|
||||
|
||||
CLIENT *
|
||||
clntraw_create(prog, vers)
|
||||
u_long prog;
|
||||
u_long vers;
|
||||
clntraw_create(u_long prog, u_long vers)
|
||||
{
|
||||
|
||||
return clnt_raw_create((rpcprog_t)prog, (rpcvers_t)vers);
|
||||
@@ -226,11 +203,7 @@ clntraw_create(prog, vers)
|
||||
* A common server create routine
|
||||
*/
|
||||
static SVCXPRT *
|
||||
svc_com_create(fd, sendsize, recvsize, netid)
|
||||
int fd;
|
||||
u_int sendsize;
|
||||
u_int recvsize;
|
||||
char *netid;
|
||||
svc_com_create(int fd, u_int sendsize, u_int recvsize, char *netid)
|
||||
{
|
||||
struct netconfig *nconf;
|
||||
SVCXPRT *svc;
|
||||
@@ -270,29 +243,21 @@ svc_com_create(fd, sendsize, recvsize, netid)
|
||||
}
|
||||
|
||||
SVCXPRT *
|
||||
svctcp_create(fd, sendsize, recvsize)
|
||||
int fd;
|
||||
u_int sendsize;
|
||||
u_int recvsize;
|
||||
svctcp_create(int fd, u_int sendsize, u_int recvsize)
|
||||
{
|
||||
|
||||
return svc_com_create(fd, sendsize, recvsize, "tcp");
|
||||
}
|
||||
|
||||
SVCXPRT *
|
||||
svcudp_bufcreate(fd, sendsz, recvsz)
|
||||
int fd;
|
||||
u_int sendsz, recvsz;
|
||||
svcudp_bufcreate(int fd, u_int sendsz, u_int recvsz)
|
||||
{
|
||||
|
||||
return svc_com_create(fd, sendsz, recvsz, "udp");
|
||||
}
|
||||
|
||||
SVCXPRT *
|
||||
svcfd_create(fd, sendsize, recvsize)
|
||||
int fd;
|
||||
u_int sendsize;
|
||||
u_int recvsize;
|
||||
svcfd_create(int fd, u_int sendsize, u_int recvsize)
|
||||
{
|
||||
|
||||
return svc_fd_create(fd, sendsize, recvsize);
|
||||
@@ -300,23 +265,21 @@ svcfd_create(fd, sendsize, recvsize)
|
||||
|
||||
|
||||
SVCXPRT *
|
||||
svcudp_create(fd)
|
||||
int fd;
|
||||
svcudp_create(int fd)
|
||||
{
|
||||
|
||||
return svc_com_create(fd, UDPMSGSIZE, UDPMSGSIZE, "udp");
|
||||
}
|
||||
|
||||
SVCXPRT *
|
||||
svcraw_create()
|
||||
svcraw_create(void)
|
||||
{
|
||||
|
||||
return svc_raw_create();
|
||||
}
|
||||
|
||||
int
|
||||
get_myaddress(addr)
|
||||
struct sockaddr_in *addr;
|
||||
get_myaddress(struct sockaddr_in *addr)
|
||||
{
|
||||
|
||||
memset((void *) addr, 0, sizeof(*addr));
|
||||
@@ -330,11 +293,8 @@ get_myaddress(addr)
|
||||
* For connectionless "udp" transport. Obsoleted by rpc_call().
|
||||
*/
|
||||
int
|
||||
callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
|
||||
const char *host;
|
||||
int prognum, versnum, procnum;
|
||||
xdrproc_t inproc, outproc;
|
||||
void *in, *out;
|
||||
callrpc(const char *host, int prognum, int versnum, int procnum,
|
||||
xdrproc_t inproc, void *in, xdrproc_t outproc, void *out)
|
||||
{
|
||||
|
||||
return (int)rpc_call(host, (rpcprog_t)prognum, (rpcvers_t)versnum,
|
||||
@@ -345,10 +305,9 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
|
||||
* For connectionless kind of transport. Obsoleted by rpc_reg()
|
||||
*/
|
||||
int
|
||||
registerrpc(prognum, versnum, procnum, progname, inproc, outproc)
|
||||
int prognum, versnum, procnum;
|
||||
char *(*progname)(char [UDPMSGSIZE]);
|
||||
xdrproc_t inproc, outproc;
|
||||
registerrpc(int prognum, int versnum, int procnum,
|
||||
char *(*progname)(char [UDPMSGSIZE]),
|
||||
xdrproc_t inproc, xdrproc_t outproc)
|
||||
{
|
||||
|
||||
return rpc_reg((rpcprog_t)prognum, (rpcvers_t)versnum,
|
||||
@@ -376,10 +335,12 @@ clnt_broadcast_key_init(void)
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
static bool_t
|
||||
rpc_wrap_bcast(resultp, addr, nconf)
|
||||
char *resultp; /* results of the call */
|
||||
struct netbuf *addr; /* address of the guy who responded */
|
||||
struct netconfig *nconf; /* Netconf of the transport */
|
||||
rpc_wrap_bcast(char *resultp, struct netbuf *addr, struct netconfig *nconf)
|
||||
/*
|
||||
* char *resultp; // results of the call
|
||||
* struct netbuf *addr; // address of the guy who responded
|
||||
* struct netconfig *nconf; // Netconf of the transport
|
||||
*/
|
||||
{
|
||||
resultproc_t clnt_broadcast_result;
|
||||
|
||||
@@ -397,15 +358,18 @@ rpc_wrap_bcast(resultp, addr, nconf)
|
||||
* Broadcasts on UDP transport. Obsoleted by rpc_broadcast().
|
||||
*/
|
||||
enum clnt_stat
|
||||
clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
|
||||
u_long prog; /* program number */
|
||||
u_long vers; /* version number */
|
||||
u_long proc; /* procedure number */
|
||||
xdrproc_t xargs; /* xdr routine for args */
|
||||
void *argsp; /* pointer to args */
|
||||
xdrproc_t xresults; /* xdr routine for results */
|
||||
void *resultsp; /* pointer to results */
|
||||
resultproc_t eachresult; /* call with each result obtained */
|
||||
clnt_broadcast(u_long prog, u_long vers, u_long proc, xdrproc_t xargs,
|
||||
void *argsp, xdrproc_t xresults, void *resultsp, resultproc_t eachresult)
|
||||
/*
|
||||
* u_long prog; // program number
|
||||
* u_long vers; // version number
|
||||
* u_long proc; // procedure number
|
||||
* xdrproc_t xargs; // xdr routine for args
|
||||
* void *argsp; // pointer to args
|
||||
* xdrproc_t xresults; // xdr routine for results
|
||||
* void *resultsp; // pointer to results
|
||||
* resultproc_t eachresult; // call with each result obtained
|
||||
*/
|
||||
{
|
||||
|
||||
if (thr_main())
|
||||
@@ -424,11 +388,14 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
|
||||
* authdes_seccreate().
|
||||
*/
|
||||
AUTH *
|
||||
authdes_create(servername, window, syncaddr, ckey)
|
||||
char *servername; /* network name of server */
|
||||
u_int window; /* time to live */
|
||||
struct sockaddr *syncaddr; /* optional hostaddr to sync with */
|
||||
des_block *ckey; /* optional conversation key to use */
|
||||
authdes_create(char *servername, u_int window, struct sockaddr *syncaddr,
|
||||
des_block *ckey)
|
||||
/*
|
||||
* char *servername; // network name of server
|
||||
* u_int window; // time to live
|
||||
* struct sockaddr *syncaddr; // optional hostaddr to sync with
|
||||
* des_block *ckey; // optional conversation key to use
|
||||
*/
|
||||
{
|
||||
AUTH *dummy;
|
||||
AUTH *nauth;
|
||||
@@ -455,27 +422,19 @@ fallback:
|
||||
* Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
|
||||
*/
|
||||
CLIENT *
|
||||
clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
|
||||
struct sockaddr_un *raddr;
|
||||
u_long prog;
|
||||
u_long vers;
|
||||
int *sockp;
|
||||
u_int sendsz;
|
||||
u_int recvsz;
|
||||
clntunix_create(struct sockaddr_un *raddr, u_long prog, u_long vers, int *sockp,
|
||||
u_int sendsz, u_int recvsz)
|
||||
{
|
||||
struct netbuf *svcaddr;
|
||||
struct netconfig *nconf;
|
||||
CLIENT *cl;
|
||||
int len;
|
||||
|
||||
cl = NULL;
|
||||
nconf = NULL;
|
||||
svcaddr = NULL;
|
||||
if ((raddr->sun_len == 0) ||
|
||||
((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) ||
|
||||
((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) {
|
||||
if (svcaddr != NULL)
|
||||
free(svcaddr);
|
||||
free(svcaddr);
|
||||
rpc_createerr.cf_stat = RPC_SYSTEMERROR;
|
||||
rpc_createerr.cf_error.re_errno = errno;
|
||||
return(cl);
|
||||
@@ -508,11 +467,7 @@ done:
|
||||
* Obsoleted by svc_vc_create().
|
||||
*/
|
||||
SVCXPRT *
|
||||
svcunix_create(sock, sendsize, recvsize, path)
|
||||
int sock;
|
||||
u_int sendsize;
|
||||
u_int recvsize;
|
||||
char *path;
|
||||
svcunix_create(int sock, u_int sendsize, u_int recvsize, char *path)
|
||||
{
|
||||
struct netconfig *nconf;
|
||||
void *localhandle;
|
||||
@@ -530,7 +485,7 @@ svcunix_create(sock, sendsize, recvsize, path)
|
||||
break;
|
||||
}
|
||||
if (nconf == NULL)
|
||||
return(xprt);
|
||||
goto done;
|
||||
|
||||
if ((sock = __rpc_nconf2fd(nconf)) < 0)
|
||||
goto done;
|
||||
@@ -572,10 +527,7 @@ done:
|
||||
* descriptor as its first input. Obsoleted by svc_fd_create();
|
||||
*/
|
||||
SVCXPRT *
|
||||
svcunixfd_create(fd, sendsize, recvsize)
|
||||
int fd;
|
||||
u_int sendsize;
|
||||
u_int recvsize;
|
||||
svcunixfd_create(int fd, u_int sendsize, u_int recvsize)
|
||||
{
|
||||
return (svc_fd_create(fd, sendsize, recvsize));
|
||||
}
|
||||
|
Reference in New Issue
Block a user