ss: remove support for DCCP
Subsystems (2)
PATCH 1/1 ss: remove support for DCCP
Since DCCP is going away in future kernel, remove the decode logic in ss command. Keep the display of protocol number.
Signed-off-by Stephen Hemminger <[email protected]>
--- man/man8/ss.8 | 5 +---- misc/ss.c | 35 ++++------------------------------- 2 files changed, 5 insertions(+), 35 deletions(-)
man/man8/ss.8 +1 -4
@@ -377,9 +377,6 @@ Display TCP sockets. .B \-u, \-\-udp Display UDP sockets. .TP -.B \-d, \-\-dccp -Display DCCP sockets. -.TP .B \-w, \-\-raw Display RAW sockets. .TP
@@ -412,7 +409,7 @@ supported: unix, inet, inet6, link, netlink, vsock, tipc, xdp. .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, unix_seqpacket, packet_raw, packet_dgram, dccp, sctp, tipc, +unix_stream, unix_seqpacket, packet_raw, packet_dgram, sctp, tipc, vsock_stream, vsock_dgram, xdp, mptcp. Any item in the list may optionally be prefixed by an exclamation mark .RB ( ! )
misc/ss.c +4 -31
@@ -195,7 +195,6 @@ static const char *dg_proto;enum {TCP_DB ,MPTCP_DB , -DCCP_DB ,UDP_DB ,RAW_DB ,UNIX_DG_DB ,
@@ -215,7 +214,7 @@ enum {#define PACKET_DBM ((1<<PACKET_DG_DB)|(1<<PACKET_R_DB))#define UNIX_DBM ((1<<UNIX_DG_DB)|(1<<UNIX_ST_DB)|(1<<UNIX_SQ_DB))#define ALL_DB ((1<<MAX_DB)-1) -#define INET_L4_DBM ((1<<TCP_DB)|(1<<MPTCP_DB)|(1<<UDP_DB)|(1<<DCCP_DB)|(1<<SCTP_DB)) +#define INET_L4_DBM ((1<<TCP_DB)|(1<<MPTCP_DB)|(1<<UDP_DB)|(1<<SCTP_DB))#define INET_DBM (INET_L4_DBM | (1<<RAW_DB))#define VSOCK_DBM ((1<<VSOCK_ST_DB)|(1<<VSOCK_DG_DB))
@@ -274,10 +273,6 @@ static const struct filter default_dbs[MAX_DB] = { .states = SS_CONN, .families = FAMILY_MASK(AF_INET) | FAMILY_MASK(AF_INET6), }, - [DCCP_DB] = { - .states = SS_CONN, - .families = FAMILY_MASK(AF_INET) | FAMILY_MASK(AF_INET6), - }, [UDP_DB] = { .states = (1 << SS_ESTABLISHED), .families = FAMILY_MASK(AF_INET) | FAMILY_MASK(AF_INET6),
@@ -388,13 +383,12 @@ static int filter_db_parse(struct filter *f, const char *s)int dbs[MAX_DB +1 ]; } db_name_tbl[] = {#define ENTRY (name, ...) { #name, { __VA_ARGS__, MAX_DB } } -ENTRY (all,UDP_DB ,DCCP_DB ,TCP_DB ,MPTCP_DB ,RAW_DB , +ENTRY (all,UDP_DB ,TCP_DB ,MPTCP_DB ,RAW_DB ,UNIX_ST_DB ,UNIX_DG_DB ,UNIX_SQ_DB ,PACKET_R_DB ,PACKET_DG_DB ,NETLINK_DB ,SCTP_DB ,VSOCK_ST_DB ,VSOCK_DG_DB ,XDP_DB ), -ENTRY (inet,UDP_DB ,DCCP_DB ,TCP_DB ,MPTCP_DB ,SCTP_DB ,RAW_DB ), +ENTRY (inet,UDP_DB ,TCP_DB ,MPTCP_DB ,SCTP_DB ,RAW_DB ),ENTRY (udp,UDP_DB ), -ENTRY (dccp,DCCP_DB ),ENTRY (tcp,TCP_DB ),ENTRY (mptcp,MPTCP_DB ), ENTRY(sctp, SCTP_DB),
@@ -3883,8 +3877,6 @@ static int tcpdiag_send(int fd, int protocol, struct filter *f)if (protocol ==IPPROTO_TCP ) req.nlh.nlmsg_type =TCPDIAG_GETSOCK ; -else if (protocol ==IPPROTO_DCCP ) - req.nlh.nlmsg_type =DCCPDIAG_GETSOCK ;else return -1 ;
@@ -4295,18 +4287,6 @@ static int mptcp_show(struct filter *f)return 0 ; } -static int dccp_show (struct filter *f) -{ -if (!filter_af_get (f,AF_INET ) && !filter_af_get (f,AF_INET6 )) -return 0 ; - -if (!getenv ("PROC_NET_DCCP" ) && !getenv ("PROC_ROOT" ) - &&inet_show_netlink (f,NULL ,IPPROTO_DCCP ) ==0 ) -return 0 ; - -return 0 ; -} -static int sctp_show (struct filter *f) {if (!filter_af_get (f,AF_INET ) && !filter_af_get (f,AF_INET6 ))
@@ -5764,7 +5744,6 @@ static void _usage(FILE *dest)" -M, --mptcp display only MPTCP sockets\n" " -S, --sctp display only SCTP sockets\n" " -u, --udp display only UDP sockets\n" -" -d, --dccp display only DCCP sockets\n" " -w, --raw display only RAW sockets\n" " -x, --unix display only Unix domain sockets\n" " --tipc display only TIPC sockets\n"
@@ -5780,7 +5759,7 @@ static void _usage(FILE *dest)" --inet-sockopt show various inet socket options\n" "\n" " -A, --query=QUERY, --socket=QUERY\n" -" QUERY := {all|inet|tcp|mptcp|udp|raw|unix|unix_dgram|unix_stream|unix_seqpacket|packet|packet_raw|packet_dgram|netlink|dccp|sctp|vsock_stream|vsock_dgram|tipc|xdp}[,QUERY]\n" +" QUERY := {all|inet|tcp|mptcp|udp|raw|unix|unix_dgram|unix_stream|unix_seqpacket|packet|packet_raw|packet_dgram|netlink|sctp|vsock_stream|vsock_dgram|tipc|xdp}[,QUERY]\n" "\n" " -D, --diag=FILE Dump raw information about TCP sockets to FILE\n" " -F, --filter=FILE read filter information from FILE\n"
@@ -5892,7 +5871,6 @@ static const struct option long_opts[] = { { "threads", 0, 0, 'T' }, { "bpf", 0, 0, 'b' }, { "events", 0, 0, 'E' }, - { "dccp", 0, 0, 'd' }, { "tcp", 0, 0, 't' }, { "sctp", 0, 0, 'S' }, { "udp", 0, 0, 'u' },
@@ -5981,9 +5959,6 @@ int main(int argc, char *argv[])case 'E' : follow_events =1 ;break ; -case 'd' : -filter_db_set (¤t_filter,DCCP_DB , true); -break ;case 't' :filter_db_set (¤t_filter,TCP_DB , true);break ;
@@ -6275,8 +6250,6 @@ int main(int argc, char *argv[])udp_show (¤t_filter);if (current_filter.dbs & (1 <<TCP_DB ))tcp_show (¤t_filter); -if (current_filter.dbs & (1 <<DCCP_DB )) -dccp_show (¤t_filter);if (current_filter.dbs & (1 <<SCTP_DB ))sctp_show (¤t_filter);if (current_filter.dbs &VSOCK_DBM )
Signature · 1 line
2.47.2
From: Stephen Hemminger <[email protected]>
Date: Tue, 8 Apr 2025 11:51:26 -0700
Quoted 4 lines
Since DCCP is going away in future kernel, remove the decode logic in ss command. Keep the display of protocol number.
Signed-off-by Stephen Hemminger <[email protected]>
Reviewed-by Kuniyuki Iwashima <[email protected]>
Thanks!