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>

2 files changed, 19 insertions, 0 deletions

diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 4596c26f97aa..902a9c0a2d9a 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -55,6 +55,7 @@ enum rpc_display_format_t {
         RPC_DISPLAY_ALL,
         RPC_DISPLAY_HEX_ADDR,
         RPC_DISPLAY_HEX_PORT,
+        RPC_DISPLAY_UNIVERSAL_ADDR,
         RPC_DISPLAY_MAX,
 };
 
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 01121a4f0851..7a154e4b70f5 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -328,6 +328,15 @@ static void xs_format_ipv4_peer_addresses(struct rpc_xprt *xprt)
                                 ntohs(addr->sin_port));
         }
         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)
@@ -380,6 +389,15 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt)
                                 ntohs(addr->sin6_port));
         }
         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)