From 89f634f9177b5f228d78298e2e42be7a65808af8 Mon Sep 17 00:00:00 2001 From: Vadim Kochan Date: Fri, 13 Feb 2015 22:13:59 +0200 Subject: [PATCH] ss: Replace pktstat struct by new sockstat struct Signed-off-by: Vadim Kochan --- misc/ss.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 922cf8c68..4a7cbef14 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -693,6 +693,8 @@ static const char *sstate_namel[] = { struct sockstat { + uint8_t type; + uint16_t prot; inet_prefix local; inet_prefix remote; int lport; @@ -2731,29 +2733,18 @@ static int unix_show(struct filter *f) return 0; } -struct pktstat { - uint8_t type; - uint16_t prot; - uint32_t iface; - int state; - uint32_t rq; - uid_t uid; - ino_t ino; -}; - -static int packet_stats_print(struct pktstat *s, const struct filter *f) +static int packet_stats_print(struct sockstat *s, const struct filter *f) { char *buf = NULL; if (f->f) { - struct sockstat st; - st.local.family = AF_PACKET; - st.remote.family = AF_PACKET; - st.rport = 0; - st.lport = s->iface; - st.local.data[0] = s->prot; - st.remote.data[0] = 0; - if (run_ssfilter(f->f, &st) == 0) + s->local.family = AF_PACKET; + s->remote.family = AF_PACKET; + s->rport = 0; + s->lport = s->iface; + s->local.data[0] = s->prot; + s->remote.data[0] = 0; + if (run_ssfilter(f->f, s) == 0) return 1; } @@ -2802,7 +2793,7 @@ static int packet_show_sock(const struct sockaddr_nl *addr, const struct filter *f = arg; struct packet_diag_msg *r = NLMSG_DATA(nlh); struct rtattr *tb[PACKET_DIAG_MAX+1]; - struct pktstat stat = {}; + struct sockstat stat = {}; parse_rtattr(tb, PACKET_DIAG_MAX, (struct rtattr*)(r+1), nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*r))); @@ -2871,7 +2862,7 @@ static int packet_show_netlink(struct filter *f) static int packet_show_line(char *buf, const struct filter *f, int fam) { unsigned long long sk; - struct pktstat stat = {}; + struct sockstat stat = {}; int type, prot, iface, state, rq, uid, ino; sscanf(buf, "%llx %*d %d %x %d %d %u %u %u", -- 2.47.3