Commit e56a959e authored by Phil Sutter's avatar Phil Sutter Committed by Stephen Hemminger

ss: Fix accidental state filter override

Passing a filter expression and selecting an address family using the
'-f' flag would overwrite the state filter by accident. Therefore
calling e.g. 'ss -nl -f inet '(sport = :22)' would not only print
listening sockets (as requested by '-l' flag) but connected ones, as
well.

Fix this by reusing the formerly ineffective call to filter_states_set()
to restore the state filter as it was before the call to
filter_af_set().
Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
parent 9d320e1e
...@@ -1556,9 +1556,10 @@ void *parse_hostcond(char *addr, bool is_port) ...@@ -1556,9 +1556,10 @@ void *parse_hostcond(char *addr, bool is_port)
out: out:
if (fam != AF_UNSPEC) { if (fam != AF_UNSPEC) {
int states = f->states;
f->families = 0; f->families = 0;
filter_af_set(f, fam); filter_af_set(f, fam);
filter_states_set(f, 0); filter_states_set(f, states);
} }
res = malloc(sizeof(*res)); res = malloc(sizeof(*res));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment