lsfd: introduce SOCK. column namespace

lsfd has many columns already. We will add more in the future.
e.g. --help output is too long.

Groping columns is one of the ways to improve the usability of lsfd.
As the first step, this change introduces the "SOCK." column namespace.

Conceptually SOCKNETNS, SOCKSTATE, and SOCKTYPE migrate to the
namespace.  At the implementation level, they are renamed to
SOCK.NETNS, SOCK.STATE, and SOCK.TYPE.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

diff --git a/misc-utils/lsfd-sock.c b/misc-utils/lsfd-sock.c
index 1c9d8bf202941053a975c8f191093cf44c65eb3b..ff2f179b0043f622f59c76d6b57d89d222d3a0ad 100644 (file)
--- a/misc-utils/lsfd-sock.c
+++ b/misc-utils/lsfd-sock.c
@@ -68,14 +68,14 @@ static bool sock_fill_column(struct proc *proc __attribute__((__unused__)),
                        break;
                }
                return false;
-       case COL_SOCKNETNS:
+       case COL_SOCK_NETNS:
                if (sock->xinfo) {
                        xasprintf(&str, "%llu",
                                  (unsigned long long)sock->xinfo->netns_inode);
                        break;
                }
                return false;
-       case COL_SOCKTYPE:
+       case COL_SOCK_TYPE:
                if (sock->xinfo
                    && sock->xinfo->class && sock->xinfo->class->get_type) {
                        str = sock->xinfo->class->get_type(sock->xinfo, sock);
@@ -83,7 +83,7 @@ static bool sock_fill_column(struct proc *proc __attribute__((__unused__)),
                                break;
                }
                return false;
-       case COL_SOCKSTATE:
+       case COL_SOCK_STATE:
                if (sock->xinfo
                    && sock->xinfo->class && sock->xinfo->class->get_state) {
                        str = sock->xinfo->class->get_state(sock->xinfo, sock);
@@ -91,7 +91,7 @@ static bool sock_fill_column(struct proc *proc __attribute__((__unused__)),
                                break;
                }
                return false;
-       case COL_SOCKLISTENING:
+       case COL_SOCK_LISTENING:
                str = xstrdup((sock->xinfo
                               && sock->xinfo->class
                               && sock->xinfo->class->get_listening

diff --git a/misc-utils/lsfd.1.adoc b/misc-utils/lsfd.1.adoc
index 5a2d566d468e8994a4eac4560ffe81c49bbbf45c..f095f4b5f5164d446ac519f92f523fbbaf06340f 100644 (file)
--- a/misc-utils/lsfd.1.adoc
+++ b/misc-utils/lsfd.1.adoc
@@ -212,10 +212,10 @@ pid=_TARGET-PID_ comm=_TARGET-COMMAND_ nspid=_TARGET-NSPIDS_
 ``/proc/``_pid_``/fdinfo/``_fd_.
 +
 UNIX-STREAM:::
-state=_SOCKSTATE_[ path=_UNIX.PATH_]
+state=_SOCK.STATE_[ path=_UNIX.PATH_]
 +
 UNIX:::
-state=_SOCKSTATE_[ path=_UNIX.PATH_] type=_SOCKTYPE_
+state=_SOCK.STATE_[ path=_UNIX.PATH_] type=_SOCK.TYPE_
 
 NLINK <``number``>::
 Link count.
@@ -263,16 +263,16 @@ Device ID (if special file).
 SIZE <``number``>::
 File size.
 
-SOCKLISTENING <``boolean``>::
+SOCK.LISTENING <``boolean``>::
 Listening socket.
 
-SOCKNETS <``number``>::
+SOCK.NETS <``number``>::
 Inode identifying network namespace where the socket belogs to.
 
-SOCKSTATE <``string``>::
+SOCK.STATE <``string``>::
 State of socket.
 
-SOCKTYPE <``string``>::
+SOCK.TYPE <``string``>::
 Type of socket. Here type means the second parameter of
 socket system call:
 +

diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index 5b32f4b98a17da5723bd7c05c8ed9b29b759c4d0..2f94072372d2fea3ec8ba028ad09b9cb197eccc8 100644 (file)
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -189,13 +189,13 @@ static struct colinfo infos[] = {
                N_("device ID (if special file)") },
        [COL_SIZE]    = { "SIZE",     4, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER,
                N_("file size"), },
-       [COL_SOCKLISTENING]={"SOCKLISTENING",0,SCOLS_FL_RIGHT,SCOLS_JSON_BOOLEAN,
+       [COL_SOCK_LISTENING]={"SOCK.LISTENING",0,SCOLS_FL_RIGHT,SCOLS_JSON_BOOLEAN,
                N_("listening socket") },
-       [COL_SOCKNETNS]={"SOCKNETNS", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER,
+       [COL_SOCK_NETNS]={"SOCK.NETNS", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER,
                N_("inode identifying network namespace where the socket belongs to") },
-       [COL_SOCKSTATE]={"SOCKSTATE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
+       [COL_SOCK_STATE]={"SOCK.STATE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
                N_("State of socket") },
-       [COL_SOCKTYPE] ={"SOCKTYPE",  0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
+       [COL_SOCK_TYPE] ={"SOCK.TYPE",  0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
                N_("Type of socket") },
        [COL_SOURCE] = { "SOURCE",    0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
                N_("file system, partition, or device containing file") },

diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h
index e79449229e37dd4e868d5ed147f6b10aee6fa644..83dea34c76238872f29929b00de1b88712fcfdc0 100644 (file)
--- a/misc-utils/lsfd.h
+++ b/misc-utils/lsfd.h
@@ -69,10 +69,10 @@ enum {
        COL_PROTONAME,
        COL_RDEV,
        COL_SIZE,
-       COL_SOCKLISTENING,
-       COL_SOCKNETNS,
-       COL_SOCKSTATE,
-       COL_SOCKTYPE,
+       COL_SOCK_LISTENING,
+       COL_SOCK_NETNS,
+       COL_SOCK_STATE,
+       COL_SOCK_TYPE,
        COL_SOURCE,
        COL_STTYPE,
        COL_TCP_LADDR,

diff --git a/tests/expected/lsfd/mkfds-tcp b/tests/expected/lsfd/mkfds-tcp
index 0ea80d2459fcfda71fab60a18dcfeca6fc72b81b..dfec0ae8e1d9cff5e1b6bb1862b260503443b1a8 100644 (file)
--- a/tests/expected/lsfd/mkfds-tcp
+++ b/tests/expected/lsfd/mkfds-tcp
@@ -1,4 +1,4 @@
-    3  TCP   SOCK state=listen laddr=127.0.0.1:34567                                 listen   stream             1  127.0.0.1    0.0.0.0 127.0.0.1:34567     34567       0.0.0.0:0         0
-    4  TCP   SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established   stream             0  127.0.0.1  127.0.0.1 127.0.0.1:23456     23456 127.0.0.1:34567     34567
-    5  TCP   SOCK state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 established   stream             0  127.0.0.1  127.0.0.1 127.0.0.1:34567     34567 127.0.0.1:23456     23456
-ASSOC,TYPE,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0
+    3  TCP   SOCK state=listen laddr=127.0.0.1:34567                                 listen    stream              1  127.0.0.1    0.0.0.0 127.0.0.1:34567     34567       0.0.0.0:0         0
+    4  TCP   SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established    stream              0  127.0.0.1  127.0.0.1 127.0.0.1:23456     23456 127.0.0.1:34567     34567
+    5  TCP   SOCK state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 established    stream              0  127.0.0.1  127.0.0.1 127.0.0.1:34567     34567 127.0.0.1:23456     23456
+ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0

diff --git a/tests/expected/lsfd/mkfds-unix-dgram b/tests/expected/lsfd/mkfds-unix-dgram
index 02eba974c95892ee752948f2cc71a7c9a0d60822..b8fd9d477868d585218eefcc98e1c7362e95c085 100644 (file)
--- a/tests/expected/lsfd/mkfds-unix-dgram
+++ b/tests/expected/lsfd/mkfds-unix-dgram
@@ -1,6 +1,6 @@
-    3   SOCK state=connected path=test_mkfds-unix-dgram type=dgram connected    dgram             0 test_mkfds-unix-dgram
-    4   SOCK state=connected type=dgram                            connected    dgram             0 
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
-    3   SOCK state=connected path=@test_mkfds-unix-dgram type=dgram connected    dgram             0 @test_mkfds-unix-dgram
-    4   SOCK state=connected type=dgram                             connected    dgram             0 
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
+    3   SOCK state=connected path=test_mkfds-unix-dgram type=dgram  connected     dgram              0 test_mkfds-unix-dgram
+    4   SOCK state=connected type=dgram                             connected     dgram              0 
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
+    3   SOCK state=connected path=@test_mkfds-unix-dgram type=dgram  connected     dgram              0 @test_mkfds-unix-dgram
+    4   SOCK state=connected type=dgram                              connected     dgram              0 
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0

diff --git a/tests/expected/lsfd/mkfds-unix-in-netns b/tests/expected/lsfd/mkfds-unix-in-netns
index e187753e8fd1b8795bc95784535a57a294dfc4c2..d49f1e7c79cca2e665bbb3f8ca75d9c022faf1cb 100644 (file)
--- a/tests/expected/lsfd/mkfds-unix-in-netns
+++ b/tests/expected/lsfd/mkfds-unix-in-netns
@@ -1,18 +1,18 @@
-    5   SOCK state=listen path=test_mkfds-unix-stream-ns    listen   stream             1 test_mkfds-unix-stream-ns
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
+    5   SOCK state=listen path=test_mkfds-unix-stream-ns     listen    stream              1 test_mkfds-unix-stream-ns
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
 the netns for the stream socket is extracted as expectedly
-    5   SOCK state=listen path=@test_mkfds-unix-stream-ns    listen   stream             1 @test_mkfds-unix-stream-ns
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
+    5   SOCK state=listen path=@test_mkfds-unix-stream-ns     listen    stream              1 @test_mkfds-unix-stream-ns
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
 the netns for the abstract stream socket is extracted as expectedly
-    5   SOCK state=unconnected path=test_mkfds-unix-dgram-ns type=dgram unconnected    dgram             0 test_mkfds-unix-dgram-ns
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
+    5   SOCK state=unconnected path=test_mkfds-unix-dgram-ns type=dgram unconnected     dgram              0 test_mkfds-unix-dgram-ns
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
 the netns for the dgram socket is extracted as expectedly
-    5   SOCK state=unconnected path=@test_mkfds-unix-dgram-ns type=dgram unconnected    dgram             0 @test_mkfds-unix-dgram-ns
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
+    5   SOCK state=unconnected path=@test_mkfds-unix-dgram-ns type=dgram unconnected     dgram              0 @test_mkfds-unix-dgram-ns
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
 the netns for the abstract dgram socket is extracted as expectedly
-    5   SOCK state=listen path=test_mkfds-unix-seqpacket-ns type=seqpacket    listen seqpacket             1 test_mkfds-unix-seqpacket-ns
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
+    5   SOCK state=listen path=test_mkfds-unix-seqpacket-ns type=seqpacket     listen seqpacket              1 test_mkfds-unix-seqpacket-ns
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
 the netns for the seqpacket socket is extracted as expectedly
-    5   SOCK state=listen path=@test_mkfds-unix-seqpacket-ns type=seqpacket    listen seqpacket             1 @test_mkfds-unix-seqpacket-ns
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
+    5   SOCK state=listen path=@test_mkfds-unix-seqpacket-ns type=seqpacket     listen seqpacket              1 @test_mkfds-unix-seqpacket-ns
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
 the netns for the abstract seqpacket socket is extracted as expectedly

diff --git a/tests/expected/lsfd/mkfds-unix-stream b/tests/expected/lsfd/mkfds-unix-stream
index 01abba478bd0c27ba4466d968ba5a2e34c266ff3..281467a8719aaa9dbab61ae32c03b4a6faaea30d 100644 (file)
--- a/tests/expected/lsfd/mkfds-unix-stream
+++ b/tests/expected/lsfd/mkfds-unix-stream
@@ -1,24 +1,24 @@
-    3   SOCK state=listen path=test_mkfds-unix-stream       listen   stream             1 test_mkfds-unix-stream
-    4   SOCK state=connected                             connected   stream             0 
-    5   SOCK state=connected path=test_mkfds-unix-stream connected   stream             0 test_mkfds-unix-stream
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
-    3   SOCK state=listen path=@test_mkfds-unix-stream-abs       listen   stream             1 @test_mkfds-unix-stream-abs
-    4   SOCK state=connected                                  connected   stream             0 
-    5   SOCK state=connected path=@test_mkfds-unix-stream-abs connected   stream             0 @test_mkfds-unix-stream-abs
-(abs) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
-    3   SOCK state=listen path=test_mkfds-unix-stream-shutdown       listen   stream             1 test_mkfds-unix-stream-shutdown
-    4   SOCK state=connected                                      connected   stream             0 
-    5   SOCK state=connected path=test_mkfds-unix-stream-shutdown connected   stream             0 test_mkfds-unix-stream-shutdown
-(shutdown) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
-    3   SOCK state=listen path=test_mkfds-unix-seqpacket type=seqpacket       listen seqpacket             1 test_mkfds-unix-seqpacket
-    4   SOCK state=connected type=seqpacket                                connected seqpacket             0 
-    5   SOCK state=connected path=test_mkfds-unix-seqpacket type=seqpacket connected seqpacket             0 test_mkfds-unix-seqpacket
-ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
-    3   SOCK state=listen path=@test_mkfds-unix-seqpacket-abs       listen   stream             1 @test_mkfds-unix-seqpacket-abs
-    4   SOCK state=connected                                     connected   stream             0 
-    5   SOCK state=connected path=@test_mkfds-unix-seqpacket-abs connected   stream             0 @test_mkfds-unix-seqpacket-abs
-(abs) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
-    3   SOCK state=listen path=test_mkfds-unix-seqpacket-shutdown type=seqpacket       listen seqpacket             1 test_mkfds-unix-seqpacket-shutdown
-    4   SOCK state=connected type=seqpacket                                         connected seqpacket             0 
-    5   SOCK state=connected path=test_mkfds-unix-seqpacket-shutdown type=seqpacket connected seqpacket             0 test_mkfds-unix-seqpacket-shutdown
-(shutdown) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH: 0
+    3   SOCK state=listen path=test_mkfds-unix-stream        listen    stream              1 test_mkfds-unix-stream
+    4   SOCK state=connected                              connected    stream              0 
+    5   SOCK state=connected path=test_mkfds-unix-stream  connected    stream              0 test_mkfds-unix-stream
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
+    3   SOCK state=listen path=@test_mkfds-unix-stream-abs        listen    stream              1 @test_mkfds-unix-stream-abs
+    4   SOCK state=connected                                   connected    stream              0 
+    5   SOCK state=connected path=@test_mkfds-unix-stream-abs  connected    stream              0 @test_mkfds-unix-stream-abs
+(abs) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
+    3   SOCK state=listen path=test_mkfds-unix-stream-shutdown        listen    stream              1 test_mkfds-unix-stream-shutdown
+    4   SOCK state=connected                                       connected    stream              0 
+    5   SOCK state=connected path=test_mkfds-unix-stream-shutdown  connected    stream              0 test_mkfds-unix-stream-shutdown
+(shutdown) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
+    3   SOCK state=listen path=test_mkfds-unix-seqpacket type=seqpacket        listen seqpacket              1 test_mkfds-unix-seqpacket
+    4   SOCK state=connected type=seqpacket                                 connected seqpacket              0 
+    5   SOCK state=connected path=test_mkfds-unix-seqpacket type=seqpacket  connected seqpacket              0 test_mkfds-unix-seqpacket
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
+    3   SOCK state=listen path=@test_mkfds-unix-seqpacket-abs        listen    stream              1 @test_mkfds-unix-seqpacket-abs
+    4   SOCK state=connected                                      connected    stream              0 
+    5   SOCK state=connected path=@test_mkfds-unix-seqpacket-abs  connected    stream              0 @test_mkfds-unix-seqpacket-abs
+(abs) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
+    3   SOCK state=listen path=test_mkfds-unix-seqpacket-shutdown type=seqpacket        listen seqpacket              1 test_mkfds-unix-seqpacket-shutdown
+    4   SOCK state=connected type=seqpacket                                          connected seqpacket              0 
+    5   SOCK state=connected path=test_mkfds-unix-seqpacket-shutdown type=seqpacket  connected seqpacket              0 test_mkfds-unix-seqpacket-shutdown
+(shutdown) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0

diff --git a/tests/ts/lsfd/mkfds-tcp b/tests/ts/lsfd/mkfds-tcp
index 374def7a079903ffddef159586893160bc215002..129e74b0b8212932bafa40014cfe2c132628163a 100755 (executable)
--- a/tests/ts/lsfd/mkfds-tcp
+++ b/tests/ts/lsfd/mkfds-tcp
@@ -37,9 +37,9 @@ EXPR='(TYPE == "TCP") and (FD >= 3) and (FD <= 5)'
                                      client-port=23456 ; }
     if read -r -u "${MKFDS[0]}" PID; then
        ${TS_CMD_LSFD} -n \
-                      -o ASSOC,TYPE,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT \
+                      -o ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT \
                       -p "${PID}" -Q "${EXPR}"
-       echo 'ASSOC,TYPE,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT': $?
+       echo 'ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT': $?
 
        kill -CONT "${PID}"
        wait "${MKFDS_PID}"

diff --git a/tests/ts/lsfd/mkfds-unix-dgram b/tests/ts/lsfd/mkfds-unix-dgram
index 8707f6d6f5001fd27b5f1a72b3bc25e80d808fa2..c211a65f86a3c4930492c824b9376f7afd97fb2e 100755 (executable)
--- a/tests/ts/lsfd/mkfds-unix-dgram
+++ b/tests/ts/lsfd/mkfds-unix-dgram
@@ -35,9 +35,9 @@ EXPR='(TYPE == "UNIX") and ((FD == 3) or (FD == 4))'
                                      path=test_mkfds-unix-dgram ; }
     if read -r -u "${MKFDS[0]}" PID; then
        ${TS_CMD_LSFD} -n \
-                      -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH \
+                      -o ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH \
                       -p "${PID}" -Q "${EXPR}"
-       echo 'ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH': $?
+       echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
        kill -CONT "${PID}"
        wait "${MKFDS_PID}"
@@ -48,9 +48,9 @@ EXPR='(TYPE == "UNIX") and ((FD == 3) or (FD == 4))'
                                      abstract=true ; }
     if read -r -u "${MKFDS[0]}" PID; then
        ${TS_CMD_LSFD} -n \
-                      -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH \
+                      -o ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH \
                       -p "${PID}" -Q "${EXPR}"
-       echo 'ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH': $?
+       echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
        kill -CONT "${PID}"
        wait "${MKFDS_PID}"

diff --git a/tests/ts/lsfd/mkfds-unix-in-netns b/tests/ts/lsfd/mkfds-unix-in-netns
index 87a6fabc336dcbb31793ac49f49acce78c83f964..a0e3bc887095e6230406df6118f4d731aa23d956 100755 (executable)
--- a/tests/ts/lsfd/mkfds-unix-in-netns
+++ b/tests/ts/lsfd/mkfds-unix-in-netns
@@ -42,7 +42,7 @@ compare_net_namespaces()
     local sock_netns
 
     altns_inode=$(${TS_CMD_LSFD} -n -o INODE -p "${pid}" -Q '(FD == 4)')
-    sock_netns=$(${TS_CMD_LSFD} -n -o SOCKNETNS -p "${pid}" -Q '(FD == 5)')
+    sock_netns=$(${TS_CMD_LSFD} -n -o SOCK.NETNS -p "${pid}" -Q '(FD == 5)')
 
     if [[ "${altns_inode}" == "${sock_netns}" ]]; then
        echo "the netns for the $type socket is extracted as expectedly"
@@ -60,9 +60,9 @@ compare_net_namespaces()
                                          type=$t ; }
        if read -r -u "${MKFDS[0]}" PID; then
            ${TS_CMD_LSFD} -n \
-                          -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH \
+                          -o ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH \
                           -p "${PID}" -Q "${EXPR}"
-           echo 'ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH': $?
+           echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
            compare_net_namespaces "$t" "${PID}"
 
@@ -76,9 +76,9 @@ compare_net_namespaces()
                                          type=$t ; }
        if read -r -u "${MKFDS[0]}" PID; then
            ${TS_CMD_LSFD} -n \
-                          -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH \
+                          -o ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH \
                           -p "${PID}" -Q "${EXPR}"
-           echo 'ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH': $?
+           echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
            compare_net_namespaces "abstract $t" "${PID}"
 

diff --git a/tests/ts/lsfd/mkfds-unix-stream b/tests/ts/lsfd/mkfds-unix-stream
index dc724f410b0e29a61403fe6361fd316f62785708..3d7b31890461140a8b4da04be3da72a80d4f2439 100755 (executable)
--- a/tests/ts/lsfd/mkfds-unix-stream
+++ b/tests/ts/lsfd/mkfds-unix-stream
@@ -40,9 +40,9 @@ EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5)
                                          type=$t ; }
        if read -r -u "${MKFDS[0]}" PID; then
            ${TS_CMD_LSFD} -n \
-                          -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH \
+                          -o ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH \
                           -p "${PID}" -Q "${EXPR}"
-           echo 'ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH': $?
+           echo 'ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
            kill -CONT "${PID}"
            wait "${MKFDS_PID}"
@@ -53,9 +53,9 @@ EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5)
                                          abstract=true ; }
        if read -r -u "${MKFDS[0]}" PID; then
            ${TS_CMD_LSFD} -n \
-                          -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH \
+                          -o ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH \
                           -p "${PID}" -Q "${EXPR}"
-           echo '(abs) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH': $?
+           echo '(abs) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
 
            kill -CONT "${PID}"
            wait "${MKFDS_PID}"
@@ -68,9 +68,9 @@ EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5)
                                          type=$t ; }
        if read -r -u "${MKFDS[0]}" PID; then
            ${TS_CMD_LSFD} -n \
-                          -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH \
+                          -o ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH \
                           -p "${PID}" -Q "${EXPR}"
-           echo '(shutdown) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,SOCKLISTENING,UNIX.PATH': $?
+           echo '(shutdown) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH': $?
            # Surprisingly, the socket status doesn't change at all.
 
            kill -CONT "${PID}"