Merge pull request #1019 from lilydjwg/master

add resolved IP address in "Details" tab

mitmproxy/console/flowdetailview.py

@@ -23,6 +23,7 @@ def flowdetails(state, flow):
         text.append(urwid.Text([("head", "Server Connection:")]))
         parts = [
             ["Address", repr(sc.address)],
+            ["Peer Address", repr(sc.peer_address)],
         ]
 
         text.extend(

mitmproxy/flow_format_compat.py

@@ -35,6 +35,7 @@ def convert_015_016(data):
 
 
 def convert_016_017(data):
+    data["server_conn"]["peer_address"] = None
     data["version"] = (0, 17)
     return data
 

mitmproxy/models/connections.py

@@ -120,6 +120,7 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
         timestamp_tcp_setup=float,
         timestamp_ssl_setup=float,
         address=tcp.Address,
+        peer_address=tcp.Address,
         source_address=tcp.Address,
         cert=certutils.SSLCert,
         ssl_established=bool,

netlib/tcp.py

@@ -458,9 +458,11 @@ class _Connection(object):
     def __init__(self, connection):
         if connection:
             self.connection = connection
+            self.peer_address = Address(connection.getpeername())
             self._makefile()
         else:
             self.connection = None
+            self.peer_address = None
             self.rfile = None
             self.wfile = None
 
@@ -701,6 +703,7 @@ class TCPClient(_Connection):
                 'Error connecting to "%s": %s' %
                 (self.address.host, err))
         self.connection = connection
+        self.peer_address = Address(connection.getpeername())
         self._makefile()
 
     def settimeout(self, n):

test/mitmproxy/tutils.py

@@ -93,6 +93,7 @@ def tserver_conn():
     c = ServerConnection.from_state(dict(
         address=dict(address=("address", 22), use_ipv6=True),
         source_address=dict(address=("address", 22), use_ipv6=True),
+        peer_address=None,
         cert=None,
         timestamp_start=1,
         timestamp_tcp_setup=2,