SUNRPC: Add support for formatted universal addresses

"Universal addresses" are a string representation of an IP address and
port.  They are described fully in RFC 3530, section 2.2.  Add support
for generating them in the RPC client's socket transport module.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2007-08-16 16:03:26 -04:00 committed by Trond Myklebust
parent 8945ee5e27
commit 756805e7a7
2 changed files with 19 additions and 0 deletions

View file

@ -55,6 +55,7 @@ enum rpc_display_format_t {
RPC_DISPLAY_ALL, RPC_DISPLAY_ALL,
RPC_DISPLAY_HEX_ADDR, RPC_DISPLAY_HEX_ADDR,
RPC_DISPLAY_HEX_PORT, RPC_DISPLAY_HEX_PORT,
RPC_DISPLAY_UNIVERSAL_ADDR,
RPC_DISPLAY_MAX, RPC_DISPLAY_MAX,
}; };

View file

@ -328,6 +328,15 @@ static void xs_format_ipv4_peer_addresses(struct rpc_xprt *xprt)
ntohs(addr->sin_port)); ntohs(addr->sin_port));
} }
xprt->address_strings[RPC_DISPLAY_HEX_PORT] = buf; xprt->address_strings[RPC_DISPLAY_HEX_PORT] = buf;
buf = kzalloc(30, GFP_KERNEL);
if (buf) {
snprintf(buf, 30, NIPQUAD_FMT".%u.%u",
NIPQUAD(addr->sin_addr.s_addr),
ntohs(addr->sin_port) >> 8,
ntohs(addr->sin_port) & 0xff);
}
xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
} }
static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt) static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt)
@ -380,6 +389,15 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt)
ntohs(addr->sin6_port)); ntohs(addr->sin6_port));
} }
xprt->address_strings[RPC_DISPLAY_HEX_PORT] = buf; xprt->address_strings[RPC_DISPLAY_HEX_PORT] = buf;
buf = kzalloc(50, GFP_KERNEL);
if (buf) {
snprintf(buf, 50, NIP6_FMT".%u.%u",
NIP6(addr->sin6_addr),
ntohs(addr->sin6_port) >> 8,
ntohs(addr->sin6_port) & 0xff);
}
xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
} }
static void xs_free_peer_addresses(struct rpc_xprt *xprt) static void xs_free_peer_addresses(struct rpc_xprt *xprt)