September 2015 - tor-commits - lists.torproject.org

[nyx/master] Drop include_port attribute
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit f8477e3d842c9a57b11ec17ff3ef6e124c9b9a81 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 17 09:12:12 2015 -0700 Drop include_port attribute With the simplified drawing we no longer need a class attribute for this. --- nyx/connection_panel.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 2d9991b..75ef0e7 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -191,15 +191,10 @@ class ConnectionLine(object): Display component of the ConnectionEntry. """ - def __init__(self, entry, conn, include_port = True): + def __init__(self, entry, conn): self._entry = entry self.connection = conn - # includes the port or expanded ip address field when displaying listing - # information if true - - self.include_port = include_port - def get_listing_prefix(self): """ Provides a list of characters to be appended before the listing entry. @@ -250,7 +245,7 @@ class CircHeaderLine(ConnectionLine): self.is_built = False self._remote_fingerprint = None - ConnectionLine.__init__(self, entry, nyx.util.tracker.Connection(to_unix_time(circ.created), False, '127.0.0.1', 0, exit_address, exit_port, 'tcp'), include_port = False) + ConnectionLine.__init__(self, entry, nyx.util.tracker.Connection(to_unix_time(circ.created), False, '127.0.0.1', 0, exit_address, exit_port, 'tcp')) self.circuit = circ def get_fingerprint(self, default = None): @@ -266,7 +261,7 @@ class CircLine(ConnectionLine): def __init__(self, entry, circ, fingerprint): relay_ip, relay_port = nyx.util.tracker.get_consensus_tracker().get_relay_address(fingerprint, ('192.168.0.1', 0)) - ConnectionLine.__init__(self, entry, nyx.util.tracker.Connection(to_unix_time(circ.created), False, '127.0.0.1', 0, relay_ip, relay_port, 'tcp'), include_port = False) + ConnectionLine.__init__(self, entry, nyx.util.tracker.Connection(to_unix_time(circ.created), False, '127.0.0.1', 0, relay_ip, relay_port, 'tcp')) self._fingerprint = fingerprint self._is_last = False @@ -757,8 +752,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): if not isinstance(line, CircLine): subsection_width = width - x - 19 + include_port = not isinstance(line, CircHeaderLine) src = tor_controller().get_info('address', line.connection.local_address) - src += ':%s' % line.connection.local_port if line.include_port else '' + src += ':%s' % line.connection.local_port if include_port else '' if isinstance(line, CircHeaderLine) and not line.is_built: dst = 'Building...'

1 0

[nyx/master] Merge prefixes into line drawing
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 9ea13e78dc58a4f47ba1a0bbededab3c7bc3161f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 15 09:18:03 2015 -0700 Merge prefixes into line drawing Well, this is part of the line isn't it? --- nyx/connection_panel.py | 29 +++++++++++++---------------- nyx/util/panel.py | 3 +++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index ad35244..068c590 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -661,14 +661,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): for line_number in range(scroll_location, len(lines)): y = line_number + details_offset + 1 - scroll_location - entry_line = lines[line_number] - prefix = entry_line.get_listing_prefix() - - for i in range(len(prefix)): - self.addch(y, scroll_offset + i, prefix[i]) - - x = scroll_offset + len(prefix) - self._draw_line(x, y, entry_line, entry_line == selected, width - scroll_offset - len(prefix), current_time) + self._draw_line(scroll_offset, y, lines[line_number], lines[line_number] == selected, width - scroll_offset, current_time) if y >= height: break @@ -749,6 +742,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addch(DETAILS_HEIGHT + 1, 1, curses.ACS_TTEE) def _draw_line(self, x, y, line, is_selected, width, current_time): + for char in line.get_listing_prefix(): + x = self.addch(y, x, char) + entry_type = line._entry.get_type() attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(entry_type, 'white')) attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL @@ -771,11 +767,15 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addstr(y, x, ' ' * (width - x), attr) if not isinstance(line, CircLine): - subsection_width = width - 19 + subsection_width = width - x - 19 src = tor_controller().get_info('address', line.connection.local_address) src += ':%s' % line.connection.local_port if line.include_port else '' - dst = get_destination_label(line, 26) + + if isinstance(line, CircHeaderLine) and not line.is_built: + dst = 'Building...' + else: + dst = get_destination_label(line, 26) if entry_type in (Category.INBOUND, Category.SOCKS, Category.CONTROL): dst, src = src, dst @@ -804,19 +804,16 @@ class ConnectionPanel(panel.Panel, threading.Thread): # dst width is derived as: # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char - if not line.is_built: - dst = '%-53s' % 'Building...' - else: - dst = '%-53s' % get_destination_label(line, 53) + dst = '%-53s' % get_destination_label(line, 53) # fills the nickname into the empty space here dst = '%s%-25s ' % (dst[:25], str_tools.crop(line.get_nickname('UNKNOWN'), 25, 0)) - etc = line.get_etc_content(width - baseline_space - len(dst)) + etc = line.get_etc_content(width - x - baseline_space - len(dst)) self.addstr(y, x, dst + etc, attr) - self.addstr(y, x + width - baseline_space + 5, '%-14s' % line.placement_label, attr) + self.addstr(y, x + width - x - baseline_space + 5, '%-14s' % line.placement_label, attr) def stop(self): """ diff --git a/nyx/util/panel.py b/nyx/util/panel.py index 3be145b..efade79 100644 --- a/nyx/util/panel.py +++ b/nyx/util/panel.py @@ -496,10 +496,13 @@ class Panel(object): if self.win and self.max_x > x and self.max_y > y: try: self.win.addch(y, x, char, format_attr) + return x + 1 except: # in edge cases drawing could cause a _curses.error pass + return x + def addstr(self, y, x, msg, *attributes): """ Writes string to subwindow if able. This takes into account screen bounds

1 0

[nyx/master] Duplicate code to mark initial connections
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit c2872765b30d1619edcb9c5b8dcaea3906c8df08 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 19 13:36:33 2015 -0700 Duplicate code to mark initial connections The connection tracker already provides this. Silly to do it in the constructor, must be left over from before we added it. --- nyx/connection_panel.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 93c4672..2aaca41 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -273,12 +273,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._last_resource_fetch = -1 - # mark the initially exitsing connection uptimes as being estimates - - for entry in self._entries: - if isinstance(entry, ConnectionEntry): - entry.get_lines()[0].is_initial_connection = True - def set_sort_order(self, ordering = None): """ Sets the connection attributes we're sorting by and resorts the contents.

1 0

[nyx/master] Drop connection panel lock
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 93c4214687f3bcfeebb7cb904284f4649d2d1474 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 19 13:51:42 2015 -0700 Drop connection panel lock Not as sure of this as I'd like but moving toward the right design. Rest of our panels are now generally lock-free and we can do so here as well. Most important was our entries and that bit is now safe. Small risk around other self reference usage (mostly by handle_key()) so will need to give this more thought. --- nyx/connection_panel.py | 270 +++++++++++++++++++++++------------------------ 1 file changed, 133 insertions(+), 137 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 2aaca41..44217f8 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -235,7 +235,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._show_details = False # presents the details panel if true self._last_update = -1 # time the content was last revised - self._vals_lock = threading.RLock() self._pause_condition = threading.Condition() self._halt = False # terminates thread if true @@ -282,42 +281,41 @@ class ConnectionPanel(panel.Panel, threading.Thread): set ordering """ - with self._vals_lock: - if ordering: - nyx_config = conf.get_config('nyx') + if ordering: + nyx_config = conf.get_config('nyx') - ordering_keys = [SortAttr.keys()[SortAttr.index_of(v)] for v in ordering] - nyx_config.set('features.connection.order', ', '.join(ordering_keys)) + ordering_keys = [SortAttr.keys()[SortAttr.index_of(v)] for v in ordering] + nyx_config.set('features.connection.order', ', '.join(ordering_keys)) - def sort_value(entry, attr): - connection_line = entry.get_lines()[0] + def sort_value(entry, attr): + connection_line = entry.get_lines()[0] - if attr == SortAttr.IP_ADDRESS: - if entry.is_private(): - return 255 ** 4 # orders at the end - - ip_value = 0 - - for octet in connection_line.connection.remote_address.split('.'): - ip_value = ip_value * 255 + int(octet) - - return ip_value * 65536 + connection_line.connection.remote_port - elif attr == SortAttr.PORT: - return connection_line.connection.remote_port - elif attr == SortAttr.FINGERPRINT: - return connection_line.fingerprint if connection_line.fingerprint else 'UNKNOWN' - elif attr == SortAttr.NICKNAME: - return connection_line.nickname if connection_line.nickname else 'z' * 20 - elif attr == SortAttr.CATEGORY: - return Category.index_of(entry.get_type()) - elif attr == SortAttr.UPTIME: - return connection_line.connection.start_time - elif attr == SortAttr.COUNTRY: - return '' if entry.is_private() else (connection_line.locale if connection_line.locale else '') - else: - return '' + if attr == SortAttr.IP_ADDRESS: + if entry.is_private(): + return 255 ** 4 # orders at the end + + ip_value = 0 + + for octet in connection_line.connection.remote_address.split('.'): + ip_value = ip_value * 255 + int(octet) + + return ip_value * 65536 + connection_line.connection.remote_port + elif attr == SortAttr.PORT: + return connection_line.connection.remote_port + elif attr == SortAttr.FINGERPRINT: + return connection_line.fingerprint if connection_line.fingerprint else 'UNKNOWN' + elif attr == SortAttr.NICKNAME: + return connection_line.nickname if connection_line.nickname else 'z' * 20 + elif attr == SortAttr.CATEGORY: + return Category.index_of(entry.get_type()) + elif attr == SortAttr.UPTIME: + return connection_line.connection.start_time + elif attr == SortAttr.COUNTRY: + return '' if entry.is_private() else (connection_line.locale if connection_line.locale else '') + else: + return '' - self._entries.sort(key = lambda i: [sort_value(i, attr) for attr in CONFIG['features.connection.order']]) + self._entries = sorted(self._entries, key = lambda i: [sort_value(i, attr) for attr in CONFIG['features.connection.order']]) def show_sort_dialog(self): """ @@ -336,89 +334,89 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.set_sort_order(results) def handle_key(self, key): - with self._vals_lock: - user_traffic_allowed = tor_controller().is_user_traffic_allowed() + user_traffic_allowed = tor_controller().is_user_traffic_allowed() - if key.is_scroll(): - page_height = self.get_preferred_size()[0] - 1 + if key.is_scroll(): + page_height = self.get_preferred_size()[0] - 1 - if self._show_details: - page_height -= (DETAILS_HEIGHT + 1) + if self._show_details: + page_height -= (DETAILS_HEIGHT + 1) - lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) - is_changed = self._scroller.handle_key(key, lines, page_height) + lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) + is_changed = self._scroller.handle_key(key, lines, page_height) - if is_changed: - self.redraw(True) - elif key.is_selection(): - self._show_details = not self._show_details + if is_changed: self.redraw(True) - elif key.match('s'): - self.show_sort_dialog() - elif key.match('u'): - # provides a menu to pick the connection resolver + elif key.is_selection(): + self._show_details = not self._show_details + self.redraw(True) + elif key.match('s'): + self.show_sort_dialog() + elif key.match('u'): + # provides a menu to pick the connection resolver - title = 'Resolver Util:' - options = ['auto'] + list(connection.Resolver) - conn_resolver = nyx.util.tracker.get_connection_tracker() + title = 'Resolver Util:' + options = ['auto'] + list(connection.Resolver) + conn_resolver = nyx.util.tracker.get_connection_tracker() - current_overwrite = conn_resolver.get_custom_resolver() + current_overwrite = conn_resolver.get_custom_resolver() - if current_overwrite is None: - old_selection = 0 - else: - old_selection = options.index(current_overwrite) + if current_overwrite is None: + old_selection = 0 + else: + old_selection = options.index(current_overwrite) - selection = nyx.popups.show_menu(title, options, old_selection) + selection = nyx.popups.show_menu(title, options, old_selection) - # applies new setting + # applies new setting - if selection != -1: - selected_option = options[selection] if selection != 0 else None - conn_resolver.set_custom_resolver(selected_option) - elif key.match('d'): - self.set_title_visible(False) - self.redraw(True) + if selection != -1: + selected_option = options[selection] if selection != 0 else None + conn_resolver.set_custom_resolver(selected_option) + elif key.match('d'): + self.set_title_visible(False) + self.redraw(True) + entries = self._entries - while True: - lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) - selection = self._scroller.get_cursor_selection(lines) + while True: + lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in entries])) + selection = self._scroller.get_cursor_selection(lines) - if not selection: - break + if not selection: + break - color = CONFIG['attr.connection.category_color'].get(selection.entry.get_type(), 'white') - is_close_key = lambda key: key.is_selection() or key.match('d') or key.match('left') or key.match('right') - key = nyx.popups.show_descriptor_popup(selection.fingerprint, color, self.max_x, is_close_key) + color = CONFIG['attr.connection.category_color'].get(selection.entry.get_type(), 'white') + is_close_key = lambda key: key.is_selection() or key.match('d') or key.match('left') or key.match('right') + key = nyx.popups.show_descriptor_popup(selection.fingerprint, color, self.max_x, is_close_key) - if not key or key.is_selection() or key.match('d'): - break # closes popup - elif key.match('left'): - self.handle_key(panel.KeyInput(curses.KEY_UP)) - elif key.match('right'): - self.handle_key(panel.KeyInput(curses.KEY_DOWN)) + if not key or key.is_selection() or key.match('d'): + break # closes popup + elif key.match('left'): + self.handle_key(panel.KeyInput(curses.KEY_UP)) + elif key.match('right'): + self.handle_key(panel.KeyInput(curses.KEY_DOWN)) - self.set_title_visible(True) - self.redraw(True) - elif key.match('c') and user_traffic_allowed.inbound: - nyx.popups.show_count_dialog('Client Locales', self._client_locale_usage) - elif key.match('e') and user_traffic_allowed.outbound: - counts = {} - key_width = max(map(len, self._exit_port_usage.keys())) + self.set_title_visible(True) + self.redraw(True) + elif key.match('c') and user_traffic_allowed.inbound: + nyx.popups.show_count_dialog('Client Locales', self._client_locale_usage) + elif key.match('e') and user_traffic_allowed.outbound: + counts = {} + key_width = max(map(len, self._exit_port_usage.keys())) - for k, v in self._exit_port_usage.items(): - usage = connection.port_usage(k) + for k, v in self._exit_port_usage.items(): + usage = connection.port_usage(k) - if usage: - k = k.ljust(key_width + 3) + usage.ljust(EXIT_USAGE_WIDTH) + if usage: + k = k.ljust(key_width + 3) + usage.ljust(EXIT_USAGE_WIDTH) - counts[k] = v + counts[k] = v - nyx.popups.show_count_dialog('Exiting Port Usage', counts) - else: - return False + nyx.popups.show_count_dialog('Exiting Port Usage', counts) + else: + return False - return True + return True def run(self): """ @@ -472,41 +470,41 @@ class ConnectionPanel(panel.Panel, threading.Thread): return options def draw(self, width, height): - with self._vals_lock: - controller = tor_controller() + controller = tor_controller() + entries = self._entries - lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) - selected = self._scroller.get_cursor_selection(lines) + lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in entries])) + selected = self._scroller.get_cursor_selection(lines) - if self.is_paused(): - current_time = self.get_pause_time() - elif not controller.is_alive(): - current_time = controller.connection_time() - else: - current_time = time.time() + if self.is_paused(): + current_time = self.get_pause_time() + elif not controller.is_alive(): + current_time = controller.connection_time() + else: + current_time = time.time() - is_showing_details = self._show_details and selected - details_offset = DETAILS_HEIGHT + 1 if is_showing_details else 0 + is_showing_details = self._show_details and selected + details_offset = DETAILS_HEIGHT + 1 if is_showing_details else 0 - is_scrollbar_visible = len(lines) > height - details_offset - 1 - scroll_offset = 2 if is_scrollbar_visible else 0 - scroll_location = self._scroller.get_scroll_location(lines, height - details_offset - 1) + is_scrollbar_visible = len(lines) > height - details_offset - 1 + scroll_offset = 2 if is_scrollbar_visible else 0 + scroll_location = self._scroller.get_scroll_location(lines, height - details_offset - 1) - if self.is_title_visible(): - self._draw_title(self._entries, self._show_details) + if self.is_title_visible(): + self._draw_title(entries, self._show_details) - if is_showing_details: - self._draw_details(selected, width, is_scrollbar_visible) + if is_showing_details: + self._draw_details(selected, width, is_scrollbar_visible) - if is_scrollbar_visible: - self.add_scroll_bar(scroll_location, scroll_location + height - details_offset - 1, len(lines), 1 + details_offset) + if is_scrollbar_visible: + self.add_scroll_bar(scroll_location, scroll_location + height - details_offset - 1, len(lines), 1 + details_offset) - for line_number in range(scroll_location, len(lines)): - y = line_number + details_offset + 1 - scroll_location - self._draw_line(scroll_offset, y, lines[line_number], lines[line_number] == selected, width - scroll_offset, current_time) + for line_number in range(scroll_location, len(lines)): + y = line_number + details_offset + 1 - scroll_location + self._draw_line(scroll_offset, y, lines[line_number], lines[line_number] == selected, width - scroll_offset, current_time) - if y >= height: - break + if y >= height: + break def _draw_title(self, entries, showing_details): """ @@ -736,25 +734,23 @@ class ConnectionPanel(panel.Panel, threading.Thread): if not (circ.status == 'BUILT' and len(circ.path) == 1): new_entries.append(Entry.from_circuit(circ)) - with self._vals_lock: - # update stats for client and exit connections - # TODO: this is counting connections each time they're resolved - totally broken :( + # update stats for client and exit connections + # TODO: this is counting connections each time they're resolved - totally broken :( - for entry in new_entries: - entry_line = entry.get_lines()[0] - - if entry.is_private(): - if entry.get_type() == Category.INBOUND: - if entry_line.locale: - self._client_locale_usage[entry_line.locale] = self._client_locale_usage.get(entry_line.locale, 0) + 1 - elif entry.get_type() == Category.EXIT: - exit_port = entry_line.connection.remote_port - self._exit_port_usage[exit_port] = self._exit_port_usage.get(exit_port, 0) + 1 + for entry in new_entries: + entry_line = entry.get_lines()[0] - self._entries = new_entries + if entry.is_private(): + if entry.get_type() == Category.INBOUND: + if entry_line.locale: + self._client_locale_usage[entry_line.locale] = self._client_locale_usage.get(entry_line.locale, 0) + 1 + elif entry.get_type() == Category.EXIT: + exit_port = entry_line.connection.remote_port + self._exit_port_usage[exit_port] = self._exit_port_usage.get(exit_port, 0) + 1 - self.set_sort_order() - self._last_resource_fetch = current_resolution_count + self._entries = new_entries + self.set_sort_order() + self._last_resource_fetch = current_resolution_count if CONFIG['features.connection.resolveApps']: local_ports, remote_ports = [], []

1 0

[nyx/master] Revise connection resolver selection
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 5b0ab27709933f5bb1a8301042514b4def534d29 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 19 14:54:00 2015 -0700 Revise connection resolver selection Very minor tweaks. Changed keybinding to 'r' (guess it was previously occupied?) and relabeled as 'Connection Resolver'. --- nyx/connection_panel.py | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index ee86c2f..d313e28 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -341,27 +341,16 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.redraw(True) elif key.match('s'): self.show_sort_dialog() - elif key.match('u'): - # provides a menu to pick the connection resolver - - title = 'Resolver Util:' + elif key.match('r'): + connection_tracker = nyx.util.tracker.get_connection_tracker() options = ['auto'] + list(connection.Resolver) - conn_resolver = nyx.util.tracker.get_connection_tracker() - - current_overwrite = conn_resolver.get_custom_resolver() - - if current_overwrite is None: - old_selection = 0 - else: - old_selection = options.index(current_overwrite) - - selection = nyx.popups.show_menu(title, options, old_selection) - # applies new setting + resolver = connection_tracker.get_custom_resolver() + selected_index = 0 if resolver is None else options.index(resolver) + selection = nyx.popups.show_menu('Connection Resolver:', options, selected_index) if selection != -1: - selected_option = options[selection] if selection != 0 else None - conn_resolver.set_custom_resolver(selected_option) + connection_tracker.set_custom_resolver(None if selection == 0 else options[selection]) elif key.match('d'): self.set_title_visible(False) self.redraw(True) @@ -436,7 +425,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): last_ran = time.time() def get_help(self): - resolver_util = nyx.util.tracker.get_connection_tracker().get_custom_resolver() + resolver = nyx.util.tracker.get_connection_tracker().get_custom_resolver() user_traffic_allowed = tor_controller().is_user_traffic_allowed() options = [ @@ -447,7 +436,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): ('enter', 'show connection details', None), ('d', 'raw consensus descriptor', None), ('s', 'sort ordering', None), - ('u', 'resolving utility', 'auto' if resolver_util is None else resolver_util), + ('r', 'connection resolver', 'auto' if resolver is None else resolver), ] if user_traffic_allowed.inbound:

1 0

[nyx/master] Split right column into its own function
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit ee4273f7cdac09af7deec6d1d08567a9b065b2c1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 20 13:13:05 2015 -0700 Split right column into its own function --- nyx/connection_panel.py | 64 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 540c094..2c8a4d6 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -554,6 +554,11 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addch(DETAILS_HEIGHT + 1, 1, curses.ACS_TTEE) def _draw_line(self, x, y, line, is_selected, width, current_time): + attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(line.entry.get_type(), 'white')) + attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL + + self.addstr(y, x, ' ' * (width - x), attr) + if line.line_type == LineType.CIRCUIT: if line.circuit.path[-1][0] == line.fingerprint: prefix = (ord(' '), curses.ACS_LLCORNER, curses.ACS_HLINE, ord(' ')) @@ -562,39 +567,12 @@ class ConnectionPanel(panel.Panel, threading.Thread): for char in prefix: x = self.addch(y, x, char) - - attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(line.entry.get_type(), 'white')) - attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL - - self.addstr(y, x, ' ' * (width - x), attr) - - if line.line_type != LineType.CIRCUIT: - subsection_width = width - x - 19 - - time_prefix = '+' if line.connection.is_legacy else ' ' - time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) - - x = self._draw_address_column(x + 1, y, line, attr) - self._draw_line_details(x + 2, y, line, subsection_width - x, attr) - x = self.addstr(y, subsection_width + 1, time_label, attr) - x = self.addstr(y, x, ' (', attr) - x = self.addstr(y, x, line.entry.get_type().upper(), attr | curses.A_BOLD) - x = self.addstr(y, x, ')', attr) else: - self._draw_address_column(x, y, line, attr) - self._draw_line_details(x + 53, y, line, width - x - 19 - 53, attr) - - circ_path = [fp for fp, _ in line.circuit.path] - circ_index = circ_path.index(line.fingerprint) - - if circ_index == len(circ_path) - 1: - placement_type = 'Exit' if line.circuit.status == 'BUILT' else 'Extending' - elif circ_index == 0: - placement_type = 'Guard' - else: - placement_type = 'Middle' + x += 1 # offset from edge - self.addstr(y, width - 14, '%i / %s' % (circ_index + 1, placement_type), attr) + self._draw_address_column(x, y, line, attr) + self._draw_line_details(57, y, line, width - 57 - 20, attr) + self._draw_right_column(width - 18, y, line, current_time, attr) def _draw_address_column(self, x, y, line, attr): src = tor_controller().get_info('address', line.connection.local_address) @@ -618,9 +596,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): dst, src = src, dst if line.line_type == LineType.CIRCUIT: - return self.addstr(y, x, dst, attr) + self.addstr(y, x, dst, attr) else: - return self.addstr(y, x, '%-21s --> %-26s' % (src, dst), attr) + self.addstr(y, x, '%-21s --> %-26s' % (src, dst), attr) def _draw_line_details(self, x, y, line, width, attr): if line.line_type == LineType.CIRCUIT_HEADER: @@ -643,6 +621,26 @@ class ConnectionPanel(panel.Panel, threading.Thread): else: return + def _draw_right_column(self, x, y, line, current_time, attr): + if line.line_type == LineType.CIRCUIT: + circ_path = [fp for fp, _ in line.circuit.path] + circ_index = circ_path.index(line.fingerprint) + + if circ_index == len(circ_path) - 1: + placement_type = 'Exit' if line.circuit.status == 'BUILT' else 'Extending' + elif circ_index == 0: + placement_type = 'Guard' + else: + placement_type = 'Middle' + + self.addstr(y, x + 4, '%i / %s' % (circ_index + 1, placement_type), attr) + else: + x = self.addstr(y, x, '+' if line.connection.is_legacy else ' ', attr) + x = self.addstr(y, x, '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1), attr) + x = self.addstr(y, x, ' (', attr) + x = self.addstr(y, x, line.entry.get_type().upper(), attr | curses.A_BOLD) + x = self.addstr(y, x, ')', attr) + def stop(self): """ Halts further resolutions and terminates the thread.

1 0

[nyx/master] Split address column rendering into its own function
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 173d57fce6dee829b7bc6177a965990000940769 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 20 11:54:38 2015 -0700 Split address column rendering into its own function --- nyx/connection_panel.py | 132 +++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 78 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index d313e28..7b6d4df 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -272,7 +272,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._show_details = False # presents the details panel if true self._sort_order = CONFIG['features.connection.order'] - self._last_update = -1 # time the content was last revised + self._last_resource_fetch = -1 # timestamp of the last ConnectionResolver results used self._pause_condition = threading.Condition() self._halt = False # terminates thread if true @@ -285,8 +285,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): # If we're a bridge and been running over a day then prepopulates with the # last day's clients. - controller = tor_controller() - bridge_clients = controller.get_info('status/clients-seen', None) + bridge_clients = tor_controller().get_info('status/clients-seen', None) if bridge_clients: # Response has a couple arguments... @@ -305,11 +304,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): locale, count = entry.split('=', 1) self._client_locale_usage[locale] = int(count) - # Last sampling received from the ConnectionResolver, used to detect when - # it changes. - - self._last_resource_fetch = -1 - def show_sort_dialog(self): """ Provides a dialog for sorting our connections. @@ -569,25 +563,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): for char in prefix: x = self.addch(y, x, char) - entry_type = line.entry.get_type() - attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(entry_type, 'white')) + attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(line.entry.get_type(), 'white')) attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL - def get_destination_label(line, width): - output = '<scrubbed>' if line.entry.is_private() else line.connection.remote_address - output += ':%s' % line.connection.remote_port - space_available = width - len(output) - 3 - - if line.entry.get_type() == Category.EXIT and space_available >= 5: - purpose = connection.port_usage(line.connection.remote_port) - - if purpose: - output += ' (%s)' % str_tools.crop(purpose, space_available) - elif space_available >= 2 and not tor_controller().is_geoip_unavailable() and not line.entry.is_private(): - output += ' (%s)' % (line.locale if line.locale else '??') - - return output[:width] - def get_etc_content(line, width): if line.line_type == LineType.CIRCUIT_HEADER: etc_attr = ['Purpose: %s' % line.circuit.purpose.capitalize(), 'Circuit ID: %s' % line.circuit.id] @@ -595,81 +573,53 @@ class ConnectionPanel(panel.Panel, threading.Thread): for i in range(len(etc_attr), -1, -1): etc_label = ', '.join(etc_attr[:i]) - if len(etc_label) <= width: + if width >= len(etc_label): return etc_label return '' - else: + elif line.entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): # for applications show the command/pid - if line.entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): + try: port = line.connection.local_port if line.entry.get_type() == Category.HIDDEN else line.connection.remote_port + process = nyx.util.tracker.get_port_usage_tracker().fetch(port) + display_label = '%s (%s)' % (process.name, process.pid) if process.pid else process.name + except nyx.util.tracker.UnresolvedResult: + display_label = 'resolving...' + except nyx.util.tracker.UnknownApplication: + display_label = 'UNKNOWN' + + return display_label if len(display_label) < width else '' + else: + fingerprint = line.fingerprint if line.fingerprint else 'UNKNOWN' + nickname = line.nickname if line.nickname else 'UNKNOWN' - try: - process = nyx.util.tracker.get_port_usage_tracker().fetch(port) - display_label = '%s (%s)' % (process.name, process.pid) if process.pid else process.name - except nyx.util.tracker.UnresolvedResult: - display_label = 'resolving...' - except nyx.util.tracker.UnknownApplication: - display_label = 'UNKNOWN' - - if len(display_label) < width: - return display_label - else: - return '' - - # for everything else display connection/consensus information - - etc, used_space = '', 0 - - if width > used_space + 42: - # show fingerprint (column width: 42 characters) - - etc += '%-40s ' % (line.fingerprint if line.fingerprint else 'UNKNOWN') - used_space += 42 - - if width > used_space + 10: - # show nickname (column width: remainder) - - nickname_space = width - used_space - nickname_label = str_tools.crop(line.nickname if line.nickname else 'UNKNOWN', nickname_space, 0) - etc += ('%%-%is ' % nickname_space) % nickname_label - used_space += nickname_space + 2 - - return etc + if width > 52: + return '%-40s %s' % (fingerprint, str_tools.crop(nickname, width - 42, 0)) + elif width > 42: + return fingerprint + else: + return '' self.addstr(y, x, ' ' * (width - x), attr) if line.line_type != LineType.CIRCUIT: subsection_width = width - x - 19 - include_port = line.line_type != LineType.CIRCUIT_HEADER - src = tor_controller().get_info('address', line.connection.local_address) - src += ':%s' % line.connection.local_port if include_port else '' - - if line.line_type == LineType.CIRCUIT_HEADER and line.circuit.status != 'BUILT': - dst = 'Building...' - else: - dst = get_destination_label(line, 26) - - if entry_type in (Category.INBOUND, Category.SOCKS, Category.CONTROL): - dst, src = src, dst - time_prefix = '+' if line.connection.is_legacy else ' ' time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) - x = self.addstr(y, x + 1, '%-21s --> %-26s' % (src, dst), attr) - x = self.addstr(y, x + 2, get_etc_content(line, subsection_width - 11 - max(21, len(src)) - max(26, len(dst))), attr) + x = self._draw_address_column(x + 1, y, line, attr) + x = self.addstr(y, x + 2, get_etc_content(line, subsection_width - x), attr) x = self.addstr(y, subsection_width + 1, time_label, attr) x = self.addstr(y, x, ' (', attr) - x = self.addstr(y, x, entry_type.upper(), attr | curses.A_BOLD) + x = self.addstr(y, x, line.entry.get_type().upper(), attr | curses.A_BOLD) x = self.addstr(y, x, ')', attr) else: - self.addstr(y, x, get_destination_label(line, 25), attr) - self.addstr(y, x + 25, str_tools.crop(line.nickname if line.nickname else 'UNKNOWN', 25, 0), attr) + self._draw_address_column(x, y, line, attr) self.addstr(y, x + 53, get_etc_content(line, width - x - 19 - 53), attr) - circ_path = [path_entry[0] for path_entry in line.circuit.path] + circ_path = [fp for fp, _ in line.circuit.path] circ_index = circ_path.index(line.fingerprint) if circ_index == len(circ_path) - 1: @@ -681,6 +631,32 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addstr(y, width - 14, '%i / %s' % (circ_index + 1, placement_type), attr) + def _draw_address_column(self, x, y, line, attr): + src = tor_controller().get_info('address', line.connection.local_address) + src += ':%s' % line.connection.local_port if line.line_type == LineType.CONNECTION else '' + + if line.line_type == LineType.CIRCUIT_HEADER and line.circuit.status != 'BUILT': + dst = 'Building...' + else: + dst = '<scrubbed>' if line.entry.is_private() else line.connection.remote_address + dst += ':%s' % line.connection.remote_port + + if line.entry.get_type() == Category.EXIT: + purpose = connection.port_usage(line.connection.remote_port) + + if purpose: + dst += ' (%s)' % str_tools.crop(purpose, 26 - len(dst) - 3) + elif not tor_controller().is_geoip_unavailable() and not line.entry.is_private(): + dst += ' (%s)' % (line.locale if line.locale else '??') + + if line.entry.get_type() in (Category.INBOUND, Category.SOCKS, Category.CONTROL): + dst, src = src, dst + + if line.line_type == LineType.CIRCUIT: + return self.addstr(y, x, dst, attr) + else: + return self.addstr(y, x, '%-21s --> %-26s' % (src, dst), attr) + def stop(self): """ Halts further resolutions and terminates the thread.

1 0

[nyx/master] Split line detail rendering into its own function
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit f5c7984f118e01950192db841ff3be261441edb8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 20 12:35:51 2015 -0700 Split line detail rendering into its own function --- nyx/connection_panel.py | 62 ++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 7b6d4df..540c094 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -169,7 +169,7 @@ class ConnectionEntry(Entry): if fingerprint: nickname = nyx.util.tracker.get_consensus_tracker().get_relay_nickname(fingerprint) - locale = tor_controller().get_info('ip-to-country/%s' % connection.remote_address, None) + locale = tor_controller().get_info('ip-to-country/%s' % self._connection.remote_address, None) return [Line(self, LineType.CONNECTION, self._connection, None, fingerprint, nickname, locale)] @@ -566,41 +566,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(line.entry.get_type(), 'white')) attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL - def get_etc_content(line, width): - if line.line_type == LineType.CIRCUIT_HEADER: - etc_attr = ['Purpose: %s' % line.circuit.purpose.capitalize(), 'Circuit ID: %s' % line.circuit.id] - - for i in range(len(etc_attr), -1, -1): - etc_label = ', '.join(etc_attr[:i]) - - if width >= len(etc_label): - return etc_label - - return '' - elif line.entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): - # for applications show the command/pid - - try: - port = line.connection.local_port if line.entry.get_type() == Category.HIDDEN else line.connection.remote_port - process = nyx.util.tracker.get_port_usage_tracker().fetch(port) - display_label = '%s (%s)' % (process.name, process.pid) if process.pid else process.name - except nyx.util.tracker.UnresolvedResult: - display_label = 'resolving...' - except nyx.util.tracker.UnknownApplication: - display_label = 'UNKNOWN' - - return display_label if len(display_label) < width else '' - else: - fingerprint = line.fingerprint if line.fingerprint else 'UNKNOWN' - nickname = line.nickname if line.nickname else 'UNKNOWN' - - if width > 52: - return '%-40s %s' % (fingerprint, str_tools.crop(nickname, width - 42, 0)) - elif width > 42: - return fingerprint - else: - return '' - self.addstr(y, x, ' ' * (width - x), attr) if line.line_type != LineType.CIRCUIT: @@ -610,14 +575,14 @@ class ConnectionPanel(panel.Panel, threading.Thread): time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) x = self._draw_address_column(x + 1, y, line, attr) - x = self.addstr(y, x + 2, get_etc_content(line, subsection_width - x), attr) + self._draw_line_details(x + 2, y, line, subsection_width - x, attr) x = self.addstr(y, subsection_width + 1, time_label, attr) x = self.addstr(y, x, ' (', attr) x = self.addstr(y, x, line.entry.get_type().upper(), attr | curses.A_BOLD) x = self.addstr(y, x, ')', attr) else: self._draw_address_column(x, y, line, attr) - self.addstr(y, x + 53, get_etc_content(line, width - x - 19 - 53), attr) + self._draw_line_details(x + 53, y, line, width - x - 19 - 53, attr) circ_path = [fp for fp, _ in line.circuit.path] circ_index = circ_path.index(line.fingerprint) @@ -657,6 +622,27 @@ class ConnectionPanel(panel.Panel, threading.Thread): else: return self.addstr(y, x, '%-21s --> %-26s' % (src, dst), attr) + def _draw_line_details(self, x, y, line, width, attr): + if line.line_type == LineType.CIRCUIT_HEADER: + comp = ['Purpose: %s' % line.circuit.purpose.capitalize(), ', Circuit ID: %s' % line.circuit.id] + elif line.entry.get_type() in (Category.SOCKS, Category.HIDDEN, Category.CONTROL): + try: + port = line.connection.local_port if line.entry.get_type() == Category.HIDDEN else line.connection.remote_port + process = nyx.util.tracker.get_port_usage_tracker().fetch(port) + comp = ['%s (%s)' % (process.name, process.pid) if process.pid else process.name] + except nyx.util.tracker.UnresolvedResult: + comp = ['resolving...'] + except nyx.util.tracker.UnknownApplication: + comp = ['UNKNOWN'] + else: + comp = ['%-40s' % (line.fingerprint if line.fingerprint else 'UNKNOWN'), ' ' + (line.nickname if line.nickname else 'UNKNOWN')] + + for entry in comp: + if width >= x + len(entry): + x = self.addstr(y, x, entry, attr) + else: + return + def stop(self): """ Halts further resolutions and terminates the thread.

1 0

[nyx/master] Drop set_sort_order()
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit fe0a896f0d805a64ae91de913759967c14bb29b7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 19 14:08:40 2015 -0700 Drop set_sort_order() Removes our set_sort_order() method. This is a bit of back-peddling in that it moves sort_value() back into the Entry, but now that the class is so elegantly simple it's a good match. --- nyx/connection_panel.py | 91 ++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 44217f8..a4f16ac 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -118,6 +118,43 @@ class Entry(object): raise NotImplementedError('should be implemented by subclasses') + def sort_value(self, attr): + """ + Provides a heuristic for sorting by a given value. + + :param SortAttr attr: sort attribute to provide a heuristic for + + :returns: comparable value for sorting + """ + + line = self.get_lines()[0] + at_end = 'z' * 20 + + if attr == SortAttr.IP_ADDRESS: + if self.is_private(): + return 255 ** 4 # orders at the end + + ip_value = 0 + + for octet in line.connection.remote_address.split('.'): + ip_value = ip_value * 255 + int(octet) + + return ip_value * 65536 + line.connection.remote_port + elif attr == SortAttr.PORT: + return line.connection.remote_port + elif attr == SortAttr.FINGERPRINT: + return line.fingerprint if line.fingerprint else at_end + elif attr == SortAttr.NICKNAME: + return line.nickname if line.nickname else at_end + elif attr == SortAttr.CATEGORY: + return Category.index_of(self.get_type()) + elif attr == SortAttr.UPTIME: + return line.connection.start_time + elif attr == SortAttr.COUNTRY: + return line.locale if (line.locale and not self.is_private()) else at_end + else: + return '' + class ConnectionEntry(Entry): def __init__(self, connection): @@ -272,51 +309,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._last_resource_fetch = -1 - def set_sort_order(self, ordering = None): - """ - Sets the connection attributes we're sorting by and resorts the contents. - - Arguments: - ordering - new ordering, if undefined then this resorts with the last - set ordering - """ - - if ordering: - nyx_config = conf.get_config('nyx') - - ordering_keys = [SortAttr.keys()[SortAttr.index_of(v)] for v in ordering] - nyx_config.set('features.connection.order', ', '.join(ordering_keys)) - - def sort_value(entry, attr): - connection_line = entry.get_lines()[0] - - if attr == SortAttr.IP_ADDRESS: - if entry.is_private(): - return 255 ** 4 # orders at the end - - ip_value = 0 - - for octet in connection_line.connection.remote_address.split('.'): - ip_value = ip_value * 255 + int(octet) - - return ip_value * 65536 + connection_line.connection.remote_port - elif attr == SortAttr.PORT: - return connection_line.connection.remote_port - elif attr == SortAttr.FINGERPRINT: - return connection_line.fingerprint if connection_line.fingerprint else 'UNKNOWN' - elif attr == SortAttr.NICKNAME: - return connection_line.nickname if connection_line.nickname else 'z' * 20 - elif attr == SortAttr.CATEGORY: - return Category.index_of(entry.get_type()) - elif attr == SortAttr.UPTIME: - return connection_line.connection.start_time - elif attr == SortAttr.COUNTRY: - return '' if entry.is_private() else (connection_line.locale if connection_line.locale else '') - else: - return '' - - self._entries = sorted(self._entries, key = lambda i: [sort_value(i, attr) for attr in CONFIG['features.connection.order']]) - def show_sort_dialog(self): """ Provides the sort dialog for our connections. @@ -331,7 +323,11 @@ class ConnectionPanel(panel.Panel, threading.Thread): results = nyx.popups.show_sort_dialog(title_label, options, old_selection, option_colors) if results: - self.set_sort_order(results) + nyx_config = conf.get_config('nyx') + ordering_keys = [SortAttr.keys()[SortAttr.index_of(v)] for v in results] + nyx_config.set('features.connection.order', ', '.join(ordering_keys)) + + self._entries = sorted(self._entries, key = lambda i: [i.sort_value(attr) for attr in CONFIG['features.connection.order']]) def handle_key(self, key): user_traffic_allowed = tor_controller().is_user_traffic_allowed() @@ -748,8 +744,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): exit_port = entry_line.connection.remote_port self._exit_port_usage[exit_port] = self._exit_port_usage.get(exit_port, 0) + 1 - self._entries = new_entries - self.set_sort_order() + self._entries = sorted(new_entries, key = lambda i: [i.sort_value(attr) for attr in CONFIG['features.connection.order']]) self._last_resource_fetch = current_resolution_count if CONFIG['features.connection.resolveApps']:

1 0

[nyx/master] Drop reset listener
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 470d64fc0feb81f8f853552cb2b0e36ad1c307da Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 19 13:31:09 2015 -0700 Drop reset listener Our connnection panel listened for tor state changes so we could note the time when it disconnected. However, Stem provides this to us via the connection_time() method, no no need. --- nyx/connection_panel.py | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index c671781..93c4672 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -16,7 +16,7 @@ import nyx.util.ui_tools from nyx.util import panel, tor_controller, ui_tools -from stem.control import Listener, State +from stem.control import Listener from stem.util import conf, connection, enum, str_tools try: @@ -235,8 +235,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._show_details = False # presents the details panel if true self._last_update = -1 # time the content was last revised - self._is_tor_running = True # indicates if tor is currently running or not - self._halt_time = None # time when tor was stopped self._vals_lock = threading.RLock() self._pause_condition = threading.Condition() @@ -281,27 +279,6 @@ class ConnectionPanel(panel.Panel, threading.Thread): if isinstance(entry, ConnectionEntry): entry.get_lines()[0].is_initial_connection = True - # listens for when tor stops so we know to stop reflecting changes - - controller.add_status_listener(self.tor_state_listener) - - def tor_state_listener(self, controller, event_type, _): - """ - Freezes the connection contents when Tor stops. - """ - - self._is_tor_running = event_type in (State.INIT, State.RESET) - self._halt_time = None if self._is_tor_running else time.time() - self.redraw(True) - - def get_pause_time(self): - """ - Provides the time Tor stopped if it isn't running. Otherwise this is the - time we were last paused. - """ - - return self._halt_time if self._halt_time else panel.Panel.get_pause_time(self) - def set_sort_order(self, ordering = None): """ Sets the connection attributes we're sorting by and resorts the contents. @@ -457,7 +434,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): last_ran = -1 while not self._halt: - if self.is_paused() or not self._is_tor_running or (time.time() - last_ran) < UPDATE_RATE: + if self.is_paused() or not tor_controller().is_alive() or (time.time() - last_ran) < UPDATE_RATE: with self._pause_condition: if not self._halt: self._pause_condition.wait(0.2) @@ -502,9 +479,17 @@ class ConnectionPanel(panel.Panel, threading.Thread): def draw(self, width, height): with self._vals_lock: + controller = tor_controller() + lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) selected = self._scroller.get_cursor_selection(lines) - current_time = self.get_pause_time() if (self.is_paused() or not self._is_tor_running) else time.time() + + if self.is_paused(): + current_time = self.get_pause_time() + elif not controller.is_alive(): + current_time = controller.connection_time() + else: + current_time = time.time() is_showing_details = self._show_details and selected details_offset = DETAILS_HEIGHT + 1 if is_showing_details else 0

1 0