Author: atagar Date: 2011-03-28 16:20:25 +0000 (Mon, 28 Mar 2011) New Revision: 24491 Modified: arm/trunk/armrc.sample arm/trunk/src/interface/connections/connPanel.py Log: Config option to toggle application resolution for SOCKS and CONTROL connections. Modified: arm/trunk/armrc.sample =================================================================== --- arm/trunk/armrc.sample 2011-03-28 16:10:51 UTC (rev 24490) +++ arm/trunk/armrc.sample 2011-03-28 16:20:25 UTC (rev 24491) @@ -175,6 +175,9 @@ # connection resolution rate then reducing this won't casue new data to # appear more frequently - just increase the rate at which the uptime field # is updated) +# resolveApps +# issues lsof queries to determining the applications involved in local +# SOCKS and CONTROL connections # markInitialConnections # if true, the uptime of the initial connections when we start are marked # with a '+' (these uptimes are estimates since arm can only track a @@ -189,6 +192,7 @@ features.connection.listingType 0 features.connection.order 0, 2, 1 features.connection.refreshRate 5 +features.connection.resolveApps true features.connection.markInitialConnections true features.connection.showExitPort true features.connection.showColumn.fingerprint true Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-03-28 16:10:51 UTC (rev 24490) +++ arm/trunk/src/interface/connections/connPanel.py 2011-03-28 16:20:25 UTC (rev 24491) @@ -9,7 +9,8 @@ from interface.connections import entries, connEntry, circEntry from util import connections, enum, panel, torTools, uiTools -DEFAULT_CONFIG = {"features.connection.listingType": 0, +DEFAULT_CONFIG = {"features.connection.resolveApps": True, + "features.connection.listingType": 0, "features.connection.refreshRate": 5} # height of the detail panel content, not counting top and bottom border @@ -332,7 +333,7 @@ until the next update if true """ - if self.appResolveSinceUpdate: return + if self.appResolveSinceUpdate or not self._config["features.connection.resolveApps"]: return # fetch the unresolved SOCKS and CONTROL lines unresolvedLines = []