diff options
Diffstat (limited to 'sunrpc/rpc_prot.c')
| -rw-r--r-- | sunrpc/rpc_prot.c | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c index 79a58c2732..59ec5058b6 100644 --- a/sunrpc/rpc_prot.c +++ b/sunrpc/rpc_prot.c @@ -58,11 +58,12 @@ bool_t xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap) { - if (xdr_enum (xdrs, &(ap->oa_flavor))) - return xdr_bytes (xdrs, &ap->oa_base, + if (INTUSE(xdr_enum) (xdrs, &(ap->oa_flavor))) + return INTUSE(xdr_bytes) (xdrs, &ap->oa_base, &ap->oa_length, MAX_AUTH_BYTES); return FALSE; } +INTDEF(xdr_opaque_auth) /* * XDR a DES block @@ -70,8 +71,9 @@ xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap) bool_t xdr_des_block (XDR *xdrs, des_block *blkp) { - return xdr_opaque (xdrs, (caddr_t) blkp, sizeof (des_block)); + return INTUSE(xdr_opaque) (xdrs, (caddr_t) blkp, sizeof (des_block)); } +INTDEF(xdr_des_block) /* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */ @@ -82,23 +84,24 @@ bool_t xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar) { /* personalized union, rather than calling xdr_union */ - if (!xdr_opaque_auth (xdrs, &(ar->ar_verf))) + if (!INTUSE(xdr_opaque_auth) (xdrs, &(ar->ar_verf))) return FALSE; - if (!xdr_enum (xdrs, (enum_t *) & (ar->ar_stat))) + if (!INTUSE(xdr_enum) (xdrs, (enum_t *) & (ar->ar_stat))) return FALSE; switch (ar->ar_stat) { case SUCCESS: return ((*(ar->ar_results.proc)) (xdrs, ar->ar_results.where)); case PROG_MISMATCH: - if (!xdr_u_long (xdrs, &(ar->ar_vers.low))) + if (!INTUSE(xdr_u_long) (xdrs, &(ar->ar_vers.low))) return FALSE; - return (xdr_u_long (xdrs, &(ar->ar_vers.high))); + return (INTUSE(xdr_u_long) (xdrs, &(ar->ar_vers.high))); default: return TRUE; } return TRUE; /* TRUE => open ended set of problems */ } +INTDEF(xdr_accepted_reply) /* * XDR the MSG_DENIED part of a reply message union @@ -107,25 +110,26 @@ bool_t xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr) { /* personalized union, rather than calling xdr_union */ - if (!xdr_enum (xdrs, (enum_t *) & (rr->rj_stat))) + if (!INTUSE(xdr_enum) (xdrs, (enum_t *) & (rr->rj_stat))) return FALSE; switch (rr->rj_stat) { case RPC_MISMATCH: - if (!xdr_u_long (xdrs, &(rr->rj_vers.low))) + if (!INTUSE(xdr_u_long) (xdrs, &(rr->rj_vers.low))) return FALSE; - return xdr_u_long (xdrs, &(rr->rj_vers.high)); + return INTUSE(xdr_u_long) (xdrs, &(rr->rj_vers.high)); case AUTH_ERROR: - return xdr_enum (xdrs, (enum_t *) & (rr->rj_why)); + return INTUSE(xdr_enum) (xdrs, (enum_t *) & (rr->rj_why)); } return FALSE; } +INTDEF(xdr_rejected_reply) static const struct xdr_discrim reply_dscrm[3] = { - {(int) MSG_ACCEPTED, (xdrproc_t) xdr_accepted_reply}, - {(int) MSG_DENIED, (xdrproc_t) xdr_rejected_reply}, + {(int) MSG_ACCEPTED, (xdrproc_t) INTUSE(xdr_accepted_reply)}, + {(int) MSG_DENIED, (xdrproc_t) INTUSE(xdr_rejected_reply)}, {__dontcare__, NULL_xdrproc_t}}; /* @@ -136,14 +140,15 @@ xdr_replymsg (xdrs, rmsg) XDR *xdrs; struct rpc_msg *rmsg; { - if (xdr_u_long (xdrs, &(rmsg->rm_xid)) && - xdr_enum (xdrs, (enum_t *) & (rmsg->rm_direction)) && + if (INTUSE(xdr_u_long) (xdrs, &(rmsg->rm_xid)) && + INTUSE(xdr_enum) (xdrs, (enum_t *) & (rmsg->rm_direction)) && (rmsg->rm_direction == REPLY)) - return xdr_union (xdrs, (enum_t *) & (rmsg->rm_reply.rp_stat), - (caddr_t) & (rmsg->rm_reply.ru), reply_dscrm, - NULL_xdrproc_t); + return INTUSE(xdr_union) (xdrs, (enum_t *) & (rmsg->rm_reply.rp_stat), + (caddr_t) & (rmsg->rm_reply.ru), reply_dscrm, + NULL_xdrproc_t); return FALSE; } +INTDEF(xdr_replymsg) /* @@ -161,13 +166,14 @@ 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_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)); + INTUSE(xdr_u_long) (xdrs, &(cmsg->rm_xid)) && + INTUSE(xdr_enum) (xdrs, (enum_t *) & (cmsg->rm_direction)) && + INTUSE(xdr_u_long) (xdrs, &(cmsg->rm_call.cb_rpcvers)) && + INTUSE(xdr_u_long) (xdrs, &(cmsg->rm_call.cb_prog))) + return INTUSE(xdr_u_long) (xdrs, &(cmsg->rm_call.cb_vers)); return FALSE; } +INTDEF(xdr_callhdr) /* ************************** Client utility routine ************* */ |