tor-commits April 2011

tor-commits@lists.torproject.org

18 participants
883 discussions

[arm/master] Merge release commit '8b8568e'
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8b4d9f13e50f6a420b1000c70de25bf244db393a Merge: 6534807 8b8568e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:42:15 2011 -0700 Merge release commit '8b8568e' Conflicts: src/version.py setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[arm/master] Better commenting for new controller option usage
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 1ff5c3d8307a38485f850ba4936d4ab2e16bed7d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 19:18:50 2011 -0700 Better commenting for new controller option usage --- src/util/torTools.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 5e77f2e..b5913ed 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1626,6 +1626,12 @@ class Controller(TorCtl.PostEventListener): lookups if true """ + # Several controller options were added in ticket 2291... + # https://trac.torproject.org/projects/tor/ticket/2291 + # which is only available with newer tor versions (tested them against + # Tor v0.2.3.0-alpha-dev). When using these options we need to be + # especially careful to have good fallback logic. + currentVal = self._cachedParam.get(key) if currentVal != None: if currentVal == UNKNOWN: return default @@ -1697,8 +1703,7 @@ class Controller(TorCtl.PostEventListener): if not result: result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) elif key == "user": - # This was added in Tor 0.2.3.x-final so it's quite likely unavailable. - # Even if it is, it might fail and return an empty string. + # provides the empty string if the query fails queriedUser = self.getInfo("process/user") if queriedUser != None and queriedUser != "": @@ -1721,9 +1726,7 @@ class Controller(TorCtl.PostEventListener): psResults = sysTools.call("ps -o user %s" % myPid) if psResults and len(psResults) >= 2: result = psResults[1].strip() elif key == "fdLimit": - # This was added in Tor 0.2.3.x-final so it's quite likely unavailable. - # Even if it is, it might fail and return -1. - + # provides -1 if the query fails queriedLimit = self.getInfo("process/descriptor-limit") if queriedLimit != None and queriedLimit != "-1":

1 0

[arm/master] Fetching pid with 'GETINFO process/pid' if able
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit a1271d49f14f8d63e983043e677c92ba15fa9c9b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 19:12:34 2011 -0700 Fetching pid with 'GETINFO process/pid' if able This is a new controller option added in ticket 2291 (https://trac.torproject.org/projects/tor/ticket/2291). This was tested against Tor v0.2.3.0-alpha-dev by making sure we're making the getinfo call, and not using pgrep to resolve the pid. --- src/util/torTools.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 3ef66f2..5e77f2e 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1692,7 +1692,10 @@ class Controller(TorCtl.PostEventListener): elif key == "parsedVersion": result = parseVersion(self.getInfo("version", "")) elif key == "pid": - result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) + result = self.getInfo("process/pid") + + if not result: + result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) elif key == "user": # This was added in Tor 0.2.3.x-final so it's quite likely unavailable. # Even if it is, it might fail and return an empty string.

1 0

[arm/master] Ignoring vim temporary swap files
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit b38cd993ee6d717372f479329236a7ab0a019f79 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:22:17 2011 -0700 Ignoring vim temporary swap files --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 9b955dd..6377435 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.pyc src/TorCtl/ +*.swp

1 0

[arm/master] Dropping optional total prepopulation state file
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 4f3f7cfd957bc55f956e21e8af82888a24ec7ff4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:30:41 2011 -0700 Dropping optional total prepopulation state file The total value provided by the 'features.graph.bw.prepopulateTotal' config option was confusing, pointless, and conflicted with the new functionality we have to fetch the true totals from Tor. --- src/interface/graphing/bandwidthStats.py | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py index 3f34e3c..70a1e16 100644 --- a/src/interface/graphing/bandwidthStats.py +++ b/src/interface/graphing/bandwidthStats.py @@ -20,8 +20,7 @@ ACCOUNTING_ARGS = ("status", "resetTime", "read", "written", "readLimit", "writt PREPOPULATE_SUCCESS_MSG = "Read the last day of bandwidth history from the state file" PREPOPULATE_FAILURE_MSG = "Unable to prepopulate bandwidth information (%s)" -DEFAULT_CONFIG = {"features.graph.bw.prepopulateTotal": False, - "features.graph.bw.transferInBytes": False, +DEFAULT_CONFIG = {"features.graph.bw.transferInBytes": False, "features.graph.bw.accounting.show": True, "features.graph.bw.accounting.rate": 10, "features.graph.bw.accounting.isTimeLong": False, @@ -347,10 +346,6 @@ class BandwidthStats(graphPanel.GraphStats): def _getTotalLabel(self, isPrimary): total = self.primaryTotal if isPrimary else self.secondaryTotal - - if self._config["features.graph.bw.prepopulateTotal"]: - total += self.prepopulatePrimaryTotal if isPrimary else self.prepopulateSecondaryTotal - return "total: %s" % uiTools.getSizeLabel(total * 1024, 1) def _updateAccountingInfo(self):

1 0

[arm/master] Separating inital BW totals into separate params
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit b4ea3bd612d54ff1e33c4b52d4982ccfc207d9fb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:34:31 2011 -0700 Separating inital BW totals into separate params Mixing the bandwidth totals fetched from Tor with the GraphStats param caused the average measurement to be skewed. Separating this total into a parameter just used for the total label. --- armrc.sample | 4 ---- src/interface/graphing/bandwidthStats.py | 14 +++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/armrc.sample b/armrc.sample index 11b62ea..4cda197 100644 --- a/armrc.sample +++ b/armrc.sample @@ -140,9 +140,6 @@ features.graph.showIntermediateBounds true # prepopulate # attempts to use tor's state file to prepopulate the bandwidth graph at the # 15-minute interval (this requires the minimum of a day's worth of uptime) -# prepopulateTotal -# populates the total stat from the state file if true (this only contains -# the last day's worth of information, so this metric isn't the true total) # transferInBystes # shows rate measurments in bytes if true, bits otherwise # accounting.show @@ -153,7 +150,6 @@ features.graph.showIntermediateBounds true # provides verbose measurements of time if true features.graph.bw.prepopulate true -features.graph.bw.prepopulateTotal false features.graph.bw.transferInBytes false features.graph.bw.accounting.show true features.graph.bw.accounting.rate 10 diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py index 70a1e16..f8e3020 100644 --- a/src/interface/graphing/bandwidthStats.py +++ b/src/interface/graphing/bandwidthStats.py @@ -60,19 +60,18 @@ class BandwidthStats(graphPanel.GraphStats): # https://trac.torproject.org/projects/tor/ticket/2345 # # further updates are still handled via BW events to avoid unnecessary - # GETINFO requests. This needs to update the pause buffer too because - # instances start paused, causing the primary value to be clobbered once - # just after initalization. + # GETINFO requests. + + self.initialPrimaryTotal = 0 + self.initialSecondaryTotal = 0 readTotal = conn.getInfo("traffic/read") if readTotal and readTotal.isdigit(): - self.primaryTotal = int(readTotal) / 1024 # Bytes -> KB - self._pauseBuffer.primaryTotal = int(readTotal) / 1024 + self.initialPrimaryTotal = int(readTotal) / 1024 # Bytes -> KB writeTotal = conn.getInfo("traffic/written") if writeTotal and writeTotal.isdigit(): - self.secondaryTotal = int(writeTotal) / 1024 # Bytes -> KB - self._pauseBuffer.secondaryTotal = int(writeTotal) / 1024 + self.initialSecondaryTotal = int(writeTotal) / 1024 # Bytes -> KB def resetListener(self, conn, eventType): # updates title parameters and accounting status if they changed @@ -346,6 +345,7 @@ class BandwidthStats(graphPanel.GraphStats): def _getTotalLabel(self, isPrimary): total = self.primaryTotal if isPrimary else self.secondaryTotal + total += self.initialPrimaryTotal if isPrimary else self.initialSecondaryTotal return "total: %s" % uiTools.getSizeLabel(total * 1024, 1) def _updateAccountingInfo(self):

1 0

[arm/master] Hotfix for r24613 (release 1.4.2.3)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 855ccf62986c1db2e1f0e42b5a1498a2c3d1f61a Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 13 14:58:56 2011 +0000 Hotfix for r24613 (release 1.4.2.3) svn:r24614 --- src/interface/connections/connEntry.py | 2 +- src/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/interface/connections/connEntry.py b/src/interface/connections/connEntry.py index 3f4ec6b..1c2543f 100644 --- a/src/interface/connections/connEntry.py +++ b/src/interface/connections/connEntry.py @@ -368,7 +368,7 @@ class ConnectionLine(entries.ConnectionPanelLine): # known relay then it might be client traffic conn = torTools.getConn() - if "Guard" in conn.getMyFlags() or conn.getOption("BridgeRelay") == "1": + if "Guard" in conn.getMyFlags([]) or conn.getOption("BridgeRelay") == "1": allMatches = conn.getRelayFingerprint(self.foreign.getIpAddr(), getAllMatches = True) return allMatches == [] elif myType == Category.EXIT: diff --git a/src/version.py b/src/version.py index 81a5d88..4c0bbc8 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2.2' -LAST_MODIFIED = "April 6, 2011" +VERSION = '1.4.2.3' +LAST_MODIFIED = "April 13, 2011"

1 0

[arm/master] Merge release commit 'bcb4729'
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 43656fe1228ecf1bdc0ffce792e32a98f14241ea Merge: d1d54c0 bcb4729 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 08:39:04 2011 -0700 Merge release commit 'bcb4729' Conflicts: ChangeLog setup.py src/version.py setup.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)

1 0

[arm/master] Another hotfix from Fabian (for decimal seconds in the uptime field of ps results)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit bb7c907e840b6e4ef6f9af671a763b4bc79df0ec Merge: 4794d92 623d26f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 13 03:11:36 2011 +0000 Another hotfix from Fabian (for decimal seconds in the uptime field of ps results) svn:r24075 src/util/uiTools.py | 6 ++---- src/version.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --cc src/version.py index ddd3748,f6e1269..cf86296 --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """ - VERSION = '1.4.1.1' - LAST_MODIFIED = "January 11, 2011" -VERSION = '1.4.1_dev' -LAST_MODIFIED = "January 7, 2011" ++VERSION = '1.4.1.2' ++LAST_MODIFIED = "January 12, 2011"

1 0

[arm/master] Hotfix for r24570.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8b498b39a4f48e44b3addce98a239438f131361a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 7 01:30:11 2011 +0000 Hotfix for r24570. svn:r24571 --- setup.py | 2 +- src/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 03caaa3..2176a1c 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,7 @@ setup(name='arm', author='Damian Johnson', author_email='atagar(a)torproject.org', url='http://www.atagar.com/arm/', - packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.util', 'arm.TorCtl'], + packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util', 'arm.TorCtl'], package_dir={'arm': 'src'}, data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), diff --git a/src/version.py b/src/version.py index ee7c493..81a5d88 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2.1' -LAST_MODIFIED = "April 4, 2011" +VERSION = '1.4.2.2' +LAST_MODIFIED = "April 6, 2011"

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2011