[PATCH] knfsd: SUNRPC: Add a function to format the address in an svc_rqst for printing

There are loads of places where the RPC server assumes that the rq_addr fields
contains an IPv4 address.  Top among these are error and debugging messages
that display the server's IP address.

Let's refactor the address printing into a separate function that's smart
enough to figure out the difference between IPv4 and IPv6 addresses.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 57 insertions, 19 deletions

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index a98be09768a0..08de328ce433 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -41,6 +41,7 @@
 #include <asm/ioctls.h>
 
 #include <linux/sunrpc/types.h>
+#include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/sunrpc/stats.h>
@@ -121,6 +122,41 @@ static inline void svc_reclassify_socket(struct socket *sock)
 }
 #endif
 
+static char *__svc_print_addr(struct sockaddr *addr, char *buf, size_t len)
+{
+        switch (addr->sa_family) {
+        case AF_INET:
+                snprintf(buf, len, "%u.%u.%u.%u, port=%u",
+                        NIPQUAD(((struct sockaddr_in *) addr)->sin_addr),
+                        htons(((struct sockaddr_in *) addr)->sin_port));
+                break;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        case AF_INET6:
+                snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x, port=%u",
+                        NIP6(((struct sockaddr_in6 *) addr)->sin6_addr),
+                        htons(((struct sockaddr_in6 *) addr)->sin6_port));
+                break;
+#endif
+        default:
+                snprintf(buf, len, "unknown address type: %d", addr->sa_family);
+                break;
+        }
+        return buf;
+}
+
+/**
+ * svc_print_addr - Format rq_addr field for printing
+ * @rqstp: svc_rqst struct containing address to print
+ * @buf: target buffer for formatted address
+ * @len: length of target buffer
+ *
+ */
+char *svc_print_addr(struct svc_rqst *rqstp, char *buf, size_t len)
+{
+        return __svc_print_addr((struct sockaddr *) &rqstp->rq_addr, buf, len);
+}
+EXPORT_SYMBOL_GPL(svc_print_addr);
+
 /*
  * Queue up an idle server thread.  Must have pool->sp_lock held.
  * Note: this is really a stack rather than a queue, so that we only
@@ -429,6 +465,7 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
         size_t          base = xdr->page_base;
         unsigned int    pglen = xdr->page_len;
         unsigned int    flags = MSG_MORE;
+        char            buf[RPC_MAX_ADDRBUFLEN];
 
         slen = xdr->len;
 
@@ -491,9 +528,9 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
                         len += result;
         }
 out:
-        dprintk("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %x)\n",
-                        rqstp->rq_sock, xdr->head[0].iov_base, xdr->head[0].iov_len, xdr->len, len,
-                rqstp->rq_addr.sin_addr.s_addr);
+        dprintk("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %s)\n",
+                rqstp->rq_sock, xdr->head[0].iov_base, xdr->head[0].iov_len,
+                xdr->len, len, svc_print_addr(rqstp, buf, sizeof(buf)));
 
         return len;
 }
@@ -878,6 +915,7 @@ svc_tcp_accept(struct svc_sock *svsk)
         struct socket   *newsock;
         struct svc_sock *newsvsk;
         int             err, slen;
+        char            buf[RPC_MAX_ADDRBUFLEN];
 
         dprintk("svc: tcp_accept %p sock %p\n", svsk, sock);
         if (!sock)
@@ -908,18 +946,19 @@ svc_tcp_accept(struct svc_sock *svsk)
         }
 
         /* Ideally, we would want to reject connections from unauthorized
-         * hosts here, but when we get encription, the IP of the host won't
-         * tell us anything. For now just warn about unpriv connections.
+         * hosts here, but when we get encryption, the IP of the host won't
+         * tell us anything.  For now just warn about unpriv connections.
          */
         if (ntohs(sin.sin_port) >= 1024) {
                 dprintk(KERN_WARNING
-                        "%s: connect from unprivileged port: %u.%u.%u.%u:%d\n",
+                        "%s: connect from unprivileged port: %s\n",
                         serv->sv_name,
-                        NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));
+                        __svc_print_addr((struct sockaddr *) &sin, buf,
+                                                                sizeof(buf)));
         }
-
-        dprintk("%s: connect from %u.%u.%u.%u:%04x\n", serv->sv_name,
-                        NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));
+        dprintk("%s: connect from %s\n", serv->sv_name,
+                __svc_print_addr((struct sockaddr *) &sin, buf,
+                                 sizeof(buf)));
 
         /* make sure that a write doesn't block forever when
          * low on memory
@@ -955,11 +994,9 @@ svc_tcp_accept(struct svc_sock *svsk)
                                         "sockets, consider increasing the "
                                         "number of nfsd threads\n",
                                                    serv->sv_name);
-                                printk(KERN_NOTICE "%s: last TCP connect from "
-                                        "%u.%u.%u.%u:%d\n",
-                                        serv->sv_name,
-                                        NIPQUAD(sin.sin_addr.s_addr),
-                                        ntohs(sin.sin_port));
+                                printk(KERN_NOTICE
+                                       "%s: last TCP connect from %s\n",
+                                       serv->sv_name, buf);
                         }
                         /*
                          * Always select the oldest socket. It's not fair,
@@ -1587,11 +1624,12 @@ static int svc_create_socket(struct svc_serv *serv, int protocol,
         struct socket   *sock;
         int             error;
         int             type;
+        char            buf[RPC_MAX_ADDRBUFLEN];
 
-        dprintk("svc: svc_create_socket(%s, %d, %u.%u.%u.%u:%d)\n",
-                                serv->sv_program->pg_name, protocol,
-                                NIPQUAD(sin->sin_addr.s_addr),
-                                ntohs(sin->sin_port));
+        dprintk("svc: svc_create_socket(%s, %d, %s)\n",
+                        serv->sv_program->pg_name, protocol,
+                        __svc_print_addr((struct sockaddr *) sin, buf,
+                                                                sizeof(buf)));
 
         if (protocol != IPPROTO_UDP && protocol != IPPROTO_TCP) {
                 printk(KERN_WARNING "svc: only UDP and TCP "