iproute2: ss - fix missing parameters

Signed-off-by: Petr Sabata <contyk@redhat.com>

diff --git a/man/man8/ss.8 b/man/man8/ss.8
index b309df2da0ba22a00dba23a940646b53fc25bd29..0b9a8c435176a6a4e06abc454a2771f37d4ab71f 100644 (file)
--- a/man/man8/ss.8
+++ b/man/man8/ss.8
@@ -85,12 +85,12 @@ Display Unix domain sockets (alias for -f unix).
 Display sockets of type FAMILY.
 Currently the following families are supported: unix, inet, inet6, link, netlink.
 .TP
-.B \-A QUERY, \-\-query=QUERY
+.B \-A QUERY, \-\-query=QUERY, \-\-socket=QUERY
 List of socket tables to dump, separated by commas. The following identifiers
 are understood: all, inet, tcp, udp, raw, unix, packet, netlink, unix_dgram,
 unix_stream, packet_raw, packet_dgram.
 .TP
-.B \-D FILE
+.B \-D FILE, \-\-diag=FILE
 Do not display anything, just dump raw information about TCP sockets to FILE after applying filters. If FILE is - stdout is used.
 .TP
 .B \-F FILE, \-\-filter=FILE

diff --git a/misc/ss.c b/misc/ss.c
index 1597ff9c85ae1d54b41e409fbc226dd341cc24e3..253f8d3cd3097524d69da1b2b5e1ab15c4ce8f59 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -2416,9 +2416,10 @@ static void _usage(FILE *dest)
 "   -x, --unix         display only Unix domain sockets\n"
 "   -f, --family=FAMILY display sockets of type FAMILY\n"
 "\n"
-"   -A, --query=QUERY\n"
+"   -A, --query=QUERY, --socket=QUERY\n"
 "       QUERY := {all|inet|tcp|udp|raw|unix|packet|netlink}[,QUERY]\n"
 "\n"
+"   -D, --diag=FILE     Dump raw information about TCP sockets to FILE\n"
 "   -F, --filter=FILE   read filter information from FILE\n"
 "       FILTER := [ state TCP-STATE ] [ EXPRESSION ]\n"
                );
@@ -2486,8 +2487,9 @@ static const struct option long_opts[] = {
        { "packet", 0, 0, '0' },
        { "family", 1, 0, 'f' },
        { "socket", 1, 0, 'A' },
+       { "query", 1, 0, 'A' },
        { "summary", 0, 0, 's' },
-       { "diag", 0, 0, 'D' },
+       { "diag", 1, 0, 'D' },
        { "filter", 1, 0, 'F' },
        { "version", 0, 0, 'V' },
        { "help", 0, 0, 'h' },