aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/cmdline.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-10-09 01:58:54 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-10-09 01:59:02 +0200
commit7c56a3bb019f521fc45953923b94e9249a1fca78 (patch)
tree6650604727d664045a77a4ce130afa5d220ea329 /libmproxy/cmdline.py
parentff366d152e81955a1832e75f26dc0c5906e0e7c0 (diff)
downloadmitmproxy-7c56a3bb019f521fc45953923b94e9249a1fca78.tar.gz
mitmproxy-7c56a3bb019f521fc45953923b94e9249a1fca78.tar.bz2
mitmproxy-7c56a3bb019f521fc45953923b94e9249a1fca78.zip
Add SOCKS5 mode, fix #305
Diffstat (limited to 'libmproxy/cmdline.py')
-rw-r--r--libmproxy/cmdline.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index f6cd1ab8..fe68e95e 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -1,6 +1,5 @@
from __future__ import absolute_import
import re
-import argparse
from argparse import ArgumentTypeError
from netlib import http
from . import filt, utils
@@ -288,6 +287,11 @@ def common_options(parser):
help="Forward all requests to upstream HTTP server: http[s][2http[s]]://host[:port]"
)
group.add_argument(
+ "--socks",
+ action="store_true", dest="socks_proxy", default=False,
+ help="Set SOCKS5 proxy mode."
+ )
+ group.add_argument(
"-T",
action="store_true", dest="transparent_proxy", default=False,
help="Set transparent proxy mode."
@@ -381,7 +385,7 @@ def common_options(parser):
action="append", dest="replay_ignore_params", type=str,
help="Request's parameters to be ignored while searching for a saved flow to replay"
"Can be passed multiple times."
- )
+ )
group = parser.add_argument_group(
"Replacements",