Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4417c8c4 authored by \"Talpey, Thomas\'s avatar \"Talpey, Thomas\ Committed by Trond Myklebust
Browse files

SUNRPC: export per-transport rpcbind netid's 



The rpcbind (v3+) netid is provided by each RPC client transport. This fixes
an omission in IPv6 rpcbind client support, and enables future extension.

Signed-off-by: default avatarTom Talpey <tmt@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 4f40ee4a

include/linux/sunrpc/xprt.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ enum rpc_display_format_t { 
	RPC_DISPLAY_HEX_ADDR,

	RPC_DISPLAY_HEX_PORT,

	RPC_DISPLAY_UNIVERSAL_ADDR,

	RPC_DISPLAY_NETID,

	RPC_DISPLAY_MAX,

};

net/sunrpc/rpcb_clnt.c

+1 −2
Original line number Diff line number Diff line
@@ -388,8 +388,7 @@ void rpcb_getport_async(struct rpc_task *task) 
	map->r_prot = xprt->prot;

	map->r_port = 0;

	map->r_xprt = xprt_get(xprt);

	map->r_netid = (xprt->prot == IPPROTO_TCP) ? RPCBIND_NETID_TCP :

						     RPCBIND_NETID_UDP;

	map->r_netid = rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID);

	memcpy(map->r_addr,

	       rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR),

	       sizeof(map->r_addr));

net/sunrpc/xprtsock.c

+8 −0
Original line number Diff line number Diff line
@@ -337,6 +337,10 @@ static void xs_format_ipv4_peer_addresses(struct rpc_xprt *xprt) 
				ntohs(addr->sin_port) & 0xff);

	}

	xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;



	xprt->address_strings[RPC_DISPLAY_NETID] =

		kstrdup(xprt->prot == IPPROTO_UDP ?

			RPCBIND_NETID_UDP : RPCBIND_NETID_TCP, GFP_KERNEL);

}



static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt)
@@ -398,6 +402,10 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt) 
				ntohs(addr->sin6_port) & 0xff);

	}

	xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;



	xprt->address_strings[RPC_DISPLAY_NETID] =

		kstrdup(xprt->prot == IPPROTO_UDP ?

			RPCBIND_NETID_UDP6 : RPCBIND_NETID_TCP6, GFP_KERNEL);

}



static void xs_free_peer_addresses(struct rpc_xprt *xprt)