diff options
Diffstat (limited to 'sunrpc')
| -rw-r--r-- | sunrpc/clnt_udp.c | 2 | ||||
| -rw-r--r-- | sunrpc/pmap_rmt.c | 3 | ||||
| -rw-r--r-- | sunrpc/svc_tcp.c | 4 | ||||
| -rw-r--r-- | sunrpc/svc_udp.c | 11 | ||||
| -rw-r--r-- | sunrpc/xdr.c | 1 | ||||
| -rw-r--r-- | sunrpc/xdr_rec.c | 17 |
6 files changed, 22 insertions, 16 deletions
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c index efd6a9f9f5..e19e7e820b 100644 --- a/sunrpc/clnt_udp.c +++ b/sunrpc/clnt_udp.c @@ -233,7 +233,7 @@ clntudp_call (cl, proc, xargs, argsp, xresults, resultsp, utimeout) XDR *xdrs; int outlen; int inlen; - int fromlen; + size_t fromlen; #ifdef FD_SETSIZE fd_set readfds; fd_set mask; diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c index 8ae93b8f6d..6117c365d5 100644 --- a/sunrpc/pmap_rmt.c +++ b/sunrpc/pmap_rmt.c @@ -235,7 +235,8 @@ clnt_broadcast (prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) AUTH *unix_auth = authunix_create_default (); XDR xdr_stream; XDR *xdrs = &xdr_stream; - int outlen, inlen, fromlen, nets; + int outlen, inlen, nets; + size_t fromlen; int sock; int on = 1; #ifdef FD_SETSIZE diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c index 758b6ba6e4..ec7de3b80a 100644 --- a/sunrpc/svc_tcp.c +++ b/sunrpc/svc_tcp.c @@ -130,7 +130,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize) SVCXPRT *xprt; struct tcp_rendezvous *r; struct sockaddr_in addr; - int len = sizeof (struct sockaddr_in); + size_t len = sizeof (struct sockaddr_in); if (sock == RPC_ANYSOCK) { @@ -231,7 +231,7 @@ rendezvous_request (SVCXPRT *xprt, struct rpc_msg *errmsg) int sock; struct tcp_rendezvous *r; struct sockaddr_in addr; - int len; + size_t len; r = (struct tcp_rendezvous *) xprt->xp_p1; again: diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c index 8ae18a9147..39ecbb0b50 100644 --- a/sunrpc/svc_udp.c +++ b/sunrpc/svc_udp.c @@ -108,7 +108,7 @@ svcudp_bufcreate (sock, sendsz, recvsz) SVCXPRT *xprt; struct svcudp_data *su; struct sockaddr_in addr; - int len = sizeof (struct sockaddr_in); + size_t len = sizeof (struct sockaddr_in); if (sock == RPC_ANYSOCK) { @@ -188,11 +188,14 @@ svcudp_recv (xprt, msg) int rlen; char *reply; u_long replylen; + size_t len; again: - xprt->xp_addrlen = sizeof (struct sockaddr_in); + /* FIXME -- should xp_addrlen be a size_t? */ + len = sizeof(struct sockaddr_in); rlen = recvfrom (xprt->xp_sock, rpc_buffer (xprt), (int) su->su_iosz, 0, - (struct sockaddr *) &(xprt->xp_raddr), &(xprt->xp_addrlen)); + (struct sockaddr *) &(xprt->xp_raddr), &len); + xprt->xp_addrlen = len; if (rlen == -1 && errno == EINTR) goto again; if (rlen < 16) /* < 4 32-bit ints? */ @@ -207,7 +210,7 @@ again: if (cache_get (xprt, msg, &reply, &replylen)) { (void) sendto (xprt->xp_sock, reply, (int) replylen, 0, - (struct sockaddr *) &xprt->xp_raddr, xprt->xp_addrlen); + (struct sockaddr *) &xprt->xp_raddr, len); return TRUE; } } diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c index becc59bed3..668d9b683b 100644 --- a/sunrpc/xdr.c +++ b/sunrpc/xdr.c @@ -43,6 +43,7 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12"; #include <stdio.h> #include <limits.h> +#include <string.h> #include <rpc/types.h> #include <rpc/xdr.h> diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c index e76feeb991..e39131c2c2 100644 --- a/sunrpc/xdr_rec.c +++ b/sunrpc/xdr_rec.c @@ -138,8 +138,8 @@ xdrrec_create (XDR *xdrs, u_int sendsize, int (*readit) (char *, char *, int), int (*writeit) (char *, char *, int)) { - RECSTREAM *rstrm = - (RECSTREAM *) mem_alloc (sizeof (RECSTREAM)); + RECSTREAM *rstrm = (RECSTREAM *) mem_alloc (sizeof (RECSTREAM)); + caddr_t tmp; if (rstrm == NULL) { @@ -161,10 +161,11 @@ xdrrec_create (XDR *xdrs, u_int sendsize, (void) fputs (_("xdrrec_create: out of memory\n"), stderr); return; } - for (rstrm->out_base = rstrm->the_buffer; - (u_int) rstrm->out_base % BYTES_PER_XDR_UNIT != 0; - rstrm->out_base++); - rstrm->in_base = rstrm->out_base + sendsize; + tmp = rstrm->the_buffer; + if ((size_t)tmp % BYTES_PER_XDR_UNIT) + tmp += BYTES_PER_XDR_UNIT - (size_t)tmp % BYTES_PER_XDR_UNIT; + rstrm->out_base = tmp; + rstrm->in_base = tmp + sendsize; /* * now the rest ... */ @@ -516,11 +517,11 @@ static bool_t /* knows nothing about records! Only about input buffers */ fill_input_buf (RECSTREAM *rstrm) { caddr_t where; - u_int i; + size_t i; int len; where = rstrm->in_base; - i = (u_int) rstrm->in_boundry % BYTES_PER_XDR_UNIT; + i = (size_t) rstrm->in_boundry % BYTES_PER_XDR_UNIT; where += i; len = rstrm->in_size - i; if ((len = (*(rstrm->readit)) (rstrm->tcp_handle, where, len)) == -1) |