diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-03 12:24:14 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-03 12:24:14 +0200 |
| commit | 712e5860aa278caada30e8ff9cec3a32df13c59b (patch) | |
| tree | ca0a38022a11f05a415de748e57af73c0184da67 /libmproxy | |
| parent | 1e4e332ef9040928cb0548097e879d8e9a57f3a2 (diff) | |
| download | mitmproxy-712e5860aa278caada30e8ff9cec3a32df13c59b.tar.gz mitmproxy-712e5860aa278caada30e8ff9cec3a32df13c59b.tar.bz2 mitmproxy-712e5860aa278caada30e8ff9cec3a32df13c59b.zip | |
ui: display * instead of 0.0.0.0 for the bound address
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/__init__.py | 5 | ||||
| -rw-r--r-- | libmproxy/protocol/http.py | 2 | ||||
| -rw-r--r-- | libmproxy/protocol/tcp.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 3d025739..1325aae5 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -201,7 +201,10 @@ class StatusBar(common.WWrap): ] if self.master.server.bound: - boundaddr = "[%s:%s]"%(self.master.server.address.host or "*", self.master.server.address.port) + host = self.master.server.address.host + if host == "0.0.0.0": + host = "*" + boundaddr = "[%s:%s]"%(host, self.master.server.address.port) else: boundaddr = "" t.extend(self.get_status()) diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 038fde97..971455f7 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -1068,7 +1068,7 @@ class HTTPHandler(ProtocolHandler): message += " The client does not trust the proxy's certificate." if isinstance(error, tcp.NetLibDisconnect): - self.c.log("TCP connection closed unexpectedly.", "debug", [repr(error)]) + self.c.log("TCP connection closed unexpectedly.", "debug") else: self.c.log("error: %s" % message, level="info") diff --git a/libmproxy/protocol/tcp.py b/libmproxy/protocol/tcp.py index 8411ba6c..57a48ab9 100644 --- a/libmproxy/protocol/tcp.py +++ b/libmproxy/protocol/tcp.py @@ -66,5 +66,5 @@ class TCPHandler(ProtocolHandler): # self.c.log("%s %s\r\n%s" % (direction, dst_str, cleanBin(buf.tobytes())), "debug") dst.connection.send(buf[:size]) except socket.error as e: - self.c.log("TCP connection closed unexpectedly.", "debug", [repr(e)]) + self.c.log("TCP connection closed unexpectedly.", "debug") return
\ No newline at end of file |