Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 02:10:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix UI sync bugs introduced by flow serialization.

Browse Source
This commit is contained in:
Aldo Cortesi 2011-01-26 22:17:42 +13:00
parent 635f7a971d
commit bd6c0499fb
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmproxy/console.py
View File

@ -109,6 +109,8 @@ class ConnectionItem(WWrap):
class ConnectionListView(urwid.ListWalker): class ConnectionListView(urwid.ListWalker):
def __init__(self, master, state): def __init__(self, master, state):
self.master, self.state = master, state self.master, self.state = master, state
if self.state.flow_list:
self.set_focus(0)
def get_focus(self): def get_focus(self):
f, i = self.state.get_focus() f, i = self.state.get_focus()
@ -572,6 +574,7 @@ class ConsoleMaster(controller.Master):
('key', "q"), ":back ", ('key', "q"), ":back ",
] ]
def __init__(self, server, options): def __init__(self, server, options):
self.conn_list_view = None
self.set_palette() self.set_palette()
controller.Master.__init__(self, server) controller.Master.__init__(self, server)
self.state = ConsoleState() self.state = ConsoleState()
@ -689,6 +692,7 @@ class ConsoleMaster(controller.Master):
self.statusbar.message(str(v)) self.statusbar.message(str(v))
return return
self.state.load_flows(data, ConsoleFlow) self.state.load_flows(data, ConsoleFlow)
if self.conn_list_view:
self.conn_list_view.set_focus(0) self.conn_list_view.set_focus(0)
self.sync_list_view() self.sync_list_view()

1
libmproxy/flow.py
View File

@ -212,6 +212,7 @@ class State:
Replaces the matching connection object with a ReplayConnection object. Replaces the matching connection object with a ReplayConnection object.
""" """
conn = self.get_connection(f) conn = self.get_connection(f)
if conn in self.flow_map:
del self.flow_map[conn] del self.flow_map[conn]
f.revert() f.revert()
self.flow_map[f.connection] = f self.flow_map[f.connection] = f

2
mitmproxy
View File

@ -78,4 +78,6 @@ if __name__ == '__main__':
) )
server = proxy.ProxyServer(options.port) server = proxy.ProxyServer(options.port)
m = console.ConsoleMaster(server, options) m = console.ConsoleMaster(server, options)
for i in args:
m.load_flows(i)
m.run() m.run()