ss: add missing path MTU parameter

v3:
   Rebase and use out() instead of printf().
v2:
   Print the path MTU immediately after the MSS, as it is easier to parse
   for humans (suggested by Neal Cardwell).

Signed-off-by: Roman Mashak <mrv@mojatatu.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/man/man8/ss.8 b/man/man8/ss.8
index 6d06383bfc945e0170fae44ad8b5e1335c10beb7..0d526734594b411a781c007d2264a6aace75bca3 100644 (file)
--- a/man/man8/ss.8
+++ b/man/man8/ss.8
@@ -184,6 +184,10 @@ max segment size
 congestion window size
 .P
 .TP
+.B pmtu:<pmtu>
+path MTU value
+.P
+.TP
 .B ssthresh:<ssthresh>
 tcp congestion window slow start threshold
 .P

diff --git a/misc/ss.c b/misc/ss.c
index 9d21ed7a07057584d56c92b421d6dae8b731c183..1abf43d08091a9fd1f42e4b186105747a384a2f3 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -790,6 +790,7 @@ struct tcpstat {
        int                 mss;
        int                 rcv_mss;
        int                 advmss;
+       unsigned int        pmtu;
        unsigned int        cwnd;
        unsigned int        lastsnd;
        unsigned int        lastrcv;
@@ -2360,6 +2361,8 @@ static void tcp_stats_print(struct tcpstat *s)
 
        if (s->mss)
                out(" mss:%d", s->mss);
+       if (s->pmtu)
+               out(" pmtu:%u", s->pmtu);
        if (s->rcv_mss)
                out(" rcvmss:%d", s->rcv_mss);
        if (s->advmss)
@@ -2707,6 +2710,7 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
                s.reordering     = info->tcpi_reordering;
                s.rcv_ssthresh   = info->tcpi_rcv_ssthresh;
                s.cwnd           = info->tcpi_snd_cwnd;
+               s.pmtu           = info->tcpi_pmtu;
 
                if (info->tcpi_snd_ssthresh < 0xFFFF)
                        s.ssthresh = info->tcpi_snd_ssthresh;