diff options
author | \"Talpey, Thomas\ <Thomas.Talpey@netapp.com> | 2007-09-10 13:43:05 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-10-09 17:17:20 -0400 |
commit | 4417c8c41a51a2ae95b2a2fa2811640b368c4151 (patch) | |
tree | 40b585df4a75d86c3c97ca69f94508a020ced64d /net/sunrpc/xprtsock.c | |
parent | 4f40ee4a02a2d017b714d5b2faaf5c25bf9eae47 (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/xprtsock.c')
-rw-r--r-- | net/sunrpc/xprtsock.c | 8 |
1 files changed, 8 insertions, 0 deletions
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 | ||
342 | static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt) | 346 | 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) | |||
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 | ||
403 | static void xs_free_peer_addresses(struct rpc_xprt *xprt) | 411 | static void xs_free_peer_addresses(struct rpc_xprt *xprt) |