diff options
Diffstat (limited to 'libc/inet/rpc/clnt_tcp.c')
| -rw-r--r-- | libc/inet/rpc/clnt_tcp.c | 775 | 
1 files changed, 426 insertions, 349 deletions
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c index 790ec0706..5ff8434b7 100644 --- a/libc/inet/rpc/clnt_tcp.c +++ b/libc/inet/rpc/clnt_tcp.c @@ -6,29 +6,30 @@   * may copy or modify Sun RPC without charge, but are not authorized   * to license or distribute it to anyone else except as part of a product or   * program developed by the user. - *  + *   * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE   * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR   * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - *  + *   * Sun RPC is provided with no support and without any obligation on the   * part of Sun Microsystems, Inc. to assist in its use, correction,   * modification or enhancement. - *  + *   * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE   * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC   * OR ANY PART THEREOF. - *  + *   * In no event will Sun Microsystems, Inc. be liable for any lost revenue   * or profits or other special, indirect and consequential damages, even if   * Sun has been advised of the possibility of such damages. - *  + *   * Sun Microsystems, Inc.   * 2550 Garcia Avenue   * Mountain View, California  94043   */ -#define __FORCE_GLIBC -#include <features.h> +#if !defined(lint) && defined(SCCSIDS) +static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; +#endif  /*   * clnt_tcp.c, Implements a TCP/IP based, client side RPC. @@ -49,47 +50,57 @@   * Now go hang yourself.   */ +#define __FORCE_GLIBC +#include <features.h> + +#include <netdb.h> +#include <errno.h>  #include <stdio.h> +#include <unistd.h>  #include <rpc/rpc.h> +#include <sys/poll.h>  #include <sys/socket.h> -#include <netdb.h> -#include <errno.h>  #include <rpc/pmap_clnt.h> -#include <unistd.h> +#ifdef USE_IN_LIBIO +# include <wchar.h> +#endif -#define MCALL_MSG_SIZE 24 +extern u_long _create_xid (void); -extern int errno; - -static int readtcp(); -static int writetcp(); - -static enum clnt_stat clnttcp_call(); -static void clnttcp_abort(); -static void clnttcp_geterr(); -static bool_t clnttcp_freeres(); -static bool_t clnttcp_control(); -static void clnttcp_destroy(); - -static struct clnt_ops tcp_ops = { -	clnttcp_call, -	clnttcp_abort, -	clnttcp_geterr, -	clnttcp_freeres, -	clnttcp_destroy, -	clnttcp_control -}; +#define MCALL_MSG_SIZE 24 -struct ct_data { -	int ct_sock; -	bool_t ct_closeit; -	struct timeval ct_wait; -	bool_t ct_waitset;			/* wait set by clnt_control? */ -	struct sockaddr_in ct_addr; -	struct rpc_err ct_error; -	char ct_mcall[MCALL_MSG_SIZE];	/* marshalled callmsg */ -	u_int ct_mpos;				/* pos after marshal */ -	XDR ct_xdrs; +struct ct_data +  { +    int ct_sock; +    bool_t ct_closeit; +    struct timeval ct_wait; +    bool_t ct_waitset;		/* wait set by clnt_control? */ +    struct sockaddr_in ct_addr; +    struct rpc_err ct_error; +    char ct_mcall[MCALL_MSG_SIZE];	/* marshalled callmsg */ +    u_int ct_mpos;		/* pos after marshal */ +    XDR ct_xdrs; +  }; + +static int readtcp (char *, char *, int); +static int writetcp (char *, char *, int); + +static enum clnt_stat clnttcp_call (CLIENT *, u_long, xdrproc_t, caddr_t, +				    xdrproc_t, caddr_t, struct timeval); +static void clnttcp_abort (void); +static void clnttcp_geterr (CLIENT *, struct rpc_err *); +static bool_t clnttcp_freeres (CLIENT *, xdrproc_t, caddr_t); +static bool_t clnttcp_control (CLIENT *, int, char *); +static void clnttcp_destroy (CLIENT *); + +static struct clnt_ops tcp_ops = +{ +  clnttcp_call, +  clnttcp_abort, +  clnttcp_geterr, +  clnttcp_freeres, +  clnttcp_destroy, +  clnttcp_control  };  /* @@ -106,282 +117,355 @@ struct ct_data {   * NB: The rpch->cl_auth is set null authentication.  Caller may wish to set this   * something more useful.   */ -CLIENT *clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz) -struct sockaddr_in *raddr; -u_long prog; -u_long vers; -register int *sockp; -u_int sendsz; -u_int recvsz; +CLIENT * +clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers, +		int *sockp, u_int sendsz, u_int recvsz)  { -	CLIENT *h; -	register struct ct_data *ct; -	struct timeval now; -	struct rpc_msg call_msg; - -	ct = NULL;					/* in case of fooy */ -	h = (CLIENT *) mem_alloc(sizeof(*h)); -	if (h == NULL) { -		(void) fprintf(stderr, "clnttcp_create: out of memory\n"); -		rpc_createerr.cf_stat = RPC_SYSTEMERROR; -		rpc_createerr.cf_error.re_errno = errno; -		goto fooy; +  CLIENT *h; +  struct ct_data *ct; +  struct rpc_msg call_msg; + +  h = (CLIENT *) mem_alloc (sizeof (*h)); +  ct = (struct ct_data *) mem_alloc (sizeof (*ct)); +  if (h == NULL || ct == NULL) +    { +      struct rpc_createerr *ce = &get_rpc_createerr (); +#ifdef USE_IN_LIBIO +      if (_IO_fwide (stderr, 0) > 0) +	(void) __fwprintf (stderr, L"%s", +			   _("clnttcp_create: out of memory\n")); +      else +#endif +	(void) fputs (_("clnttcp_create: out of memory\n"), stderr); +      ce->cf_stat = RPC_SYSTEMERROR; +      ce->cf_error.re_errno = ENOMEM; +      goto fooy; +    } + +  /* +   * If no port number given ask the pmap for one +   */ +  if (raddr->sin_port == 0) +    { +      u_short port; +      if ((port = pmap_getport (raddr, prog, vers, IPPROTO_TCP)) == 0) +	{ +	  mem_free ((caddr_t) ct, sizeof (struct ct_data)); +	  mem_free ((caddr_t) h, sizeof (CLIENT)); +	  return ((CLIENT *) NULL);  	} -	ct = (struct ct_data *) mem_alloc(sizeof(*ct)); -	if (ct == NULL) { -		(void) fprintf(stderr, "clnttcp_create: out of memory\n"); -		rpc_createerr.cf_stat = RPC_SYSTEMERROR; -		rpc_createerr.cf_error.re_errno = errno; -		goto fooy; +      raddr->sin_port = htons (port); +    } + +  /* +   * If no socket given, open one +   */ +  if (*sockp < 0) +    { +      *sockp = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); +      (void) bindresvport (*sockp, (struct sockaddr_in *) 0); +      if ((*sockp < 0) +	  || (connect (*sockp, (struct sockaddr *) raddr, +			 sizeof (*raddr)) < 0)) +	{ +	  struct rpc_createerr *ce = &get_rpc_createerr (); +	  ce->cf_stat = RPC_SYSTEMERROR; +	  ce->cf_error.re_errno = errno; +	  if (*sockp >= 0) +	    (void) close (*sockp); +	  goto fooy;  	} - -	/* -	 * If no port number given ask the pmap for one -	 */ -	if (raddr->sin_port == 0) { -		u_short port; - -		if ((port = pmap_getport(raddr, prog, vers, IPPROTO_TCP)) == 0) { -			mem_free((caddr_t) ct, sizeof(struct ct_data)); - -			mem_free((caddr_t) h, sizeof(CLIENT)); -			return ((CLIENT *) NULL); -		} -		raddr->sin_port = htons(port); -	} - -	/* -	 * If no socket given, open one -	 */ -	if (*sockp < 0) { -		*sockp = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); -		(void) bindresvport(*sockp, (struct sockaddr_in *) 0); -		if ((*sockp < 0) -			|| (connect(*sockp, (struct sockaddr *) raddr, -						sizeof(*raddr)) < 0)) { -			rpc_createerr.cf_stat = RPC_SYSTEMERROR; -			rpc_createerr.cf_error.re_errno = errno; -			(void) close(*sockp); -			goto fooy; -		} -		ct->ct_closeit = TRUE; -	} else { -		ct->ct_closeit = FALSE; +      ct->ct_closeit = TRUE; +    } +  else +    { +      ct->ct_closeit = FALSE; +    } + +  /* +   * Set up private data struct +   */ +  ct->ct_sock = *sockp; +  ct->ct_wait.tv_usec = 0; +  ct->ct_waitset = FALSE; +  ct->ct_addr = *raddr; + +  /* +   * Initialize call message +   */ +  call_msg.rm_xid = _create_xid (); +  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; + +  /* +   * pre-serialize the static part of the call msg and stash it away +   */ +  xdrmem_create (&(ct->ct_xdrs), ct->ct_mcall, MCALL_MSG_SIZE, +		 XDR_ENCODE); +  if (!xdr_callhdr (&(ct->ct_xdrs), &call_msg)) +    { +      if (ct->ct_closeit) +	{ +	  (void) close (*sockp);  	} - -	/* -	 * Set up private data struct -	 */ -	ct->ct_sock = *sockp; -	ct->ct_wait.tv_usec = 0; -	ct->ct_waitset = FALSE; -	ct->ct_addr = *raddr; - -	/* -	 * Initialize call message -	 */ -	(void) gettimeofday(&now, (struct timezone *) 0); -	call_msg.rm_xid = getpid() ^ now.tv_sec ^ now.tv_usec; -	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; - -	/* -	 * pre-serialize the staic part of the call msg and stash it away -	 */ -	xdrmem_create(&(ct->ct_xdrs), ct->ct_mcall, MCALL_MSG_SIZE, -				  XDR_ENCODE); -	if (!xdr_callhdr(&(ct->ct_xdrs), &call_msg)) { -		if (ct->ct_closeit) { -			(void) close(*sockp); -		} -		goto fooy; -	} -	ct->ct_mpos = XDR_GETPOS(&(ct->ct_xdrs)); -	XDR_DESTROY(&(ct->ct_xdrs)); - -	/* -	 * Create a client handle which uses xdrrec for serialization -	 * and authnone for authentication. -	 */ -	xdrrec_create(&(ct->ct_xdrs), sendsz, recvsz, -				  (caddr_t) ct, readtcp, writetcp); -	h->cl_ops = &tcp_ops; -	h->cl_private = (caddr_t) ct; -	h->cl_auth = authnone_create(); -	return (h); - -  fooy: -	/* -	 * Something goofed, free stuff and barf -	 */ -	mem_free((caddr_t) ct, sizeof(struct ct_data)); - -	mem_free((caddr_t) h, sizeof(CLIENT)); -	return ((CLIENT *) NULL); +      goto fooy; +    } +  ct->ct_mpos = XDR_GETPOS (&(ct->ct_xdrs)); +  XDR_DESTROY (&(ct->ct_xdrs)); + +  /* +   * Create a client handle which uses xdrrec for serialization +   * and authnone for authentication. +   */ +  xdrrec_create (&(ct->ct_xdrs), sendsz, recvsz, +		 (caddr_t) ct, readtcp, writetcp); +  h->cl_ops = &tcp_ops; +  h->cl_private = (caddr_t) ct; +  h->cl_auth = authnone_create (); +  return h; + +fooy: +  /* +   * Something goofed, free stuff and barf +   */ +  mem_free ((caddr_t) ct, sizeof (struct ct_data)); +  mem_free ((caddr_t) h, sizeof (CLIENT)); +  return ((CLIENT *) NULL);  }  static enum clnt_stat -clnttcp_call(h, proc, xdr_args, args_ptr, xdr_results, results_ptr, -			 timeout) -register CLIENT *h; -u_long proc; -xdrproc_t xdr_args; -caddr_t args_ptr; -xdrproc_t xdr_results; -caddr_t results_ptr; -struct timeval timeout; +clnttcp_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout) +     CLIENT *h; +     u_long proc; +     xdrproc_t xdr_args; +     caddr_t args_ptr; +     xdrproc_t xdr_results; +     caddr_t results_ptr; +     struct timeval timeout;  { -	register struct ct_data *ct = (struct ct_data *) h->cl_private; -	register XDR *xdrs = &(ct->ct_xdrs); -	struct rpc_msg reply_msg; -	u_long x_id; -	u_long *msg_x_id = (u_long *) (ct->ct_mcall);	/* yuk */ -	register bool_t shipnow; -	int refreshes = 2; - -	if (!ct->ct_waitset) { -		ct->ct_wait = timeout; +  struct ct_data *ct = (struct ct_data *) h->cl_private; +  XDR *xdrs = &(ct->ct_xdrs); +  struct rpc_msg reply_msg; +  u_long x_id; +  u_int32_t *msg_x_id = (u_int32_t *) (ct->ct_mcall);	/* yuk */ +  bool_t shipnow; +  int refreshes = 2; + +  if (!ct->ct_waitset) +    { +      ct->ct_wait = timeout; +    } + +  shipnow = +    (xdr_results == (xdrproc_t) 0 && ct->ct_wait.tv_sec == 0 +     && ct->ct_wait.tv_usec == 0) ? FALSE : TRUE; + +call_again: +  xdrs->x_op = XDR_ENCODE; +  ct->ct_error.re_status = RPC_SUCCESS; +  x_id = ntohl (--(*msg_x_id)); +  if ((!XDR_PUTBYTES (xdrs, ct->ct_mcall, ct->ct_mpos)) || +      (!XDR_PUTLONG (xdrs, (long *) &proc)) || +      (!AUTH_MARSHALL (h->cl_auth, xdrs)) || +      (!(*xdr_args) (xdrs, args_ptr))) +    { +      if (ct->ct_error.re_status == RPC_SUCCESS) +	ct->ct_error.re_status = RPC_CANTENCODEARGS; +      (void) xdrrec_endofrecord (xdrs, TRUE); +      return (ct->ct_error.re_status); +    } +  if (!xdrrec_endofrecord (xdrs, shipnow)) +    return ct->ct_error.re_status = RPC_CANTSEND; +  if (!shipnow) +    return RPC_SUCCESS; +  /* +   * Hack to provide rpc-based message passing +   */ +  if (ct->ct_wait.tv_sec == 0 && ct->ct_wait.tv_usec == 0) +    { +      return ct->ct_error.re_status = RPC_TIMEDOUT; +    } + + +  /* +   * Keep receiving until we get a valid transaction id +   */ +  xdrs->x_op = XDR_DECODE; +  while (TRUE) +    { +      reply_msg.acpted_rply.ar_verf = _null_auth; +      reply_msg.acpted_rply.ar_results.where = NULL; +      reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; +      if (!xdrrec_skiprecord (xdrs)) +	return (ct->ct_error.re_status); +      /* now decode and validate the response header */ +      if (!xdr_replymsg (xdrs, &reply_msg)) +	{ +	  if (ct->ct_error.re_status == RPC_SUCCESS) +	    continue; +	  return ct->ct_error.re_status;  	} - -	shipnow = -		(xdr_results == (xdrproc_t) 0 && timeout.tv_sec == 0 -		 && timeout.tv_usec == 0) ? FALSE : TRUE; - -  call_again: -	xdrs->x_op = XDR_ENCODE; -	ct->ct_error.re_status = RPC_SUCCESS; -	x_id = ntohl(--(*msg_x_id)); -	if ((!XDR_PUTBYTES(xdrs, ct->ct_mcall, ct->ct_mpos)) || -		(!XDR_PUTLONG(xdrs, (long *) &proc)) || -		(!AUTH_MARSHALL(h->cl_auth, xdrs)) || -		(!(*xdr_args) (xdrs, args_ptr))) { -		if (ct->ct_error.re_status == RPC_SUCCESS) -			ct->ct_error.re_status = RPC_CANTENCODEARGS; -		(void) xdrrec_endofrecord(xdrs, TRUE); -		return (ct->ct_error.re_status); +      if ((u_int32_t) reply_msg.rm_xid == (u_int32_t) x_id) +	break; +    } + +  /* +   * process header +   */ +  _seterr_reply (&reply_msg, &(ct->ct_error)); +  if (ct->ct_error.re_status == RPC_SUCCESS) +    { +      if (!AUTH_VALIDATE (h->cl_auth, &reply_msg.acpted_rply.ar_verf)) +	{ +	  ct->ct_error.re_status = RPC_AUTHERROR; +	  ct->ct_error.re_why = AUTH_INVALIDRESP;  	} -	if (!xdrrec_endofrecord(xdrs, shipnow)) -		return (ct->ct_error.re_status = RPC_CANTSEND); -	if (!shipnow) -		return (RPC_SUCCESS); -	/* -	 * Hack to provide rpc-based message passing -	 */ -	if (timeout.tv_sec == 0 && timeout.tv_usec == 0) { -		return (ct->ct_error.re_status = RPC_TIMEDOUT); +      else if (!(*xdr_results) (xdrs, results_ptr)) +	{ +	  if (ct->ct_error.re_status == RPC_SUCCESS) +	    ct->ct_error.re_status = RPC_CANTDECODERES;  	} - - -	/* -	 * Keep receiving until we get a valid transaction id -	 */ -	xdrs->x_op = XDR_DECODE; -	while (TRUE) { -		reply_msg.acpted_rply.ar_verf = _null_auth; -		reply_msg.acpted_rply.ar_results.where = NULL; -		reply_msg.acpted_rply.ar_results.proc = (xdrproc_t) xdr_void; -		if (!xdrrec_skiprecord(xdrs)) -			return (ct->ct_error.re_status); -		/* now decode and validate the response header */ -		if (!xdr_replymsg(xdrs, &reply_msg)) { -			if (ct->ct_error.re_status == RPC_SUCCESS) -				continue; -			return (ct->ct_error.re_status); -		} -		if (reply_msg.rm_xid == x_id) -			break; +      /* free verifier ... */ +      if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) +	{ +	  xdrs->x_op = XDR_FREE; +	  (void) xdr_opaque_auth (xdrs, &(reply_msg.acpted_rply.ar_verf));  	} - -	/* -	 * process header -	 */ -	_seterr_reply(&reply_msg, &(ct->ct_error)); -	if (ct->ct_error.re_status == RPC_SUCCESS) { -		if (!AUTH_VALIDATE(h->cl_auth, &reply_msg.acpted_rply.ar_verf)) { -			ct->ct_error.re_status = RPC_AUTHERROR; -			ct->ct_error.re_why = AUTH_INVALIDRESP; -		} else if (!(*xdr_results) (xdrs, results_ptr)) { -			if (ct->ct_error.re_status == RPC_SUCCESS) -				ct->ct_error.re_status = RPC_CANTDECODERES; -		} -		/* free verifier ... */ -		if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) { -			xdrs->x_op = XDR_FREE; -			(void) xdr_opaque_auth(xdrs, &(reply_msg.acpted_rply.ar_verf)); -		} -	} /* end successful completion */ -	else { -		/* maybe our credentials need to be refreshed ... */ -		if (refreshes-- && AUTH_REFRESH(h->cl_auth)) -			goto call_again; -	}							/* end of unsuccessful completion */ -	return (ct->ct_error.re_status); +    }				/* end successful completion */ +  else +    { +      /* maybe our credentials need to be refreshed ... */ +      if (refreshes-- && AUTH_REFRESH (h->cl_auth)) +	goto call_again; +    }				/* end of unsuccessful completion */ +  return ct->ct_error.re_status;  } -static void clnttcp_geterr(h, errp) -CLIENT *h; -struct rpc_err *errp; +static void +clnttcp_geterr (h, errp) +     CLIENT *h; +     struct rpc_err *errp;  { -	register struct ct_data *ct = (struct ct_data *) h->cl_private; +  struct ct_data *ct = +  (struct ct_data *) h->cl_private; -	*errp = ct->ct_error; +  *errp = ct->ct_error;  } -static bool_t clnttcp_freeres(cl, xdr_res, res_ptr) -CLIENT *cl; -xdrproc_t xdr_res; -caddr_t res_ptr; +static bool_t +clnttcp_freeres (cl, xdr_res, res_ptr) +     CLIENT *cl; +     xdrproc_t xdr_res; +     caddr_t res_ptr;  { -	register struct ct_data *ct = (struct ct_data *) cl->cl_private; -	register XDR *xdrs = &(ct->ct_xdrs); +  struct ct_data *ct = (struct ct_data *) cl->cl_private; +  XDR *xdrs = &(ct->ct_xdrs); -	xdrs->x_op = XDR_FREE; -	return ((*xdr_res) (xdrs, res_ptr)); +  xdrs->x_op = XDR_FREE; +  return (*xdr_res) (xdrs, res_ptr);  } -static void clnttcp_abort() +static void +clnttcp_abort ()  {  } -static bool_t clnttcp_control(cl, request, info) -CLIENT *cl; -int request; -char *info; +static bool_t +clnttcp_control (CLIENT *cl, int request, char *info)  { -	register struct ct_data *ct = (struct ct_data *) cl->cl_private; - -	switch (request) { -	case CLSET_TIMEOUT: -		ct->ct_wait = *(struct timeval *) info; -		ct->ct_waitset = TRUE; -		break; -	case CLGET_TIMEOUT: -		*(struct timeval *) info = ct->ct_wait; -		break; -	case CLGET_SERVER_ADDR: -		*(struct sockaddr_in *) info = ct->ct_addr; -		break; -	default: -		return (FALSE); -	} -	return (TRUE); +  struct ct_data *ct = (struct ct_data *) cl->cl_private; + + +  switch (request) +    { +    case CLSET_FD_CLOSE: +      ct->ct_closeit = TRUE; +      break; +    case CLSET_FD_NCLOSE: +      ct->ct_closeit = FALSE; +      break; +    case CLSET_TIMEOUT: +      ct->ct_wait = *(struct timeval *) info; +      ct->ct_waitset = TRUE; +      break; +    case CLGET_TIMEOUT: +      *(struct timeval *) info = ct->ct_wait; +      break; +    case CLGET_SERVER_ADDR: +      *(struct sockaddr_in *) info = ct->ct_addr; +      break; +    case CLGET_FD: +      *(int *)info = ct->ct_sock; +      break; +    case CLGET_XID: +      /* +       * use the knowledge that xid is the +       * first element in the call structure *. +       * This will get the xid of the PREVIOUS call +       */ +      *(u_long *)info = ntohl (*(u_long *)ct->ct_mcall); +      break; +    case CLSET_XID: +      /* This will set the xid of the NEXT call */ +      *(u_long *)ct->ct_mcall =  htonl (*(u_long *)info - 1); +      /* decrement by 1 as clnttcp_call() increments once */ +    case CLGET_VERS: +      /* +       * This RELIES on the information that, in the call body, +       * the version number field is the fifth field from the +       * begining of the RPC header. MUST be changed if the +       * call_struct is changed +       */ +      *(u_long *)info = ntohl (*(u_long *)(ct->ct_mcall + +					   4 * BYTES_PER_XDR_UNIT)); +      break; +    case CLSET_VERS: +      *(u_long *)(ct->ct_mcall + 4 * BYTES_PER_XDR_UNIT) +	= htonl (*(u_long *)info); +      break; +    case CLGET_PROG: +      /* +       * This RELIES on the information that, in the call body, +       * the program number field is the  field from the +       * begining of the RPC header. MUST be changed if the +       * call_struct is changed +       */ +      *(u_long *)info = ntohl(*(u_long *)(ct->ct_mcall + +					  3 * BYTES_PER_XDR_UNIT)); +      break; +    case CLSET_PROG: +      *(u_long *)(ct->ct_mcall + 3 * BYTES_PER_XDR_UNIT) +	= htonl(*(u_long *)info); +      break; +    /* The following are only possible with TI-RPC */ +    case CLGET_RETRY_TIMEOUT: +    case CLSET_RETRY_TIMEOUT: +    case CLGET_SVC_ADDR: +    case CLSET_SVC_ADDR: +    case CLSET_PUSH_TIMOD: +    case CLSET_POP_TIMOD: +    default: +      return FALSE; +    } +  return TRUE;  } -static void clnttcp_destroy(h) -CLIENT *h; +static void +clnttcp_destroy (CLIENT *h)  { -	register struct ct_data *ct = (struct ct_data *) h->cl_private; - -	if (ct->ct_closeit) { -		(void) close(ct->ct_sock); -	} -	XDR_DESTROY(&(ct->ct_xdrs)); -	mem_free((caddr_t) ct, sizeof(struct ct_data)); - -	mem_free((caddr_t) h, sizeof(CLIENT)); +  struct ct_data *ct = +  (struct ct_data *) h->cl_private; + +  if (ct->ct_closeit) +    { +      (void) close (ct->ct_sock); +    } +  XDR_DESTROY (&(ct->ct_xdrs)); +  mem_free ((caddr_t) ct, sizeof (struct ct_data)); +  mem_free ((caddr_t) h, sizeof (CLIENT));  }  /* @@ -389,75 +473,68 @@ CLIENT *h;   * Behaves like the system calls, read & write, but keeps some error state   * around for the rpc level.   */ -static int readtcp(ct, buf, len) -register struct ct_data *ct; -caddr_t buf; -register int len; +static int +readtcp (char *ctptr, char *buf, int len)  { -#ifdef FD_SETSIZE -	fd_set mask; -	fd_set readfds; - -	if (len == 0) -		return (0); -	FD_ZERO(&mask); -	FD_SET(ct->ct_sock, &mask); -#else -	register int mask = 1 << (ct->ct_sock); -	int readfds; - -	if (len == 0) -		return (0); - -#endif							/* def FD_SETSIZE */ -	while (TRUE) { -		readfds = mask; -		switch (select -				(_rpc_dtablesize(), &readfds,  NULL,  NULL, -				 &(ct->ct_wait))) { -		case 0: -			ct->ct_error.re_status = RPC_TIMEDOUT; -			return (-1); - -		case -1: -			if (errno == EINTR) -				continue; -			ct->ct_error.re_status = RPC_CANTRECV; -			ct->ct_error.re_errno = errno; -			return (-1); -		} -		break; -	} -	switch (len = read(ct->ct_sock, buf, len)) { - +  struct ct_data *ct = (struct ct_data *)ctptr; +  struct pollfd fd; +  int milliseconds = (ct->ct_wait.tv_sec * 1000) + +    (ct->ct_wait.tv_usec / 1000); + +  if (len == 0) +    return 0; + +  fd.fd = ct->ct_sock; +  fd.events = POLLIN; +  while (TRUE) +    { +      switch (poll(&fd, 1, milliseconds)) +	{  	case 0: -		/* premature eof */ -		ct->ct_error.re_errno = ECONNRESET; -		ct->ct_error.re_status = RPC_CANTRECV; -		len = -1;				/* it's really an error */ -		break; +	  ct->ct_error.re_status = RPC_TIMEDOUT; +	  return -1;  	case -1: -		ct->ct_error.re_errno = errno; -		ct->ct_error.re_status = RPC_CANTRECV; -		break; +	  if (errno == EINTR) +	    continue; +	  ct->ct_error.re_status = RPC_CANTRECV; +	  ct->ct_error.re_errno = errno; +	  return -1;  	} -	return (len); +      break; +    } +  switch (len = read (ct->ct_sock, buf, len)) +    { + +    case 0: +      /* premature eof */ +      ct->ct_error.re_errno = ECONNRESET; +      ct->ct_error.re_status = RPC_CANTRECV; +      len = -1;			/* it's really an error */ +      break; + +    case -1: +      ct->ct_error.re_errno = errno; +      ct->ct_error.re_status = RPC_CANTRECV; +      break; +    } +  return len;  } -static int writetcp(ct, buf, len) -struct ct_data *ct; -caddr_t buf; -int len; +static int +writetcp (char *ctptr, char *buf, int len)  { -	register int i, cnt; - -	for (cnt = len; cnt > 0; cnt -= i, buf += i) { -		if ((i = write(ct->ct_sock, buf, cnt)) == -1) { -			ct->ct_error.re_errno = errno; -			ct->ct_error.re_status = RPC_CANTSEND; -			return (-1); -		} +  int i, cnt; +  struct ct_data *ct = (struct ct_data*)ctptr; + +  for (cnt = len; cnt > 0; cnt -= i, buf += i) +    { +      if ((i = write (ct->ct_sock, buf, cnt)) == -1) +	{ +	  ct->ct_error.re_errno = errno; +	  ct->ct_error.re_status = RPC_CANTSEND; +	  return -1;  	} -	return (len); +    } +  return len;  }  | 
