From e193602afdbe2d8c39863aaa08d39495d12cbaef Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sun, 2 Oct 2022 06:16:29 +0900 Subject: [PATCH] lsfd: move PROTONAME column to SOCK. column namespace Signed-off-by: Masatake YAMATO --- misc-utils/lsfd-sock.c | 2 +- misc-utils/lsfd.1.adoc | 8 ++++---- misc-utils/lsfd.c | 4 ++-- misc-utils/lsfd.h | 2 +- tests/expected/lsfd/mkfds-mapped-packet-socket | 4 ++-- tests/expected/lsfd/mkfds-socketpair | 6 +++--- tests/ts/lsfd/mkfds-mapped-packet-socket | 4 ++-- tests/ts/lsfd/mkfds-socketpair | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/misc-utils/lsfd-sock.c b/misc-utils/lsfd-sock.c index ff2f179b00..e99e235089 100644 --- a/misc-utils/lsfd-sock.c +++ b/misc-utils/lsfd-sock.c @@ -48,7 +48,7 @@ static bool sock_fill_column(struct proc *proc __attribute__((__unused__)), if (!sock->protoname) return false; /* FALL THROUGH */ - case COL_PROTONAME: + case COL_SOCK_PROTONAME: if (sock->protoname) if (scols_line_set_data(ln, column_index, sock->protoname)) err(EXIT_FAILURE, _("failed to add output data")); diff --git a/misc-utils/lsfd.1.adoc b/misc-utils/lsfd.1.adoc index f095f4b5f5..c5e6f05623 100644 --- a/misc-utils/lsfd.1.adoc +++ b/misc-utils/lsfd.1.adoc @@ -254,9 +254,6 @@ PID of the process targeted by the pidfd. POS <``number``>:: File position. -PROTONAME <``string``>:: -Protocol name. - RDEV <``string``>:: Device ID (if special file). @@ -269,6 +266,9 @@ Listening socket. SOCK.NETS <``number``>:: Inode identifying network namespace where the socket belogs to. +SOCK.PROTONAME <``string``>:: +Protocol name. + SOCK.STATE <``string``>:: State of socket. @@ -307,7 +307,7 @@ Thread ID of the process opening the file. TYPE <``string``>:: Cooked version of STTYPE. It is same as STTYPE with exceptions. -For SOCK, print the value for PROTONAME. +For SOCK, print the value for SOCK.PROTONAME. For UNKN, print the value for AINODECLASS if SOURCE is anon_inodefs. UID <``number``>:: diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c index 2f94072372..b109c1a9f3 100644 --- a/misc-utils/lsfd.c +++ b/misc-utils/lsfd.c @@ -183,8 +183,6 @@ static struct colinfo infos[] = { N_("PID of the process targeted by the pidfd") }, [COL_POS] = { "POS", 5, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, N_("file position") }, - [COL_PROTONAME]={ "PROTONAME",0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, - N_("protocol name") }, [COL_RDEV] = { "RDEV", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, N_("device ID (if special file)") }, [COL_SIZE] = { "SIZE", 4, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, @@ -193,6 +191,8 @@ static struct colinfo infos[] = { N_("listening socket") }, [COL_SOCK_NETNS]={"SOCK.NETNS", 0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER, N_("inode identifying network namespace where the socket belongs to") }, + [COL_SOCK_PROTONAME]={"SOCK.PROTONAME",0,SCOLS_FL_RIGHT,SCOLS_JSON_STRING, + N_("protocol name") }, [COL_SOCK_STATE]={"SOCK.STATE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, N_("State of socket") }, [COL_SOCK_TYPE] ={"SOCK.TYPE", 0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING, diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h index 83dea34c76..3c15cbf99c 100644 --- a/misc-utils/lsfd.h +++ b/misc-utils/lsfd.h @@ -66,11 +66,11 @@ enum { COL_PIDFD_NSPID, COL_PIDFD_PID, COL_POS, - COL_PROTONAME, COL_RDEV, COL_SIZE, COL_SOCK_LISTENING, COL_SOCK_NETNS, + COL_SOCK_PROTONAME, COL_SOCK_STATE, COL_SOCK_TYPE, COL_SOURCE, diff --git a/tests/expected/lsfd/mkfds-mapped-packet-socket b/tests/expected/lsfd/mkfds-mapped-packet-socket index 43c99015ce..59bc863b95 100644 --- a/tests/expected/lsfd/mkfds-mapped-packet-socket +++ b/tests/expected/lsfd/mkfds-mapped-packet-socket @@ -1,2 +1,2 @@ - PACKET -PROTONAME: 0 + PACKET +SOCK.PROTONAME: 0 diff --git a/tests/expected/lsfd/mkfds-socketpair b/tests/expected/lsfd/mkfds-socketpair index 48b4ca24e0..a015353996 100644 --- a/tests/expected/lsfd/mkfds-socketpair +++ b/tests/expected/lsfd/mkfds-socketpair @@ -1,3 +1,3 @@ - 3 rw- SOCK sockfs UNIX - 4 rw- SOCK sockfs UNIX -ASSOC,MODE,STTYPE,SOURCE,PROTONAME: 0 + 3 rw- SOCK sockfs UNIX + 4 rw- SOCK sockfs UNIX +ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME: 0 diff --git a/tests/ts/lsfd/mkfds-mapped-packet-socket b/tests/ts/lsfd/mkfds-mapped-packet-socket index bad564ea59..1efa75492a 100755 --- a/tests/ts/lsfd/mkfds-mapped-packet-socket +++ b/tests/ts/lsfd/mkfds-mapped-packet-socket @@ -38,8 +38,8 @@ INTERFACE=lo coproc MKFDS { "$TS_HELPER_MKFDS" mapped-packet-socket $FD interface=${INTERFACE}; } if read -u ${MKFDS[0]} PID; then EXPR='(ASSOC == "shm") and (STTYPE == "SOCK") and (MODE == "-w-")' - ${TS_CMD_LSFD} -p "$PID" -n -o PROTONAME -Q "${EXPR}" - echo 'PROTONAME': $? + ${TS_CMD_LSFD} -p "$PID" -n -o SOCK.PROTONAME -Q "${EXPR}" + echo 'SOCK.PROTONAME': $? fi kill -CONT ${PID} diff --git a/tests/ts/lsfd/mkfds-socketpair b/tests/ts/lsfd/mkfds-socketpair index d20800d0a9..17d2f3aaac 100755 --- a/tests/ts/lsfd/mkfds-socketpair +++ b/tests/ts/lsfd/mkfds-socketpair @@ -37,8 +37,8 @@ EXPR= coproc MKFDS { "$TS_HELPER_MKFDS" socketpair $FD0 $FD1 socktype=DGRAM; } if read -u ${MKFDS[0]} PID; then EXPR='(PID == '"${PID}"') and ((FD == '"$FD0"') or (FD == '"$FD1"'))' - ${TS_CMD_LSFD} -n -o ASSOC,MODE,STTYPE,SOURCE,PROTONAME -Q "${EXPR}" | sed -e 's/UNIX-DGRAM/UNIX/' - echo 'ASSOC,MODE,STTYPE,SOURCE,PROTONAME': $? + ${TS_CMD_LSFD} -n -o ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME -Q "${EXPR}" | sed -e 's/UNIX-DGRAM/UNIX/' + echo 'ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME': $? kill -CONT ${PID} wait ${MKFDS_PID} -- 2.47.3