aboutsummaryrefslogtreecommitdiffstats
path: root/docs/features
diff options
context:
space:
mode:
Diffstat (limited to 'docs/features')
-rw-r--r--docs/features/passthrough.rst6
-rw-r--r--docs/features/tcpproxy.rst31
2 files changed, 3 insertions, 34 deletions
diff --git a/docs/features/passthrough.rst b/docs/features/passthrough.rst
index 00462e9d..91fcb9b6 100644
--- a/docs/features/passthrough.rst
+++ b/docs/features/passthrough.rst
@@ -13,7 +13,7 @@ mechanism:
away. Note that mitmproxy's "Limit" option is often the better alternative here, as it is
not affected by the limitations listed below.
-If you want to peek into (SSL-protected) non-HTTP connections, check out the :ref:`tcpproxy`
+If you want to peek into (SSL-protected) non-HTTP connections, check out the :ref:`tcp_proxy`
feature.
If you want to ignore traffic from mitmproxy's processing because of large response bodies,
take a look at the :ref:`streaming` feature.
@@ -38,7 +38,7 @@ There are two important quirks to consider:
- **In transparent mode, the ignore pattern is matched against the IP and ClientHello SNI host.** While we usually infer the
hostname from the Host header if the ``--host`` argument is passed to mitmproxy, we do not
have access to this information before the SSL handshake. If the client uses SNI however, then we treat the SNI host as an ignore target.
-- **In regular mode, explicit HTTP requests are never ignored.** [#explicithttp]_ The ignore pattern is
+- **In regular and upstream proxy mode, explicit HTTP requests are never ignored.** [#explicithttp]_ The ignore pattern is
applied on CONNECT requests, which initiate HTTPS or clear-text WebSocket connections.
Tutorial
@@ -88,7 +88,7 @@ Here are some other examples for ignore patterns:
.. seealso::
- - :ref:`tcpproxy`
+ - :ref:`tcp_proxy`
- :ref:`streaming`
- mitmproxy's "Limit" feature
diff --git a/docs/features/tcpproxy.rst b/docs/features/tcpproxy.rst
deleted file mode 100644
index cba374e3..00000000
--- a/docs/features/tcpproxy.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-.. _tcpproxy:
-
-TCP Proxy
-=========
-
-In case mitmproxy does not handle a specific protocol, you can exempt
-hostnames from processing, so that mitmproxy acts as a generic TCP forwarder.
-This feature is closely related to the :ref:`passthrough` functionality,
-but differs in two important aspects:
-
-- The raw TCP messages are printed to the event log.
-- SSL connections will be intercepted.
-
-Please note that message interception or modification are not possible yet.
-If you are not interested in the raw TCP messages, you should use the ignore domains feature.
-
-How it works
-------------
-
-================== ======================
-command-line ``--tcp HOST``
-mitmproxy shortcut :kbd:`O` then :kbd:`T`
-================== ======================
-
-For a detailed description how the hostname pattern works, please look at the :ref:`passthrough`
-feature.
-
-.. seealso::
-
- - :ref:`passthrough`
- - :ref:`streaming`