Commit e831fe65 authored by Tom Tucker's avatar Tom Tucker Committed by J. Bruce Fields
Browse files

svc: Add xpo_prep_reply_hdr 



Some transports add fields to the RPC header for replies, e.g. the TCP
record length. This function is called when preparing the reply header
to allow each transport to add whatever fields it requires.

Signed-off-by: default avatarTom Tucker <tom@opengridcomputing.com>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarGreg Banks <gnb@sgi.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 755cceab

include/linux/sunrpc/svc_xprt.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 




struct svc_xprt_ops {

struct svc_xprt_ops {

	int		(*xpo_recvfrom)(struct svc_rqst *);

	int		(*xpo_recvfrom)(struct svc_rqst *);

	void		(*xpo_prep_reply_hdr)(struct svc_rqst *);

	int		(*xpo_sendto)(struct svc_rqst *);

	int		(*xpo_sendto)(struct svc_rqst *);

	void		(*xpo_release_rqst)(struct svc_rqst *);

	void		(*xpo_release_rqst)(struct svc_rqst *);

	void		(*xpo_detach)(struct svc_xprt *);

	void		(*xpo_detach)(struct svc_xprt *);

net/sunrpc/svc.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -840,9 +840,9 @@ svc_process(struct svc_rqst *rqstp) 
	rqstp->rq_res.tail[0].iov_len = 0;

	rqstp->rq_res.tail[0].iov_len = 0;

	/* Will be turned off only in gss privacy case: */

	/* Will be turned off only in gss privacy case: */

	rqstp->rq_splice_ok = 1;

	rqstp->rq_splice_ok = 1;

	/* tcp needs a space for the record length... */



	if (rqstp->rq_prot == IPPROTO_TCP)

	/* Setup reply header */

		svc_putnl(resv, 0);

	rqstp->rq_xprt->xpt_ops->xpo_prep_reply_hdr(rqstp);





	rqstp->rq_xid = svc_getu32(argv);

	rqstp->rq_xid = svc_getu32(argv);

	svc_putu32(resv, rqstp->rq_xid);

	svc_putu32(resv, rqstp->rq_xid);

net/sunrpc/svcsock.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -893,12 +893,17 @@ svc_udp_sendto(struct svc_rqst *rqstp) 
	return error;

	return error;

}

}





static void svc_udp_prep_reply_hdr(struct svc_rqst *rqstp)

{

}



static struct svc_xprt_ops svc_udp_ops = {

static struct svc_xprt_ops svc_udp_ops = {

	.xpo_recvfrom = svc_udp_recvfrom,

	.xpo_recvfrom = svc_udp_recvfrom,

	.xpo_sendto = svc_udp_sendto,

	.xpo_sendto = svc_udp_sendto,

	.xpo_release_rqst = svc_release_skb,

	.xpo_release_rqst = svc_release_skb,

	.xpo_detach = svc_sock_detach,

	.xpo_detach = svc_sock_detach,

	.xpo_free = svc_sock_free,

	.xpo_free = svc_sock_free,

	.xpo_prep_reply_hdr = svc_udp_prep_reply_hdr,

};

};





static struct svc_xprt_class svc_udp_class = {

static struct svc_xprt_class svc_udp_class = {
@@ -1350,12 +1355,24 @@ svc_tcp_sendto(struct svc_rqst *rqstp) 
	return sent;

	return sent;

}

}





/*

 * Setup response header. TCP has a 4B record length field.

 */

static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp)

{

	struct kvec *resv = &rqstp->rq_res.head[0];



	/* tcp needs a space for the record length... */

	svc_putnl(resv, 0);

}



static struct svc_xprt_ops svc_tcp_ops = {

static struct svc_xprt_ops svc_tcp_ops = {

	.xpo_recvfrom = svc_tcp_recvfrom,

	.xpo_recvfrom = svc_tcp_recvfrom,

	.xpo_sendto = svc_tcp_sendto,

	.xpo_sendto = svc_tcp_sendto,

	.xpo_release_rqst = svc_release_skb,

	.xpo_release_rqst = svc_release_skb,

	.xpo_detach = svc_sock_detach,

	.xpo_detach = svc_sock_detach,

	.xpo_free = svc_sock_free,

	.xpo_free = svc_sock_free,

	.xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr,

};

};





static struct svc_xprt_class svc_tcp_class = {

static struct svc_xprt_class svc_tcp_class = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE