aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2017-02-21 00:20:44 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2017-02-24 13:39:02 +0100
commit3e9125a3c13084f4abb0e5b74554909f24df9454 (patch)
tree924b6d81e14c24535aef662e3696c291d7370bc5 /web
parentd0d11cec7b479932668eb4e7c99d7824018d0460 (diff)
downloadmitmproxy-3e9125a3c13084f4abb0e5b74554909f24df9454.tar.gz
mitmproxy-3e9125a3c13084f4abb0e5b74554909f24df9454.tar.bz2
mitmproxy-3e9125a3c13084f4abb0e5b74554909f24df9454.zip
nuke tcp.Address and add proper IPv6 support
Diffstat (limited to 'web')
-rw-r--r--web/src/js/components/FlowView/Details.jsx2
-rw-r--r--web/src/js/filt/filt.peg4
2 files changed, 3 insertions, 3 deletions
diff --git a/web/src/js/components/FlowView/Details.jsx b/web/src/js/components/FlowView/Details.jsx
index 10ec6553..a73abf37 100644
--- a/web/src/js/components/FlowView/Details.jsx
+++ b/web/src/js/components/FlowView/Details.jsx
@@ -26,7 +26,7 @@ export function ConnectionInfo({ conn }) {
<tbody>
<tr key="address">
<td>Address:</td>
- <td>{conn.address.address.join(':')}</td>
+ <td>{conn.address.join(':')}</td>
</tr>
{conn.sni && (
<tr key="sni">
diff --git a/web/src/js/filt/filt.peg b/web/src/js/filt/filt.peg
index 989bfdd3..7122a1a5 100644
--- a/web/src/js/filt/filt.peg
+++ b/web/src/js/filt/filt.peg
@@ -106,7 +106,7 @@ function destination(regex){
function destinationFilter(flow){
return (!!flow.server_conn.address)
&&
- regex.test(flow.server_conn.address.address[0] + ":" + flow.server_conn.address.address[1]);
+ regex.test(flow.server_conn.address[0] + ":" + flow.server_conn.address[1]);
}
destinationFilter.desc = "destination address matches " + regex;
return destinationFilter;
@@ -172,7 +172,7 @@ function source(regex){
function sourceFilter(flow){
return (!!flow.client_conn.address)
&&
- regex.test(flow.client_conn.address.address[0] + ":" + flow.client_conn.address.address[1]);
+ regex.test(flow.client_conn.address[0] + ":" + flow.client_conn.address[1]);
}
sourceFilter.desc = "source address matches " + regex;
return sourceFilter;