Deleted Added
full compact
50c50
< * $FreeBSD: head/sys/rpc/clnt.h 180025 2008-06-26 10:21:54Z dfr $
---
> * $FreeBSD: head/sys/rpc/clnt.h 184588 2008-11-03 10:38:00Z dfr $
120a121,129
> * Timers used for the pseudo-transport protocol when using datagrams
> */
> struct rpc_timers {
> u_short rt_srtt; /* smoothed round-trip time */
> u_short rt_deviate; /* estimated deviation */
> u_long rt_rtxcur; /* current (backed-off) rto */
> };
>
> /*
127a137,138
> struct rpc_timers *rc_timers; /* optional RTT timers */
> struct rpc_err rc_err; /* detailed call status */
143,144c154,155
< struct rpc_callextra *, rpcproc_t, xdrproc_t, void *,
< xdrproc_t, void *, struct timeval);
---
> struct rpc_callextra *, rpcproc_t,
> struct mbuf *, struct mbuf **, struct timeval);
152a164,165
> /* close the connection and terminate pending RPCs */
> void (*cl_close)(struct __rpc_client *);
186,194d198
< /*
< * Timers used for the pseudo-transport protocol when using datagrams
< */
< struct rpc_timers {
< u_short rt_srtt; /* smoothed round-trip time */
< u_short rt_deviate; /* estimated deviation */
< u_long rt_rtxcur; /* current (backed-off) rto */
< };
<
224a229,238
> * void
> * CLNT_CLOSE(rh);
> * CLIENT *rh;
> */
> #define CLNT_CLOSE(rh) ((*(rh)->cl_ops->cl_close)(rh))
>
> enum clnt_stat clnt_call_private(CLIENT *, struct rpc_callextra *, rpcproc_t,
> xdrproc_t, void *, xdrproc_t, void *, struct timeval);
>
> /*
225a240,255
> * CLNT_CALL_MBUF(rh, ext, proc, mreq, mrepp, timeout)
> * CLIENT *rh;
> * struct rpc_callextra *ext;
> * rpcproc_t proc;
> * struct mbuf *mreq;
> * struct mbuf **mrepp;
> * struct timeval timeout;
> *
> * Call arguments in mreq which is consumed by the call (even if there
> * is an error). Results returned in *mrepp.
> */
> #define CLNT_CALL_MBUF(rh, ext, proc, mreq, mrepp, secs) \
> ((*(rh)->cl_ops->cl_call)(rh, ext, proc, mreq, mrepp, secs))
>
> /*
> * enum clnt_stat
237,238c267,268
< ((*(rh)->cl_ops->cl_call)(rh, ext, proc, xargs, \
< argsp, xres, resp, secs))
---
> clnt_call_private(rh, ext, proc, xargs, \
> argsp, xres, resp, secs)
253,258c283,288
< #define CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs) \
< ((*(rh)->cl_ops->cl_call)(rh, NULL, proc, xargs, \
< argsp, xres, resp, secs))
< #define clnt_call(rh, proc, xargs, argsp, xres, resp, secs) \
< ((*(rh)->cl_ops->cl_call)(rh, NULL, proc, xargs, \
< argsp, xres, resp, secs))
---
> #define CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs) \
> clnt_call_private(rh, NULL, proc, xargs, \
> argsp, xres, resp, secs)
> #define clnt_call(rh, proc, xargs, argsp, xres, resp, secs) \
> clnt_call_private(rh, NULL, proc, xargs, \
> argsp, xres, resp, secs)
342a373,374
> #define CLSET_PRIVPORT 27 /* set privileged source port flag */
> #define CLGET_PRIVPORT 28 /* get privileged source port flag */