aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
author\"Talpey, Thomas\ <Thomas.Talpey@netapp.com>2007-09-10 13:43:05 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:17:20 -0400
commit4417c8c41a51a2ae95b2a2fa2811640b368c4151 (patch)
tree40b585df4a75d86c3c97ca69f94508a020ced64d /net/sunrpc
parent4f40ee4a02a2d017b714d5b2faaf5c25bf9eae47 (diff)
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: Tom Talpey <tmt@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/rpcb_clnt.c3
-rw-r--r--net/sunrpc/xprtsock.c8
2 files changed, 9 insertions, 2 deletions
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index b028a0ecd593..6f0af08a51dc 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -388,8 +388,7 @@ void rpcb_getport_async(struct rpc_task *task)
388 map->r_prot = xprt->prot; 388 map->r_prot = xprt->prot;
389 map->r_port = 0; 389 map->r_port = 0;
390 map->r_xprt = xprt_get(xprt); 390 map->r_xprt = xprt_get(xprt);
391 map->r_netid = (xprt->prot == IPPROTO_TCP) ? RPCBIND_NETID_TCP : 391 map->r_netid = rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID);
392 RPCBIND_NETID_UDP;
393 memcpy(map->r_addr, 392 memcpy(map->r_addr,
394 rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR), 393 rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR),
395 sizeof(map->r_addr)); 394 sizeof(map->r_addr));
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 7a154e4b70f5..5bdce8fa2d56 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -337,6 +337,10 @@ static void xs_format_ipv4_peer_addresses(struct rpc_xprt *xprt)
337 ntohs(addr->sin_port) & 0xff); 337 ntohs(addr->sin_port) & 0xff);
338 } 338 }
339 xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf; 339 xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
340
341 xprt->address_strings[RPC_DISPLAY_NETID] =
342 kstrdup(xprt->prot == IPPROTO_UDP ?
343 RPCBIND_NETID_UDP : RPCBIND_NETID_TCP, GFP_KERNEL);
340} 344}
341 345
342static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt) 346static 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)
398 ntohs(addr->sin6_port) & 0xff); 402 ntohs(addr->sin6_port) & 0xff);
399 } 403 }
400 xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf; 404 xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
405
406 xprt->address_strings[RPC_DISPLAY_NETID] =
407 kstrdup(xprt->prot == IPPROTO_UDP ?
408 RPCBIND_NETID_UDP6 : RPCBIND_NETID_TCP6, GFP_KERNEL);
401} 409}
402 410
403static void xs_free_peer_addresses(struct rpc_xprt *xprt) 411static void xs_free_peer_addresses(struct rpc_xprt *xprt)