aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Deslandes <qde@naccy.de>2023-12-06 12:14:44 +0100
committerStephen Hemminger <stephen@networkplumber.org>2023-12-06 09:41:09 -0800
commit1607bf531fd2f984438d227ea97312df80e7cf56 (patch)
tree87f943417df19edaadf1cb8653ce6623f60d50d1
parent4913a5c2068cd51ae17307d4f201a1d94d216bd5 (diff)
downloadiproute2-next-1607bf531fd2f984438d227ea97312df80e7cf56.tar.gz
ss: prevent "Process" column from being printed unless requested
Commit 5883c6eba517 ("ss: show header for --processes/-p") added "Process" to the list of columns printed by ss. However, the "Process" header is now printed even if --processes/-p is not used. This change aims to fix this by moving the COL_PROC column ID to the same index as the corresponding column structure in the columns array, and enabling it if --processes/-p is used. Fixes: 5883c6eba517 ("ss: show header for --processes/-p") Signed-off-by: Quentin Deslandes <qde@naccy.de> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-rw-r--r--misc/ss.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/misc/ss.c b/misc/ss.c
index 9438382b8..09dc1f37b 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -100,8 +100,8 @@ enum col_id {
COL_SERV,
COL_RADDR,
COL_RSERV,
- COL_EXT,
COL_PROC,
+ COL_EXT,
COL_MAX
};
@@ -5795,6 +5795,9 @@ int main(int argc, char *argv[])
if (ssfilter_parse(&current_filter.f, argc, argv, filter_fp))
usage();
+ if (!show_processes)
+ columns[COL_PROC].disabled = 1;
+
if (!(current_filter.dbs & (current_filter.dbs - 1)))
columns[COL_NETID].disabled = 1;