- tor-commits - lists.torproject.org

[arm/release] fix: pausing interface could cause crash
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 86325e6d124f0b2e5a4826938f2f493495fed9b7 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 28 11:25:07 2011 -0700 fix: pausing interface could cause crash Creating the pause buffer for the bandwidth graph could trigger a panel redraw, which in turn attempted to use the uninitialized pause value. --- src/cli/graphing/bandwidthStats.py | 11 ++++++++--- src/util/panel.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index f1891f9..654443c 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -35,7 +35,7 @@ class BandwidthStats(graphPanel.GraphStats): Uses tor BW events to generate bandwidth usage graph. """ - def __init__(self, config=None): + def __init__(self, config=None, isPauseBuffer=False): graphPanel.GraphStats.__init__(self) self.inputConfig = config @@ -56,7 +56,7 @@ class BandwidthStats(graphPanel.GraphStats): # rate/burst and if tor's using accounting conn = torTools.getConn() self._titleStats, self.isAccounting = [], False - self.resetListener(conn, torTools.State.INIT) # initializes values + if not isPauseBuffer: self.resetListener(conn, torTools.State.INIT) # initializes values conn.addStatusListener(self.resetListener) # Initialized the bandwidth totals to the values reported by Tor. This @@ -78,9 +78,14 @@ class BandwidthStats(graphPanel.GraphStats): self.initialSecondaryTotal = int(writeTotal) / 1024 # Bytes -> KB def clone(self, newCopy=None): - if not newCopy: newCopy = BandwidthStats(self.inputConfig) + if not newCopy: newCopy = BandwidthStats(self.inputConfig, True) newCopy.accountingLastUpdated = self.accountingLastUpdated newCopy.accountingInfo = self.accountingInfo + + # attributes that would have been initialized from calling the resetListener + newCopy.isAccounting = self.isAccounting + newCopy._titleStats = self._titleStats + return graphPanel.GraphStats.clone(self, newCopy) def resetListener(self, conn, eventType): diff --git a/src/util/panel.py b/src/util/panel.py index bb47726..732610c 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -186,7 +186,7 @@ class Panel(): """ if not attr in self.pauseAttr: return None - elif self.isPaused(): return self.pauseBuffer[attr] + elif self.paused: return self.pauseBuffer[attr] else: return self.__dict__.get(attr) def copyAttr(self, attr):

1 0

[arm/release] Support TimeInterval confs.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 051793007724ebbb2532cd8ac5532e2580cf8fd9 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 31 01:05:17 2011 +0500 Support TimeInterval confs. --- src/gui/configPanel.py | 6 +++++ src/util/gtkTools.py | 57 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 8f09f40..1b57341 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -26,6 +26,10 @@ def input_conf_value_size(option, oldValue): prompt = "Enter value for %s" % option return gtkTools.input_size(prompt, oldValue) +def input_conf_value_time(option, oldValue): + prompt = "Enter value for %s" % option + return gtkTools.input_time(prompt, oldValue) + def input_conf_value_int(option, oldValue): prompt = "Enter value for %s" % option return gtkTools.input_int(prompt, oldValue) @@ -127,6 +131,8 @@ class ConfigPanel(object, CliConfigPanel): if configType == 'DataSize': newValue = input_conf_value_size(configOption, oldValue) + elif configType == 'TimeInterval': + newValue = input_conf_value_time(configOption, oldValue) elif configType == 'Integer': newValue = input_conf_value_int(configOption, oldValue) elif configType == 'String': diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index b7cf082..56a5718 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -132,7 +132,6 @@ def input_size(prompt, default=None): comboBox.append_text("GB") comboBox.append_text("TB") comboBox.append_text("PB") - comboBox.set_active(0) hBox.pack_end(comboBox, False, False, 0) @@ -159,6 +158,62 @@ def input_size(prompt, default=None): return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None +def input_time(prompt, default=None): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, + None) + + dialog.set_markup(prompt) + + hBox = gtk.HBox() + + dialog.vbox.pack_end(hBox, True, True, 0) + + spinButton = gtk.SpinButton(None) + spinButton.connect('activate', response_to_dialog, dialog, gtk.RESPONSE_OK) + + spinButton.set_increments(1, 10) + spinButton.set_range(0, 1024) + + hBox.pack_start(spinButton, True, True, 0) + + comboBox = gtk.combo_box_new_text() + + comboBox.append_text("seconds") + comboBox.append_text("minutes") + comboBox.append_text("hours") + comboBox.append_text("days") + + hBox.pack_end(comboBox, False, False, 0) + + if default: + if default[:-1] != 's': + default = default + 's' + + value, units = default.split() + + spinButton.set_value(float(value)) + + model = comboBox.get_model() + modelUnits = [row[0] for row in model] + index = modelUnits.index(units) + comboBox.set_active(index) + + dialog.show_all() + response = dialog.run() + + value = spinButton.get_value_as_int() + + model = comboBox.get_model() + active = comboBox.get_active() + (units,) = model[active] + + dialog.destroy() + + return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None + def input_int(prompt, default=None): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,

1 0

[arm/release] Use the RouterList dialog for CommaList as well.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 5fff0b17e91282036fc0ffb86e6a1818237b9fa7 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Aug 1 05:12:29 2011 +0500 Use the RouterList dialog for CommaList as well. --- src/gui/configPanel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index e66f670..e7cc692 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -139,7 +139,7 @@ class ConfigPanel(object, CliConfigPanel): newValue = input_conf_value_string(configOption, oldValue) elif configType == 'LineList': newValue = input_conf_value_list(configOption, oldValue, csv=False) - elif configType == 'RouterList': + elif configType == 'RouterList' or configType == 'CommaList': newValue = input_conf_value_list(configOption, oldValue, csv=True) elif configType == 'Boolean': newValue = input_conf_value_bool(configOption, oldValue)

1 0

[arm/release] Minor fix for time units.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 4df31a62dbee86919d8834f84b958507e7112e46 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 31 01:07:03 2011 +0500 Minor fix for time units. --- src/util/gtkTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 56a5718..8e8b985 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -189,7 +189,7 @@ def input_time(prompt, default=None): hBox.pack_end(comboBox, False, False, 0) if default: - if default[:-1] != 's': + if default[-1:] != 's': default = default + 's' value, units = default.split()

1 0

[arm/release] Deduplicating common startup message
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 5ca794e25271a09054adb0c63b86d1398c52089c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 8 07:46:15 2011 -0700 Deduplicating common startup message Deduplication entry for the "Loading relay descriptors" notice messages. --- src/settings.cfg | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 9154ed5..0e8f9dd 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -279,6 +279,7 @@ config.summary.TestingEstimatedDescriptorPropagationTime Delay before clients at # [NOTICE] I learned some more directory information, but not enough to build a # circuit: We have only 469/2027 usable descriptors. # [NOTICE] Attempt by %s to open a stream from unknown relay. Closing. +# [NOTICE] Bootstrapped 72%: Loading relay descriptors. # [WARN] You specified a server "Amunet8" by name, but this name is not # registered # [WARN] I have no descriptor for the router named "Amunet8" in my declared @@ -314,6 +315,7 @@ msg.INFO rep_hist_downrate_old_runs(): Discounting all old stability info by a f msg.NOTICE We stalled too much while trying to write msg.NOTICE I learned some more directory information, but not enough to build a circuit msg.NOTICE Attempt by +msg.NOTICE *Loading relay descriptors. msg.WARN You specified a server msg.WARN I have no descriptor for the router named msg.WARN Controller gave us config lines that didn't validate

1 0

[arm/release] fix: GUARD event support
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit ce2ff76cc352309ac4450d6dc9f94e1db7da4983 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 3 09:01:48 2011 -0700 fix: GUARD event support The log panel wasn't receiving GUARD events, causing them to be silently dropped. Also doing better parsing for timestamp entries. --- src/cli/logPanel.py | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index bb47517..f39617d 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -533,7 +533,18 @@ class TorEventObserver(TorCtl.PostEventListener): self._notify(event, ", ".join(idlistStr)) def address_mapped_event(self, event): - self._notify(event, "%s, %s -> %s" % (event.when, event.from_addr, event.to_addr)) + whenLabel, gmtExpiryLabel = "", "" + + if event.when: + whenLabel = time.strftime("%H:%M %m/%d/%Y", event.when) + + # TODO: torctl is getting an 'error' and 'gmt_expiry' attribute so display + # those when they become available + # + #if event.gmt_expiry: + # gmtExpiryLabel = time.strftime("%H:%M %m/%d/%Y", event.gmt_expiry) + + self._notify(event, "%s, %s -> %s" % (whenLabel, event.from_addr, event.to_addr)) def ns_event(self, event): # NetworkStatus params: nickname, idhash, orhash, ip, orport (int), @@ -545,6 +556,10 @@ class TorEventObserver(TorCtl.PostEventListener): msg = ", ".join(["%s (%s)" % (ns.idhex, ns.nickname) for ns in event.nslist]) self._notify(event, "Listed (%i): %s" % (len(event.nslist), msg), "magenta") + def guard_event(self, event): + msg = "%s (%s), STATUS: %s" % (event.idhex, event.nick, event.status) + self._notify(event, msg, "yellow") + def unknown_event(self, event): msg = "(%s) %s" % (event.event_name, event.event_string) self.callback(LogEntry(event.arrived_at, "UNKNOWN", msg, "red"))

1 0

[arm/release] Show all options for testing.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 546ca73259d7863e3efe5e11e09c023c2790a2f6 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Aug 1 05:11:21 2011 +0500 Show all options for testing. --- src/gui/configPanel.py | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index adcdcec..e66f670 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -86,23 +86,23 @@ class ConfigPanel(object, CliConfigPanel): self.builder = builder listStore = self.builder.get_object('liststore_config') - self._wrappedConfImportantContents = ConfContents(self.confImportantContents, listStore) + self._wrappedConfContents = ConfContents(self.confContents, listStore) @property - def confImportantContents(self): - if hasattr(self, '_wrappedConfImportantContents'): - return self._wrappedConfImportantContents.container + def confContents(self): + if hasattr(self, '_wrappedConfContents'): + return self._wrappedConfContents.container else: return [] - @confImportantContents.setter - def confImportantContents(self, value): - if hasattr(self, '_wrappedConfImportantContents'): - self._wrappedConfImportantContents.empty() + @confContents.setter + def confContents(self, value): + if hasattr(self, '_wrappedConfContents'): + self._wrappedConfContents.empty() for entry in value: - self._wrappedConfImportantContents.append(entry) + self._wrappedConfContents.append(entry) else: - self._wrappedConfImportantContents = ConfContents(value) + self._wrappedConfContents = ConfContents(value) def pack_widgets(self): treeView = self.builder.get_object('treeview_config') @@ -122,7 +122,7 @@ class ConfigPanel(object, CliConfigPanel): def on_treeview_config_row_activated(self, treeView, path, column): (index,) = path - entry = self._wrappedConfImportantContents[index] + entry = self._wrappedConfContents[index] configOption = entry.get(Field.OPTION) configType = entry.get(Field.TYPE) argUsage = entry.get(Field.ARG_USAGE) @@ -157,5 +157,5 @@ class ConfigPanel(object, CliConfigPanel): except TorCtl.ErrorReply, err: gtkTools.showError(str(err)) - self._wrappedConfImportantContents[index] = entry + self._wrappedConfContents[index] = entry

1 0

[arm/release] fix: dropping nonexistent ORCONN attributes
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit eb4d0007a65a7cd10d50545dee90c56f6e998c31 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 2 07:39:03 2011 -0700 fix: dropping nonexistent ORCONN attributes The AGE, READ, and WRITTEN attributes of ORCONN don't exist so dropping them from the log panel. --- src/cli/logPanel.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 0b4ab9c..bb47517 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -515,9 +515,6 @@ class TorEventObserver(TorCtl.PostEventListener): def or_conn_status_event(self, event): msg = "STATUS: %-10s ENDPOINT: %-20s" % (event.status, event.endpoint) - if event.age: msg += " AGE: %-3s" % event.age - if event.read_bytes: msg += " READ: %-4i" % event.read_bytes - if event.wrote_bytes: msg += " WRITTEN: %-4i" % event.wrote_bytes if event.reason: msg += " REASON: %-6s" % event.reason if event.ncircs: msg += " NCIRCS: %i" % event.ncircs self._notify(event, msg)

1 0

[arm/release] fix: detecting for /var/lib/tor-arm
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 4f88292730be74ede753b2bdc9c1fdcbb9437106 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 6 16:14:07 2011 -0700 fix: detecting for /var/lib/tor-arm The '/var/lib/tor-arm' directory lack read permissions for the user we're running as, so checking for '/var/lib/tor-arm/torrc' always fails. This is just meant to determine if we're run the 'override.py --init' prep so detecting for the directory is fine. --- src/cli/wizard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 6d9d488..ff4e5cf 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -320,7 +320,7 @@ def showWizard(): # permissions then we aren't able to deal with the system wide tor instance. # Also drop the optoin if we aren't installed since override.py won't be at # the expected path. - if not os.path.exists(SYSTEM_DROP_PATH) or not os.path.exists(OVERRIDE_SCRIPT): + if not os.path.exists(os.path.dirname(SYSTEM_DROP_PATH)) or not os.path.exists(OVERRIDE_SCRIPT): disabledOpt.append(Options.SYSTEM) while True:

1 0

[arm/release] fix: misparsing sudo version string
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit d1c16ba280d925b7b0724e8c47dca959a46c19d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 6 16:24:46 2011 -0700 fix: misparsing sudo version string --- src/cli/wizard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index ff4e5cf..f0c14a8 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -417,7 +417,7 @@ def showWizard(): sudoVersionResult = sysTools.call("sudo -V") # version output looks like "Sudo version 1.7.2p7" - if len(sudoVersionResult) == 1 and sudoVersionResult.count(" ") >= 2: + if len(sudoVersionResult) == 1 and sudoVersionResult[0].count(" ") >= 2: versionNum = 0 for comp in sudoVersionResult[0].split(" ")[2].split("."):

1 0