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

ss: introduce proc_ctx_print() 

This consolidates identical code in three places. While the function
name is not quite perfect as there is different proc_ctx printing code
in netlink_show_one() as well, I sadly didn't find a more suitable one.

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2016-12-02 11:39:49 +01:00 committed by Stephen Hemminger
parent be7e4d20b9
commit 5f27ac1db9
1 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
misc/ss.c
View File

@ -1779,14 +1779,9 @@ void *parse_markmask(const char *markmask)
return res; return res;
} }
static void inet_stats_print(struct sockstat *s) static void proc_ctx_print(struct sockstat *s)
{ {
char *buf = NULL; char *buf;
sock_state_print(s);
inet_addr_print(&s->local, s->lport, s->iface);
inet_addr_print(&s->remote, s->rport, 0);
if (show_proc_ctx || show_sock_ctx) { if (show_proc_ctx || show_sock_ctx) {
if (find_entry(s->ino, &buf, if (find_entry(s->ino, &buf,
@ -1803,6 +1798,16 @@ static void inet_stats_print(struct sockstat *s)
} }
} }
static void inet_stats_print(struct sockstat *s)
{
sock_state_print(s);
inet_addr_print(&s->local, s->lport, s->iface);
inet_addr_print(&s->remote, s->rport, 0);
proc_ctx_print(s);
}
static int proc_parse_inet_addr(char *loc, char *rem, int family, struct static int proc_parse_inet_addr(char *loc, char *rem, int family, struct
sockstat * s) sockstat * s)
{ {
@ -3044,7 +3049,6 @@ static void unix_stats_print(struct sockstat *list, struct filter *f)
{ {
struct sockstat *s; struct sockstat *s;
char *peer; char *peer;
char *ctx_buf = NULL;
bool use_proc = unix_use_proc(); bool use_proc = unix_use_proc();
char port_name[30] = {}; char port_name[30] = {};
@ -3093,19 +3097,7 @@ static void unix_stats_print(struct sockstat *list, struct filter *f)
sock_addr_print(peer, " ", int_to_str(s->rport, port_name), sock_addr_print(peer, " ", int_to_str(s->rport, port_name),
NULL); NULL);
if (show_proc_ctx || show_sock_ctx) { proc_ctx_print(s);
if (find_entry(s->ino, &ctx_buf,
(show_proc_ctx & show_sock_ctx) ?
PROC_SOCK_CTX : PROC_CTX) > 0) {
printf(" users:(%s)", ctx_buf);
free(ctx_buf);
}
} else if (show_users) {
if (find_entry(s->ino, &ctx_buf, USERS) > 0) {
printf(" users:(%s)", ctx_buf);
free(ctx_buf);
}
}
printf("\n"); printf("\n");
} }
} }
@ -3303,7 +3295,6 @@ static int unix_show(struct filter *f)
static int packet_stats_print(struct sockstat *s, const struct filter *f) static int packet_stats_print(struct sockstat *s, const struct filter *f)
{ {
char *buf = NULL;
const char *addr, *port; const char *addr, *port;
char ll_name[16]; char ll_name[16];
@ -3330,19 +3321,7 @@ static int packet_stats_print(struct sockstat *s, const struct filter *f)
sock_addr_print(addr, ":", port, NULL); sock_addr_print(addr, ":", port, NULL);
sock_addr_print("", "*", "", NULL); sock_addr_print("", "*", "", NULL);
if (show_proc_ctx || show_sock_ctx) { proc_ctx_print(s);
if (find_entry(s->ino, &buf,
(show_proc_ctx & show_sock_ctx) ?
PROC_SOCK_CTX : PROC_CTX) > 0) {
printf(" users:(%s)", buf);
free(buf);
}
} else if (show_users) {
if (find_entry(s->ino, &buf, USERS) > 0) {
printf(" users:(%s)", buf);
free(buf);
}
}
if (show_details) if (show_details)
sock_details_print(s); sock_details_print(s);