net: ipv6: Unify {raw,udp}6_sock_seq_show.

udp6_sock_seq_show and raw6_sock_seq_show are identical, except
the UDP version displays ports and the raw version displays the
protocol. Refactor most of the code in these two functions into
a new common ip6_dgram_sock_seq_show function, in preparation
for using it to display ICMPv6 sockets as well.

Also reduce the indentation in parts of include/net/transp_v6.h
to improve readability.

Compiles and displays reasonable results with CONFIG_IPV6={n,m,y}

Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 40 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 42923b14dfa6..b5808539cd5c 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1359,48 +1359,17 @@ static const struct inet6_protocol udpv6_protocol = {
 
 /* ------------------------------------------------------------------------ */
 #ifdef CONFIG_PROC_FS
-
-static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket)
-{
-        struct inet_sock *inet = inet_sk(sp);
-        struct ipv6_pinfo *np = inet6_sk(sp);
-        const struct in6_addr *dest, *src;
-        __u16 destp, srcp;
-
-        dest  = &np->daddr;
-        src   = &np->rcv_saddr;
-        destp = ntohs(inet->inet_dport);
-        srcp  = ntohs(inet->inet_sport);
-        seq_printf(seq,
-                   "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
-                   "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %pK %d\n",
-                   bucket,
-                   src->s6_addr32[0], src->s6_addr32[1],
-                   src->s6_addr32[2], src->s6_addr32[3], srcp,
-                   dest->s6_addr32[0], dest->s6_addr32[1],
-                   dest->s6_addr32[2], dest->s6_addr32[3], destp,
-                   sp->sk_state,
-                   sk_wmem_alloc_get(sp),
-                   sk_rmem_alloc_get(sp),
-                   0, 0L, 0,
-                   from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
-                   0,
-                   sock_i_ino(sp),
-                   atomic_read(&sp->sk_refcnt), sp,
-                   atomic_read(&sp->sk_drops));
-}
-
 int udp6_seq_show(struct seq_file *seq, void *v)
 {
-        if (v == SEQ_START_TOKEN)
-                seq_printf(seq,
-                           "  sl  "
-                           "local_address                         "
-                           "remote_address                        "
-                           "st tx_queue rx_queue tr tm->when retrnsmt"
-                           "   uid  timeout inode ref pointer drops\n");
-        else
-                udp6_sock_seq_show(seq, v, ((struct udp_iter_state *)seq->private)->bucket);
+        if (v == SEQ_START_TOKEN) {
+                seq_puts(seq, IPV6_SEQ_DGRAM_HEADER);
+        } else {
+                int bucket = ((struct udp_iter_state *)seq->private)->bucket;
+                struct inet_sock *inet = inet_sk(v);
+                __u16 srcp = ntohs(inet->inet_sport);
+                __u16 destp = ntohs(inet->inet_dport);
+                ip6_dgram_sock_seq_show(seq, v, srcp, destp, bucket);
+        }
         return 0;
 }