diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2017-02-24 15:42:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-24 15:42:52 +0100 |
| commit | 83f1e2eec01ab3edec723b252b0c109f00b77c56 (patch) | |
| tree | 9222f639c50e252339378e8c881474274adc8ae4 /web/src | |
| parent | d0d11cec7b479932668eb4e7c99d7824018d0460 (diff) | |
| parent | fab3a8dcf4d7cdce55099172e45a6a0978eac4ab (diff) | |
| download | mitmproxy-83f1e2eec01ab3edec723b252b0c109f00b77c56.tar.gz mitmproxy-83f1e2eec01ab3edec723b252b0c109f00b77c56.tar.bz2 mitmproxy-83f1e2eec01ab3edec723b252b0c109f00b77c56.zip | |
Merge pull request #2050 from Kriechi/create_connection
nuke tcp.Address and add proper IPv6 support
Diffstat (limited to 'web/src')
| -rw-r--r-- | web/src/js/components/FlowView/Details.jsx | 2 | ||||
| -rw-r--r-- | web/src/js/filt/filt.peg | 4 |
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; |