diff options
| author | Nikhil Soni <krsoninikhil@gmail.com> | 2017-03-03 12:58:44 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 12:58:44 +0530 |
| commit | 0081d9b82807b178bd6d00ca250d38aeeeed2d33 (patch) | |
| tree | 8d244a7b9ade13f0e1836f8eb9fbc534a1cc662d /web | |
| parent | 3da8532bed3305b01e3f3ab556f9dbc652177c6b (diff) | |
| parent | bae4cdf8d5cc434938c74a041f762075513dd8e4 (diff) | |
| download | mitmproxy-0081d9b82807b178bd6d00ca250d38aeeeed2d33.tar.gz mitmproxy-0081d9b82807b178bd6d00ca250d38aeeeed2d33.tar.bz2 mitmproxy-0081d9b82807b178bd6d00ca250d38aeeeed2d33.zip | |
Merge branch 'master' into on-issues
Diffstat (limited to 'web')
| -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; |