aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-11-28 02:13:39 +0100
committerGitHub <noreply@github.com>2016-11-28 02:13:39 +0100
commite64d2ce829a7d2019d6f9c085fb99aa199782014 (patch)
tree07eaaf5d5c4dde8b00d2fc558a67ff035545d2c6
parent3154dc87fd88fb9b4a7db3e2752ec7e6d6cbd303 (diff)
parentb5daafb5187144252e0a21a895b0afbca916ba74 (diff)
downloadmitmproxy-e64d2ce829a7d2019d6f9c085fb99aa199782014.tar.gz
mitmproxy-e64d2ce829a7d2019d6f9c085fb99aa199782014.tar.bz2
mitmproxy-e64d2ce829a7d2019d6f9c085fb99aa199782014.zip
Merge pull request #1792 from Kriechi/mitmdump-filter-help
improve mitmdump filter help
-rw-r--r--mitmproxy/tools/cmdline.py9
-rw-r--r--mitmproxy/tools/main.py2
2 files changed, 9 insertions, 2 deletions
diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py
index 947a522c..f8246199 100644
--- a/mitmproxy/tools/cmdline.py
+++ b/mitmproxy/tools/cmdline.py
@@ -850,7 +850,14 @@ def mitmdump():
action="count", dest="flow_detail", default=1,
help="Increase flow detail display level. Can be passed multiple times."
)
- parser.add_argument('args', nargs="...")
+ parser.add_argument(
+ 'filter',
+ nargs="...",
+ help="""
+ Filter view expression, used to only show flows that match a certain filter.
+ See help in mitmproxy for filter expression syntax.
+ """
+ )
return parser
diff --git a/mitmproxy/tools/main.py b/mitmproxy/tools/main.py
index d276944d..c3b1e3a9 100644
--- a/mitmproxy/tools/main.py
+++ b/mitmproxy/tools/main.py
@@ -101,7 +101,7 @@ def mitmdump(args=None): # pragma: no cover
dump_options = dump.Options(**cmdline.get_common_options(args))
dump_options.flow_detail = args.flow_detail
dump_options.keepserving = args.keepserving
- dump_options.filtstr = " ".join(args.args) if args.args else None
+ dump_options.filtstr = " ".join(args.filter) if args.filter else None
server = process_options(parser, dump_options, args)
master = dump.DumpMaster(dump_options, server)