From 30b669d7ac3cc233272f0f23bc6b547a298f373e Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Wed, 8 Jan 2014 20:13:46 +0900 Subject: [PATCH 1/3] ss: handle seqpacket type of unix domain socket ss didn't distignish seqpacket type from dgram type. With this patch ss can distignish it. $ misc/ss -x -a | grep seq u_seq LISTEN 0 128 /run/udev/control 10966 * 0 u_seq ESTAB 0 0 * 115103 * 115104 u_seq ESTAB 0 0 * 115104 * 115103 Signed-off-by: Masatake YAMATO --- misc/ss.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index e59ca5c7..179fc470 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -71,6 +71,7 @@ enum RAW_DB, UNIX_DG_DB, UNIX_ST_DB, + UNIX_SQ_DB, PACKET_DG_DB, PACKET_R_DB, NETLINK_DB, @@ -78,7 +79,7 @@ enum }; #define PACKET_DBM ((1<type == SOCK_DGRAM && !(f->dbs&(1<type == SOCK_SEQPACKET && !(f->dbs&(1<peer) { @@ -2156,7 +2178,7 @@ static void unix_list_print(struct unixstat *list, struct filter *f) if (netid_width) printf("%-*s ", netid_width, - s->type == SOCK_STREAM ? "u_str" : "u_dgr"); + unix_netid_name(s->type)); if (state_width) printf("%-*s ", state_width, sstate_name[s->state]); printf("%-6d %-6d ", s->rq, s->wq); @@ -2185,7 +2207,7 @@ static int unix_show_sock(struct nlmsghdr *nlh, struct filter *f) if (netid_width) printf("%-*s ", netid_width, - r->udiag_type == SOCK_STREAM ? "u_str" : "u_dgr"); + unix_netid_name(r->udiag_type)); if (state_width) printf("%-*s ", state_width, sstate_name[r->udiag_state]); @@ -3253,6 +3275,9 @@ int main(int argc, char *argv[]) } else if (strcasecmp(p, "unix_dgram") == 0 || strcmp(p, "u_dgr") == 0) { current_filter.dbs |= (1< Date: Wed, 8 Jan 2014 20:13:47 +0900 Subject: [PATCH 2/3] ss: enable query by type in unix domain related socket This patch enables -A unix_stream, -A unix_dgram and -A unix_seqpacket option even if ss gets socket information via netlink. Signed-off-by: Masatake YAMATO --- misc/ss.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/misc/ss.c b/misc/ss.c index 179fc470..887152ad 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -2205,6 +2205,13 @@ static int unix_show_sock(struct nlmsghdr *nlh, struct filter *f) parse_rtattr(tb, UNIX_DIAG_MAX, (struct rtattr*)(r+1), nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*r))); + if (r->udiag_type == SOCK_STREAM && !(f->dbs&(1<udiag_type == SOCK_DGRAM && !(f->dbs&(1<udiag_type == SOCK_SEQPACKET && !(f->dbs&(1<udiag_type)); From 56dee73ea1ab3084ba804e5afc1efe3b6cafad97 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Wed, 8 Jan 2014 20:13:48 +0900 Subject: [PATCH 3/3] ss: add unix_seqpacket to the help message and the man page Signed-off-by: Masatake YAMATO --- man/man8/ss.8 | 2 +- misc/ss.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/man8/ss.8 b/man/man8/ss.8 index e55dd0c9..807d9dc9 100644 --- a/man/man8/ss.8 +++ b/man/man8/ss.8 @@ -87,7 +87,7 @@ Currently the following families are supported: unix, inet, inet6, link, netlink .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. +unix_stream, unix_seqpacket, packet_raw, packet_dgram. .TP .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. diff --git a/misc/ss.c b/misc/ss.c index 887152ad..764ffe25 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -3072,7 +3072,7 @@ static void _usage(FILE *dest) " -f, --family=FAMILY display sockets of type FAMILY\n" "\n" " -A, --query=QUERY, --socket=QUERY\n" -" QUERY := {all|inet|tcp|udp|raw|unix|packet|netlink}[,QUERY]\n" +" QUERY := {all|inet|tcp|udp|raw|unix|unix_dgram|unix_stream|unix_seqpacket|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"