August 2011 - tor-commits - lists.torproject.org

[tor/master] Ignore deprecation warnings on OS X
by nickm＠torproject.org 11 Aug '11

11 Aug '11

commit 92bea30e28f62ea4c5d335420e2a328ff64598bc Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Aug 10 19:22:41 2011 +0200 Ignore deprecation warnings on OS X Starting with Lion, Apple decided to deprecate the system openssl. We can start requiring users to install their own openssl once OS X doesn't ship with it anymore. --- changes/bug3643 | 4 ++++ configure.in | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/changes/bug3643 b/changes/bug3643 new file mode 100644 index 0000000..86bd920 --- /dev/null +++ b/changes/bug3643 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Selectively disable deprecation warnings on OS X because Lion started + deprecating the shipped copy of openssl. Fixes bug 3643. + diff --git a/configure.in b/configure.in index aa2233d..4e84298 100644 --- a/configure.in +++ b/configure.in @@ -906,6 +906,15 @@ else enable_gcc_warnings_advisory=no fi +# OS X Lion started deprecating the system openssl. Let's just disable +# all deprecation warnings on OS X. +case "$host_os" in + + darwin*) + CFLAGS="$CFLAGS -Wno-deprecated-declarations" + ;; +esac + # Add some more warnings which we use in development but not in the # released versions. (Some relevant gcc versions can't handle these.) if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xyes; then

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 11 Aug '11

11 Aug '11

commit 8c643b51bfa18a82d6424a7b8917f7fbe96feb6e Merge: 5da9f72 92bea30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 11 11:53:03 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3643 | 4 ++++ configure.in | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] Ignore deprecation warnings on OS X
by nickm＠torproject.org 11 Aug '11

11 Aug '11

commit 92bea30e28f62ea4c5d335420e2a328ff64598bc Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Aug 10 19:22:41 2011 +0200 Ignore deprecation warnings on OS X Starting with Lion, Apple decided to deprecate the system openssl. We can start requiring users to install their own openssl once OS X doesn't ship with it anymore. --- changes/bug3643 | 4 ++++ configure.in | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/changes/bug3643 b/changes/bug3643 new file mode 100644 index 0000000..86bd920 --- /dev/null +++ b/changes/bug3643 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Selectively disable deprecation warnings on OS X because Lion started + deprecating the shipped copy of openssl. Fixes bug 3643. + diff --git a/configure.in b/configure.in index aa2233d..4e84298 100644 --- a/configure.in +++ b/configure.in @@ -906,6 +906,15 @@ else enable_gcc_warnings_advisory=no fi +# OS X Lion started deprecating the system openssl. Let's just disable +# all deprecation warnings on OS X. +case "$host_os" in + + darwin*) + CFLAGS="$CFLAGS -Wno-deprecated-declarations" + ;; +esac + # Add some more warnings which we use in development but not in the # released versions. (Some relevant gcc versions can't handle these.) if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xyes; then

1 0

[arm/master] Support TimeInterval confs.
by atagar＠torproject.org 11 Aug '11

11 Aug '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/master] Use the RouterList dialog for CommaList as well.
by atagar＠torproject.org 11 Aug '11

11 Aug '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/master] Minor fix for time units.
by atagar＠torproject.org 11 Aug '11

11 Aug '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/master] Use CSVs for RouterList values.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit eccb84e2494dc2b31aeea8ee33053368d0763d71 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 31 15:47:30 2011 +0500 Use CSVs for RouterList values. --- src/gui/configPanel.py | 8 +++++--- src/util/gtkTools.py | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 1b57341..adcdcec 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -34,9 +34,9 @@ def input_conf_value_int(option, oldValue): prompt = "Enter value for %s" % option return gtkTools.input_int(prompt, oldValue) -def input_conf_value_list(option, oldValue): +def input_conf_value_list(option, oldValue, csv=False): prompt = "Enter value for %s" % option - return gtkTools.input_list(prompt, oldValue) + return gtkTools.input_list(prompt, oldValue, csv) def input_conf_value_string(option, oldValue): prompt = "Enter value for %s" % option @@ -138,7 +138,9 @@ class ConfigPanel(object, CliConfigPanel): elif configType == 'String': newValue = input_conf_value_string(configOption, oldValue) elif configType == 'LineList': - newValue = input_conf_value_list(configOption, oldValue) + newValue = input_conf_value_list(configOption, oldValue, csv=False) + elif configType == 'RouterList': + newValue = input_conf_value_list(configOption, oldValue, csv=True) elif configType == 'Boolean': newValue = input_conf_value_bool(configOption, oldValue) elif configType == 'Filename': diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 8e8b985..2960188 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -214,7 +214,7 @@ def input_time(prompt, default=None): return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None -def input_int(prompt, default=None): +def input_int(prompt, default=None, csvResponse=False): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, @@ -268,7 +268,7 @@ def input_string(prompt, default=None): return text if response == gtk.RESPONSE_OK else None -def input_list(prompt, default): +def input_list(prompt, default, csv=False): def on_add_button_clicked(widget, listStore): newValue = input_string("Enter new value:") @@ -321,8 +321,9 @@ def input_list(prompt, default): addButton.connect('clicked', on_add_button_clicked, listStore) deleteButton.connect('clicked', on_delete_button_clicked, treeView) + separator = "," if csv else " " if default: - for value in default.split(): + for value in default.split(separator): row = (value,) listStore.append(row) @@ -334,7 +335,7 @@ def input_list(prompt, default): if not response == gtk.RESPONSE_OK: return - return None if len(listStore) == 0 else " ".join([row[0] for row in listStore]) + return None if len(listStore) == 0 else separator.join([row[0] for row in listStore]) def input_bool(prompt, default=None): dialog = gtk.MessageDialog(None,

1 0

[arm/master] Merge commit 'krkhan/master'
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit de4b51a73316a0a4d366a9cab38707ccffa56cf0 Merge: ee6721e 5fff0b1 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 11 08:24:08 2011 -0700 Merge commit 'krkhan/master' src/gui/arm.xml | 169 +++++++++++---- src/gui/configPanel.py | 161 ++++++++++++++ src/gui/connections/circEntry.py | 37 ++-- src/gui/connections/connEntry.py | 48 ++--- src/gui/connections/connPanel.py | 134 +++++------- src/gui/controller.py | 32 ++-- src/gui/generalPanel.py | 25 +-- src/gui/graphing/__init__.py | 2 +- src/gui/graphing/bandwidthStats.py | 12 +- src/gui/graphing/graphPanel.py | 144 +++++++++++++ src/gui/graphing/graphStats.py | 142 ------------- src/gui/logPanel.py | 26 ++-- src/starter.py | 2 +- src/util/gtkTools.py | 405 ++++++++++++++++++++++++++++++++++++ 14 files changed, 979 insertions(+), 360 deletions(-)

1 0

[arm/master] Show all options for testing.
by atagar＠torproject.org 11 Aug '11

11 Aug '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/master] Implement config value edits for string values.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit e98ab90082947021af9ca4ae7416b35b5e6f1bee Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 27 05:54:16 2011 +0500 Implement config value edits for string values. Catches TorCtl exceptions and shows them in an error dialog. --- src/gui/configPanel.py | 29 +++++++++++++++++++++++++++-- src/util/gtkTools.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 433d612..a1d1daa 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,6 +13,10 @@ from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl +def inputConfValueText(option): + prompt = "Enter value for %s" % option + return gtkTools.inputText(prompt) + class ConfContents(gtkTools.ListWrapper): def _create_row_from_value(self, entry): option = entry.get(Field.OPTION) @@ -50,10 +54,12 @@ class ConfigPanel(object, CliConfigPanel): def pack_widgets(self): treeView = self.builder.get_object('treeview_config') + treeView.connect('cursor-changed', self.on_treeview_config_cursor_changed) + treeView.connect('row-activated', self.on_treeview_config_row_activated) - def on_treeview_config_cursor_changed(self, widget, data=None): - treeSelection = widget.get_selection() + def on_treeview_config_cursor_changed(self, treeView, data=None): + treeSelection = treeView.get_selection() (model, iter) = treeSelection.get_selected() desc = model.get_value(iter, 4) @@ -61,3 +67,22 @@ class ConfigPanel(object, CliConfigPanel): textBuffer = self.builder.get_object('textbuffer_config_desc') textBuffer.set_text(desc) + def on_treeview_config_row_activated(self, treeView, path, column): + (index,) = path + + entry = self._wrappedConfImportantContents[index] + configOption = entry.fields[Field.OPTION] + configType = entry.fields[Field.TYPE] + newValue = None + + if configType == 'DataSize': + newValue = inputConfValueText(configOption) + + if newValue: + try: + torTools.getConn().setOption(configOption, newValue) + except TorCtl.ErrorReply, err: + gtkTools.showError(str(err)) + + self._wrappedConfImportantContents[index] = entry + diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index c1b14dd..5180e82 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -100,3 +100,38 @@ class TreeWrapper(ListWrapper): row = self._create_row_from_value(value) self.model.append(None, row) +def responseToDialog(entry, dialog, response): + dialog.response(response) + +def inputText(prompt): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, + None) + + dialog.set_markup(prompt) + + entry = gtk.Entry() + entry.connect("activate", responseToDialog, dialog, gtk.RESPONSE_OK) + + dialog.vbox.pack_end(entry, True, True, 0) + + dialog.show_all() + response = dialog.run() + + text = entry.get_text() + dialog.destroy() + + return text if response == gtk.RESPONSE_OK else None + +def showError(msg): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_ERROR, + gtk.BUTTONS_OK, + msg) + + dialog.run() + dialog.destroy() +

1 0