Commit 0d9da3cf authored by anonym's avatar anonym
Browse files

tor-controlport-filter: reorder args.

parent b12bce10
...@@ -248,7 +248,7 @@ def match_and_parse_filter(filters, matchers): ...@@ -248,7 +248,7 @@ def match_and_parse_filter(filters, matchers):
allowed_events, restrict_stream_events) allowed_events, restrict_stream_events)
def handle_controlport_session(controller, readh, writeh, allowed_commands, allowed_events, client_desc, client_pid, restrict_stream_events = False): def handle_controlport_session(controller, readh, writeh, client_desc, client_pid, allowed_commands, allowed_events, restrict_stream_events = False):
def _log(line, format_multiline=False, sep = ': '): def _log(line, format_multiline=False, sep = ': '):
line = line.strip() line = line.strip()
...@@ -501,8 +501,8 @@ class FilteredControlPortProxyHandler(socketserver.StreamRequestHandler): ...@@ -501,8 +501,8 @@ class FilteredControlPortProxyHandler(socketserver.StreamRequestHandler):
disconnect_reason = "client quit" disconnect_reason = "client quit"
try: try:
handle_controlport_session(controller, self.rfile, self.wfile, handle_controlport_session(controller, self.rfile, self.wfile,
allowed_commands, allowed_events,
client_desc, client_pid, client_desc, client_pid,
allowed_commands, allowed_events,
restrict_stream_events restrict_stream_events
) )
except (ConnectionResetError, BrokenPipeError) as err: except (ConnectionResetError, BrokenPipeError) as err:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment