From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Tafelmeier Subject: [PATCH v7 06/10] ss: renaming and export of current_filter Date: Thu, 10 Sep 2015 21:35:04 +0200 Message-ID: <1441913708-15532-7-git-send-email-matthias.tafelmeier@gmx.net> References: <1441913708-15532-1-git-send-email-matthias.tafelmeier@gmx.net> Cc: hagen@jauu.net, shemminger@osdl.org, fw@strlen.de, edumazet@google.com, daniel@iogearbox.net To: netdev@vger.kernel.org Return-path: Received: from mout.gmx.net ([212.227.17.21]:56787 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752626AbbIJTff (ORCPT ); Thu, 10 Sep 2015 15:35:35 -0400 In-Reply-To: <1441913708-15532-1-git-send-email-matthias.tafelmeier@gmx.net> Sender: netdev-owner@vger.kernel.org List-ID: Exported current_filter as ss_current_filter, because in the fmt handlers, I need that piece of info to resolve out issues of json. Signed-off-by: Matthias Tafelmeier --- misc/ss.c | 154 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 78 insertions(+), 76 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 7a1b6eb..6ff40a3 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -106,6 +106,7 @@ int show_sock_ctx = 0; int user_ent_hash_build_init = 0; int follow_events = 0; int json_output = 0; +int json_first_elem = 1; int netid_width; int state_width; @@ -200,7 +201,7 @@ static const struct filter default_afs[AF_MAX] = { }; static int do_default = 1; -static struct filter current_filter; +struct filter ss_current_filter; static void filter_db_set(struct filter *f, int db) { @@ -1182,7 +1183,7 @@ void *parse_hostcond(char *addr, bool is_port) struct aafilter a = { .port = -1 }; struct aafilter *res; int fam = preferred_family; - struct filter *f = ¤t_filter; + struct filter *f = &ss_current_filter; if (fam == AF_UNIX || strncmp(addr, "unix:", 5) == 0) { char *p; @@ -1281,9 +1282,9 @@ void *parse_hostcond(char *addr, bool is_port) if (get_integer(&a.port, port, 0)) { struct servent *se1 = NULL; struct servent *se2 = NULL; - if (current_filter.dbs&(1<s_port != se2->s_port) { fprintf(stderr, "Error: ambiguous port \"%s\".\n", port); @@ -1297,9 +1298,9 @@ void *parse_hostcond(char *addr, bool is_port) struct scache *s; for (s = rlist; s; s = s->next) { if ((s->proto == UDP_PROTO && - (current_filter.dbs&(1<proto == TCP_PROTO && - (current_filter.dbs&(1<name && strcmp(s->name, port) == 0) { if (a.port > 0 && a.port != s->port) { fprintf(stderr, "Error: ambiguous port \"%s\".\n", port); @@ -3220,19 +3221,19 @@ int main(int argc, char *argv[]) follow_events = 1; break; case 'd': - filter_db_set(¤t_filter, DCCP_DB); + filter_db_set(&ss_current_filter, DCCP_DB); break; case 't': - filter_db_set(¤t_filter, TCP_DB); + filter_db_set(&ss_current_filter, TCP_DB); break; case 'u': - filter_db_set(¤t_filter, UDP_DB); + filter_db_set(&ss_current_filter, UDP_DB); break; case 'w': - filter_db_set(¤t_filter, RAW_DB); + filter_db_set(&ss_current_filter, RAW_DB); break; case 'x': - filter_af_set(¤t_filter, AF_UNIX); + filter_af_set(&ss_current_filter, AF_UNIX); break; case 'a': state_filter = SS_ALL; @@ -3241,25 +3242,25 @@ int main(int argc, char *argv[]) state_filter = (1 << SS_LISTEN) | (1 << SS_CLOSE); break; case '4': - filter_af_set(¤t_filter, AF_INET); + filter_af_set(&ss_current_filter, AF_INET); break; case '6': - filter_af_set(¤t_filter, AF_INET6); + filter_af_set(&ss_current_filter, AF_INET6); break; case '0': - filter_af_set(¤t_filter, AF_PACKET); + filter_af_set(&ss_current_filter, AF_PACKET); break; case 'f': if (strcmp(optarg, "inet") == 0) - filter_af_set(¤t_filter, AF_INET); + filter_af_set(&ss_current_filter, AF_INET); else if (strcmp(optarg, "inet6") == 0) - filter_af_set(¤t_filter, AF_INET6); + filter_af_set(&ss_current_filter, AF_INET6); else if (strcmp(optarg, "link") == 0) - filter_af_set(¤t_filter, AF_PACKET); + filter_af_set(&ss_current_filter, AF_PACKET); else if (strcmp(optarg, "unix") == 0) - filter_af_set(¤t_filter, AF_UNIX); + filter_af_set(&ss_current_filter, AF_UNIX); else if (strcmp(optarg, "netlink") == 0) - filter_af_set(¤t_filter, AF_NETLINK); + filter_af_set(&ss_current_filter, AF_NETLINK); else if (strcmp(optarg, "help") == 0) help(); else { @@ -3272,9 +3273,9 @@ int main(int argc, char *argv[]) { char *p, *p1; if (!saw_query) { - current_filter.dbs = 0; + ss_current_filter.dbs = 0; state_filter = state_filter ? - state_filter : SS_CONN; + state_filter : SS_CONN; saw_query = 1; do_default = 0; } @@ -3283,44 +3284,44 @@ int main(int argc, char *argv[]) if ((p1 = strchr(p, ',')) != NULL) *p1 = 0; if (strcmp(p, "all") == 0) { - filter_default_dbs(¤t_filter); + filter_default_dbs(&ss_current_filter); } else if (strcmp(p, "inet") == 0) { - filter_db_set(¤t_filter, UDP_DB); - filter_db_set(¤t_filter, DCCP_DB); - filter_db_set(¤t_filter, TCP_DB); - filter_db_set(¤t_filter, RAW_DB); + filter_db_set(&ss_current_filter, UDP_DB); + filter_db_set(&ss_current_filter, DCCP_DB); + filter_db_set(&ss_current_filter, TCP_DB); + filter_db_set(&ss_current_filter, RAW_DB); } else if (strcmp(p, "udp") == 0) { - filter_db_set(¤t_filter, UDP_DB); + filter_db_set(&ss_current_filter, UDP_DB); } else if (strcmp(p, "dccp") == 0) { - filter_db_set(¤t_filter, DCCP_DB); + filter_db_set(&ss_current_filter, DCCP_DB); } else if (strcmp(p, "tcp") == 0) { - filter_db_set(¤t_filter, TCP_DB); + filter_db_set(&ss_current_filter, TCP_DB); } else if (strcmp(p, "raw") == 0) { - filter_db_set(¤t_filter, RAW_DB); + filter_db_set(&ss_current_filter, RAW_DB); } else if (strcmp(p, "unix") == 0) { - filter_db_set(¤t_filter, UNIX_ST_DB); - filter_db_set(¤t_filter, UNIX_DG_DB); - filter_db_set(¤t_filter, UNIX_SQ_DB); + filter_db_set(&ss_current_filter, UNIX_ST_DB); + filter_db_set(&ss_current_filter, UNIX_DG_DB); + filter_db_set(&ss_current_filter, UNIX_SQ_DB); } else if (strcasecmp(p, "unix_stream") == 0 || strcmp(p, "u_str") == 0) { - filter_db_set(¤t_filter, UNIX_ST_DB); + filter_db_set(&ss_current_filter, UNIX_ST_DB); } else if (strcasecmp(p, "unix_dgram") == 0 || strcmp(p, "u_dgr") == 0) { - filter_db_set(¤t_filter, UNIX_DG_DB); + filter_db_set(&ss_current_filter, UNIX_DG_DB); } else if (strcasecmp(p, "unix_seqpacket") == 0 || strcmp(p, "u_seq") == 0) { - filter_db_set(¤t_filter, UNIX_SQ_DB); + filter_db_set(&ss_current_filter, UNIX_SQ_DB); } else if (strcmp(p, "packet") == 0) { - filter_db_set(¤t_filter, PACKET_R_DB); - filter_db_set(¤t_filter, PACKET_DG_DB); + filter_db_set(&ss_current_filter, PACKET_R_DB); + filter_db_set(&ss_current_filter, PACKET_DG_DB); } else if (strcmp(p, "packet_raw") == 0 || strcmp(p, "p_raw") == 0) { - filter_db_set(¤t_filter, PACKET_R_DB); + filter_db_set(&ss_current_filter, PACKET_R_DB); } else if (strcmp(p, "packet_dgram") == 0 || strcmp(p, "p_dgr") == 0) { - filter_db_set(¤t_filter, PACKET_DG_DB); + filter_db_set(&ss_current_filter, PACKET_DG_DB); } else if (strcmp(p, "netlink") == 0) { - filter_db_set(¤t_filter, NETLINK_DB); + filter_db_set(&ss_current_filter, NETLINK_DB); } else { fprintf(stderr, "ss: \"%s\" is illegal socket table id\n", p); usage(); @@ -3386,7 +3387,7 @@ int main(int argc, char *argv[]) /* Now parse filter... */ if (argc == 0 && filter_fp) { - if (ssfilter_parse(¤t_filter.f, 0, NULL, filter_fp)) + if (ssfilter_parse(&ss_current_filter.f, 0, NULL, filter_fp)) usage(); } @@ -3412,32 +3413,32 @@ int main(int argc, char *argv[]) if (do_default) { state_filter = state_filter ? state_filter : SS_CONN; - filter_default_dbs(¤t_filter); + filter_default_dbs(&ss_current_filter); } - filter_states_set(¤t_filter, state_filter); - filter_merge_defaults(¤t_filter); + filter_states_set(&ss_current_filter, state_filter); + filter_merge_defaults(&ss_current_filter); if (resolve_services && resolve_hosts && - (current_filter.dbs&(UNIX_DBM|(1<