[CCID3]: More to see in dccp_probe

This adds a few more fields of interest to /proc/net/dccpprobe, the following output ensues:

1           2          3           4     5  6     7   8        9        10   11
sec.usec   src:sport   dst:dport   size  s  rtt   p   X_calc   X_recv   X    t_ipi

Also made the formatting consistent.

Scripts that go with this can be downloaded from http://139.133.210.30/users/gerrit/dccp/dccp_probe/

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 3b1f509f51dd7000c474f420aa2ef0ebc75a08cc..1f5e3ba62065e76bf8c48b39b7a7a6a174800919 100644 (file)
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -90,15 +90,18 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
        if (port == 0 || ntohs(inet->dport) == port ||
            ntohs(inet->sport) == port) {
                if (hctx)
-                       printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d %d %d %d %d\n",
-                          NIPQUAD(inet->saddr), ntohs(inet->sport),
-                          NIPQUAD(inet->daddr), ntohs(inet->dport), size,
-                          hctx->ccid3hctx_s, hctx->ccid3hctx_rtt,
-                          hctx->ccid3hctx_p, hctx->ccid3hctx_t_ipi);
+                       printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d %d %d %d %u "
+                              "%llu %llu %d\n",
+                              NIPQUAD(inet->saddr), ntohs(inet->sport),
+                              NIPQUAD(inet->daddr), ntohs(inet->dport), size,
+                              hctx->ccid3hctx_s, hctx->ccid3hctx_rtt,
+                              hctx->ccid3hctx_p, hctx->ccid3hctx_x_calc,
+                              hctx->ccid3hctx_x_recv >> 6,
+                              hctx->ccid3hctx_x >> 6, hctx->ccid3hctx_t_ipi);
                else
                        printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d\n",
-                          NIPQUAD(inet->saddr), ntohs(inet->sport),
-                          NIPQUAD(inet->daddr), ntohs(inet->dport), size);
+                              NIPQUAD(inet->saddr), ntohs(inet->sport),
+                              NIPQUAD(inet->daddr), ntohs(inet->dport), size);
        }
 
        jprobe_return();