diff options
| author | peter <peter@FreeBSD.org> | 1996-12-30 15:00:53 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-12-30 15:00:53 +0000 |
| commit | 3a2a3df0037afee2560451ad24f04c5da5e3d72a (patch) | |
| tree | 6408eb8274b8ff66925ffc1c1e44c11fc9654a02 /lib/libc | |
| parent | 81a25a92573c534ca237cab8be05ee13f14afbf5 (diff) | |
| download | FreeBSD-src-3a2a3df0037afee2560451ad24f04c5da5e3d72a.zip FreeBSD-src-3a2a3df0037afee2560451ad24f04c5da5e3d72a.tar.gz | |
- make wire protocol 64 bit type safe
Obtained from: a diff of FreeBSD vs. OpenBSD/NetBSD rpc code.
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/rpc/rpc_prot.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c index 9f7d1c0..5ac8a74 100644 --- a/lib/libc/rpc/rpc_prot.c +++ b/lib/libc/rpc/rpc_prot.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)rpc_prot.c 2.3 88/08/07 4.0 RPCSRC";*/ -static char *rcsid = "$Id: rpc_prot.c,v 1.2 1995/05/30 05:41:31 rgrimes Exp $"; +static char *rcsid = "$Id: rpc_prot.c,v 1.3 1996/06/10 20:13:06 jraynard Exp $"; #endif /* @@ -103,9 +103,9 @@ xdr_accepted_reply(xdrs, ar) return ((*(ar->ar_results.proc))(xdrs, ar->ar_results.where)); case PROG_MISMATCH: - if (! xdr_u_long(xdrs, &(ar->ar_vers.low))) + if (! xdr_u_int32_t(xdrs, &(ar->ar_vers.low))) return (FALSE); - return (xdr_u_long(xdrs, &(ar->ar_vers.high))); + return (xdr_u_int32_t(xdrs, &(ar->ar_vers.high))); default: break; } @@ -127,9 +127,9 @@ xdr_rejected_reply(xdrs, rr) switch (rr->rj_stat) { case RPC_MISMATCH: - if (! xdr_u_long(xdrs, &(rr->rj_vers.low))) + if (! xdr_u_int32_t(xdrs, &(rr->rj_vers.low))) return (FALSE); - return (xdr_u_long(xdrs, &(rr->rj_vers.high))); + return (xdr_u_int32_t(xdrs, &(rr->rj_vers.high))); case AUTH_ERROR: return (xdr_enum(xdrs, (enum_t *)&(rr->rj_why))); @@ -151,7 +151,7 @@ xdr_replymsg(xdrs, rmsg) register struct rpc_msg *rmsg; { if ( - xdr_u_long(xdrs, &(rmsg->rm_xid)) && + xdr_u_int32_t(xdrs, &(rmsg->rm_xid)) && xdr_enum(xdrs, (enum_t *)&(rmsg->rm_direction)) && (rmsg->rm_direction == REPLY) ) return (xdr_union(xdrs, (enum_t *)&(rmsg->rm_reply.rp_stat), @@ -175,11 +175,11 @@ xdr_callhdr(xdrs, cmsg) cmsg->rm_call.cb_rpcvers = RPC_MSG_VERSION; if ( (xdrs->x_op == XDR_ENCODE) && - xdr_u_long(xdrs, &(cmsg->rm_xid)) && + xdr_u_int32_t(xdrs, &(cmsg->rm_xid)) && xdr_enum(xdrs, (enum_t *)&(cmsg->rm_direction)) && - xdr_u_long(xdrs, &(cmsg->rm_call.cb_rpcvers)) && - xdr_u_long(xdrs, &(cmsg->rm_call.cb_prog)) ) - return (xdr_u_long(xdrs, &(cmsg->rm_call.cb_vers))); + xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && + xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_prog)) ) + return (xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_vers))); return (FALSE); } |
