commit e79ac1f3210cd337e51537da0fca3895fc752e56 Author: Damian Johnson atagar@torproject.org Date: Sat Sep 5 14:41:00 2015 -0700
Drop features.connection.showExitPort
I've never known of this information to be sensitive, so lets just drop this. We can add it back if someone wants it. --- nyx/connections/conn_entry.py | 9 ++------- nyxrc.sample | 3 --- 2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py index 3ed78a9..df36dd8 100644 --- a/nyx/connections/conn_entry.py +++ b/nyx/connections/conn_entry.py @@ -28,7 +28,6 @@ LABEL_MIN_PADDING = 2 # min space between listing label and following data
CONFIG = conf.config_dict('nyx', { 'features.connection.showIps': True, - 'features.connection.showExitPort': True, })
@@ -413,14 +412,10 @@ class ConnectionLine(object): include_locale - possibly includes the locale """
- # the port and port derived data can be hidden by config or without include_port - - include_port = self.include_port and (CONFIG['features.connection.showExitPort'] or self._entry.get_type() != Category.EXIT) - # destination of the connection
address_label = '<scrubbed>' if self._entry.is_private() else self.connection.remote_address - port_label = ':%s' % self.connection.remote_port if include_port else '' + port_label = ':%s' % self.connection.remote_port destination_address = address_label + port_label
# Only append the extra info if there's at least a couple characters of @@ -429,7 +424,7 @@ class ConnectionLine(object): if len(destination_address) + 5 <= max_length: space_available = max_length - len(destination_address) - 3
- if self._entry.get_type() == Category.EXIT and include_port: + if self._entry.get_type() == Category.EXIT: purpose = connection.port_usage(self.connection.remote_port)
if purpose: diff --git a/nyxrc.sample b/nyxrc.sample index d922081..a93ff3b 100644 --- a/nyxrc.sample +++ b/nyxrc.sample @@ -203,14 +203,11 @@ features.graph.bw.accounting.show true # showIps # shows ip addresses for other tor relays, dropping this information if # false -# showExitPort -# shows port related information of exit connections we relay if true
features.connection.listingType IP_ADDRESS features.connection.order CATEGORY, LISTING, UPTIME features.connection.resolveApps true features.connection.showIps true -features.connection.showExitPort true
# Caching parameters cache.logPanel.size 1000