aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-05-14 10:44:25 +1200
committerAldo Cortesi <aldo@nullcube.com>2011-05-14 10:44:25 +1200
commitf89581be1b2a884fe95b764a25eead280303f595 (patch)
tree7239b2491cb7d6833af39620b736aafb3681168b /libmproxy/console.py
parentc6075e1d93c61eab35bb3e0ae56337e579fea403 (diff)
downloadmitmproxy-f89581be1b2a884fe95b764a25eead280303f595.tar.gz
mitmproxy-f89581be1b2a884fe95b764a25eead280303f595.tar.bz2
mitmproxy-f89581be1b2a884fe95b764a25eead280303f595.zip
Add a -n option which tells the tools not to bind a proxy.
This is useful when you just want to inspect or process dumps.
Diffstat (limited to 'libmproxy/console.py')
-rw-r--r--libmproxy/console.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py
index 399640c2..f0fb74e2 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -664,16 +664,19 @@ class StatusBar(WWrap):
('statusbar_text', ("[%s]"%len(self.master.state.flow_list)).ljust(7)),
]
t.extend(self.get_status())
+
+ if self.master.server:
+ boundaddr = "[%s:%s]"%(self.master.server.address or "*", self.master.server.port)
+ else:
+ boundaddr = "[no proxy]"
+
status = urwid.AttrWrap(urwid.Columns([
urwid.Text(t),
urwid.Text(
[
self.helptext,
" ",
- (
- 'statusbar_text',
- "[%s:%s]"%(self.master.server.address or "*", self.master.server.port)
- ),
+ ('statusbar_text', boundaddr),
],
align="right"
),
@@ -775,6 +778,7 @@ class Options(object):
"kill",
"intercept",
"limit",
+ "no_server",
"refresh_server_playback",
"request_script",
"response_script",
@@ -1024,8 +1028,9 @@ class ConsoleMaster(flow.FlowMaster):
self.view_connlist()
self.masterq = Queue.Queue()
- slave = controller.Slave(self.masterq, self.server)
- slave.start()
+ if self.server:
+ slave = controller.Slave(self.masterq, self.server)
+ slave.start()
self.ui.run_wrapper(self.loop)
# If True, quit just pops out to connection list view.