Commit a8e35427 authored by Dan Webster's avatar Dan Webster Committed by Stephen Hemminger

ss: fix file-based filtering segfault

Commit 1527a17e introduced a change where the second of two ssfilter_parse()
calls in ss.c was moved outside of a conditional block (ss.c: ~3575). This
commit enabled the parsing of services, such as 'sport = :ssh', but
inadvertently broke the '-F' file-based filtering:
parent 484b3f92
...@@ -3782,12 +3782,6 @@ int main(int argc, char *argv[]) ...@@ -3782,12 +3782,6 @@ int main(int argc, char *argv[])
exit(0); exit(0);
} }
/* Now parse filter... */
if (argc == 0 && filter_fp) {
if (ssfilter_parse(&current_filter.f, 0, NULL, filter_fp))
usage();
}
while (argc > 0) { while (argc > 0) {
if (strcmp(*argv, "state") == 0) { if (strcmp(*argv, "state") == 0) {
NEXT_ARG(); NEXT_ARG();
......
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