matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-08-30 08:24:57 -07:00
parent b43b5b9acc 6c6bbc30f4
commit c5e2692b66
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
misc/ss.c
View File

@ -2753,7 +2753,7 @@ static int tcp_show_netlink_file(struct filter *f)
return err; return err;
} }
static int tcp_show(struct filter *f, int socktype) static int tcp_show(struct filter *f)
{ {
FILE *fp = NULL; FILE *fp = NULL;
char *buf = NULL; char *buf = NULL;
@ -2768,7 +2768,7 @@ static int tcp_show(struct filter *f, int socktype)
return tcp_show_netlink_file(f); return tcp_show_netlink_file(f);
if (!getenv("PROC_NET_TCP") && !getenv("PROC_ROOT") if (!getenv("PROC_NET_TCP") && !getenv("PROC_ROOT")
&& inet_show_netlink(f, NULL, socktype) == 0) && inet_show_netlink(f, NULL, IPPROTO_TCP) == 0)
return 0; return 0;
/* Sigh... We have to parse /proc/net/tcp... */ /* Sigh... We have to parse /proc/net/tcp... */
@ -2836,6 +2836,18 @@ outerr:
} while (0); } while (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) static int sctp_show(struct filter *f)
{ {
if (!filter_af_get(f, AF_INET) && !filter_af_get(f, AF_INET6)) if (!filter_af_get(f, AF_INET) && !filter_af_get(f, AF_INET6))
@ -4390,9 +4402,9 @@ int main(int argc, char *argv[])
if (current_filter.dbs & (1<<UDP_DB)) if (current_filter.dbs & (1<<UDP_DB))
udp_show(&current_filter); udp_show(&current_filter);
if (current_filter.dbs & (1<<TCP_DB)) if (current_filter.dbs & (1<<TCP_DB))
tcp_show(&current_filter, IPPROTO_TCP); tcp_show(&current_filter);
if (current_filter.dbs & (1<<DCCP_DB)) if (current_filter.dbs & (1<<DCCP_DB))
tcp_show(&current_filter, IPPROTO_DCCP); dccp_show(&current_filter);
if (current_filter.dbs & (1<<SCTP_DB)) if (current_filter.dbs & (1<<SCTP_DB))
sctp_show(&current_filter); sctp_show(&current_filter);