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

[stem/master] Fixing circular import
by atagar＠torproject.org 21 Aug '12

21 Aug '12

commit fc736ff07c2ded068ee3e5b9ad1028923ee89c47 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 17 10:07:55 2012 -0700 Fixing circular import Correcting a circular import between the connection and control modules... >>> import test.prompt Traceback (most recent call last): File "<stdin>", line 1, in <module> File "test/prompt.py", line 15, in <module> import stem.control File "stem/control.py", line 48, in <module> import stem.connection File "stem/connection.py", line 106, in <module> def connect_port(control_addr = "127.0.0.1", control_port = 9051, password = None, chroot_path = None, controller = stem.control.Controller): AttributeError: 'module' object has no attribute 'control' --- stem/control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/stem/control.py b/stem/control.py index 0d7bb04..aca6f41 100644 --- a/stem/control.py +++ b/stem/control.py @@ -45,7 +45,6 @@ import time import Queue import threading -import stem.connection import stem.response import stem.socket import stem.version @@ -646,6 +645,7 @@ class Controller(BaseController): :raises: see :func:`stem.connection.authenticate` """ + import stem.connection stem.connection.authenticate(self, *args, **kwargs) def protocolinfo(self): @@ -659,6 +659,7 @@ class Controller(BaseController): * :class:`stem.socket.SocketError` if problems arise in establishing or using the socket """ + import stem.connection return stem.connection.get_protocolinfo(self) def get_conf(self, param, default = UNDEFINED, multiple = False):

1 0

[stem/master] Pydoc mistake
by atagar＠torproject.org 21 Aug '12

21 Aug '12

commit 9fe8da962aadec5d56bfeb6d6635a01228514ca2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 6 08:24:16 2012 -0700 Pydoc mistake Actually, I'm not sure what I was trying to say there. Issue spotted by Karsten. --- stem/descriptor/server_descriptor.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 759d6a5..6b0f2cf 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -70,8 +70,7 @@ SINGLE_FIELDS = ( def parse_file(descriptor_file, validate = True): """ - Iterates over the server descriptors in a file. This can only read relay or - descriptors. + Iterates over the server descriptors in a file. :param file descriptor_file: file with descriptor content :param bool validate: checks the validity of the descriptor's content if True, skips these checks otherwise

1 0

[stem/master] Caching and logging for GETCONF/SETCONF
by atagar＠torproject.org 21 Aug '12

21 Aug '12

commit c87b1005ad045b4554c3ed4c2ba6ce6e54aa81dc Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 6 10:04:40 2012 -0700 Caching and logging for GETCONF/SETCONF Caching and logging in a similar fashion to GETINFO. Remaining todo items... * This is broken if another controller tampers with our configuration values. We should listen for configuration change events to catch that. * Calling 'GETCONF blarg' causes an exception without a message. I should figure out why. --- stem/control.py | 90 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 70 insertions(+), 20 deletions(-) diff --git a/stem/control.py b/stem/control.py index 6fed090..0d7bb04 100644 --- a/stem/control.py +++ b/stem/control.py @@ -612,6 +612,8 @@ class Controller(BaseController): if is_geoip_request and self.is_caching_enabled() and self._geoip_failure_count != -1: self._geoip_failure_count += 1 + log.debug("GETINFO %s (failed: %s)" % (" ".join(params), exc)) + if default == UNDEFINED: raise exc else: return default @@ -694,7 +696,7 @@ class Controller(BaseController): entries = self.get_conf_map(param, default, multiple) return _case_insensitive_lookup(entries, param, default) - def get_conf_map(self, param, default = UNDEFINED, multiple = True): + def get_conf_map(self, params, default = UNDEFINED, multiple = True): """ Queries the control socket for the values of given configuration options and provides a mapping of the keys to the values. If provided a default @@ -720,7 +722,7 @@ class Controller(BaseController): provides so get_conf_map("HiddenServicePort") will give the same response as get_conf_map("HiddenServiceOptions"). - :param str,list param: configuration option(s) to be queried + :param str,list params: configuration option(s) to be queried :param object default: response if the query fails :param bool multiple: if True, the value(s) provided are lists of all returned values,otherwise this just provides the first value @@ -735,19 +737,44 @@ class Controller(BaseController): :class:`stem.socket.InvalidArguments` if the configuration option requested was invalid """ - if isinstance(param, str): - param = [param] + start_time = time.time() + reply = {} - try: - # remove strings which contain only whitespace - param = filter(lambda entry: entry.strip(), param) - if param == []: return {} + if isinstance(params, str): + params = [params] + + # remove strings which contain only whitespace + params = filter(lambda entry: entry.strip(), params) + if params == []: return {} + + # translate context sensitive options + lookup_params = set([MAPPED_CONFIG_KEYS.get(entry, entry) for entry in params]) + + # check for cached results + for param in list(lookup_params): + cache_key = "getconf.%s" % param.lower() - # translate context sensitive options - lookup_param = set([MAPPED_CONFIG_KEYS.get(entry, entry) for entry in param]) + if cache_key in self._request_cache: + reply[param] = self._request_cache[cache_key] + lookup_params.remove(param) + + # if everything was cached then short circuit making the query + if not lookup_params: + log.debug("GETCONF %s (cache fetch)" % " ".join(reply.keys())) - response = self.msg("GETCONF %s" % ' '.join(lookup_param)) + if multiple: + return reply + else: + return dict([(entry[0], entry[1][0]) for entry in reply.items()]) + + try: + response = self.msg("GETCONF %s" % ' '.join(lookup_params)) stem.response.convert("GETCONF", response) + reply.update(response.entries) + + if self.is_caching_enabled(): + for key, value in response.entries.items(): + self._request_cache["getconf.%s" % key.lower()] = value # Maps the entries back to the parameters that the user requested so the # capitalization matches (ie, if they request "exitpolicy" then that @@ -759,19 +786,23 @@ class Controller(BaseController): # entries since the user didn't request those by their key, so we can't # be sure what they wanted. - for key in response.entries: + for key in reply: if not key.lower() in MAPPED_CONFIG_KEYS.values(): - user_expected_key = _case_insensitive_lookup(param, key, key) + user_expected_key = _case_insensitive_lookup(params, key, key) if key != user_expected_key: - response.entries[user_expected_key] = response.entries[key] - del response.entries[key] + reply[user_expected_key] = reply[key] + del reply[key] + + log.debug("GETCONF %s (runtime: %0.4f)" % (" ".join(lookup_params), time.time() - start_time)) if multiple: - return response.entries + return reply else: - return dict([(entry[0], entry[1][0]) for entry in response.entries.items()]) + return dict([(entry[0], entry[1][0]) for entry in reply.items()]) except stem.socket.ControllerError, exc: + log.debug("GETCONF %s (failed: %s)" % (" ".join(lookup_params), exc)) + if default != UNDEFINED: return default else: raise exc @@ -820,7 +851,7 @@ class Controller(BaseController): :: my_controller.set_options({ - "Nickname", "caerSidi", + "Nickname": "caerSidi", "ExitPolicy": ["accept *:80", "accept *:443", "reject *:*"], "ContactInfo": "caerSidi-exit(a)someplace.com", "Log": None, @@ -839,6 +870,8 @@ class Controller(BaseController): :class:`stem.socket.InvalidRequest` if the configuration setting is impossible or if there's a syntax error in the configuration values """ + start_time = time.time() + # constructs the SETCONF or RESETCONF query query_comp = ["RESETCONF" if reset else "SETCONF"] @@ -853,10 +886,27 @@ class Controller(BaseController): else: query_comp.append(param) - response = self.msg(" ".join(query_comp)) + query = " ".join(query_comp) + response = self.msg(query) stem.response.convert("SINGLELINE", response) - if not response.is_ok(): + if response.is_ok(): + log.debug("%s (runtime: %0.4f)" % (query, time.time() - start_time)) + + if self.is_caching_enabled(): + for param, value in params: + cache_key = "getconf.%s" % param.lower() + + if value is None: + if cache_key in self._request_cache: + del self._request_cache[cache_key] + elif isinstance(value, str): + self._request_cache[cache_key] = [value] + else: + self._request_cache[cache_key] = value + else: + log.debug("%s (failed, code: %s, message: %s)" % (query, response.code, response.message)) + if response.code == "552": if response.message.startswith("Unrecognized option: Unknown option '"): key = response.message[37:response.message.find("\'", 37)]

1 0

[stem/master] Adding an easy method for getting a controller instance
by atagar＠torproject.org 21 Aug '12

21 Aug '12

commit f999b627dc3ab00cdd7c245d4811ad7b0a2cc20c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 18 11:21:08 2012 -0700 Adding an easy method for getting a controller instance Adding a 'prompt' script that kicks off a python interpretor with a readily available stem.control.Controller instance. This starts a tor test instance if it isn't already running and offers to shut it down when done. The purpose of this script is to make it easy to get a controller instance we can exercise. The sh shebang makes this *nix specific, though I suppose windows users can still use it by running 'bash prompt'. Example usage: atagar@morrigan:~/Desktop/stem$ ./prompt Welcome to stem's testing prompt. You currently have a controller available via the 'control' variable. >>> control.get_info('version') '0.2.1.30' >>> quit() Would you like to stop the tor instance we made? (y/n, default: n): y --- prompt | 19 +++++++++++ test/__init__.py | 1 + test/prompt.py | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 0 deletions(-) diff --git a/prompt b/prompt new file mode 100755 index 0000000..e833fd2 --- /dev/null +++ b/prompt @@ -0,0 +1,19 @@ +#!/bin/sh +# +# Provides a quick method of getting a controller that we can use to test stem +# with. This starts tor if it isn't already running and provides us with a +# controller instance. When done it gives us the option to stop the tor. +# +# atagar@morrigan:~/Desktop/stem$ ./prompt +# Welcome to stem's testing prompt. You currently have a controller available +# via the 'control' variable. +# +# >>> control.get_info("version") +# '0.2.1.30' +# >>> quit() +# +# Would you like to stop the tor instance we made? (y/n, default: n): y + +python -i -c "import test.prompt; test.prompt.print_usage(); control = test.prompt.controller()" +python -c "import test.prompt; test.prompt.stop(True)" + diff --git a/test/__init__.py b/test/__init__.py index c0297aa..78d6543 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -6,6 +6,7 @@ __all__ = [ "check_whitespace", "mocking", "output", + "prompt", "runner", ] diff --git a/test/prompt.py b/test/prompt.py new file mode 100644 index 0000000..eccdbec --- /dev/null +++ b/test/prompt.py @@ -0,0 +1,89 @@ +""" +Simple helper methods to make troubleshooting with the python interpretor +easier. + +:: + + >>> from test.prompt import * + >>> control = controller() + >>> control.get_info("version") + '0.2.1.30' + + >>> is_running() + True + + >>> stop() +""" + +import os +import signal + +import stem.control +import stem.process +import stem.util.system + +CONTROL_PORT = 2779 + +STOP_CONFIRMATION = "Would you like to stop the tor instance we made? (y/n, default: n): " + +def print_usage(): + """ + Provides a welcoming message. + """ + + print "Welcome to stem's testing prompt. You currently have a controller available" + print "via the 'control' variable." + print + +def start(): + """ + Starts up a tor instance that we can attach a contorller to. + """ + + tor_config = { + 'SocksPort': '0', + 'ControlPort': str(CONTROL_PORT), + 'ExitPolicy': 'reject *:*', + } + + stem.process.launch_tor_with_config(config = tor_config, completion_percent = 5) + +def stop(prompt = False): + """ + Stops the tor instance spawned by this module. + + :param bool prompt: asks user for confirmation that they would like to stop tor if True + """ + + tor_pid = stem.util.system.get_pid_by_port(CONTROL_PORT) + + if tor_pid: + if prompt: + print + response = raw_input(STOP_CONFIRMATION) + if not response.lower() in ("y", "yes"): return + + os.kill(tor_pid, signal.SIGTERM) + +def is_running(): + """ + Checks if we're likely running a tor instance spawned by this module. This is + simply a check if our custom control port is in use, so it can be confused by + other applications (not likely, but possable). + + :returns: True if the control port is used, False otherwise + """ + + return bool(stem.util.system.get_pid_by_port(CONTROL_PORT)) + +def controller(): + """ + Provides a Controller for our tor instance. This starts tor if it isn't + already running. + """ + + if not is_running(): start() + control = stem.control.Controller.from_port(control_port = CONTROL_PORT) + control.authenticate() + return control +

1 0

[stem/master] Fixing issues spotted by Ravi
by atagar＠torproject.org 21 Aug '12

21 Aug '12

commit 683eeb25e812346cfd01790fe7729b686b8a2c2c Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 21 18:10:30 2012 -0700 Fixing issues spotted by Ravi Typos and whitespace issues spotted by Ravi. --- test/prompt.py | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/prompt.py b/test/prompt.py index eccdbec..fad9d4e 100644 --- a/test/prompt.py +++ b/test/prompt.py @@ -8,10 +8,10 @@ easier. >>> control = controller() >>> control.get_info("version") '0.2.1.30' - + >>> is_running() True - + >>> stop() """ @@ -37,7 +37,7 @@ def print_usage(): def start(): """ - Starts up a tor instance that we can attach a contorller to. + Starts up a tor instance that we can attach a controller to. """ tor_config = { @@ -59,10 +59,9 @@ def stop(prompt = False): if tor_pid: if prompt: - print - response = raw_input(STOP_CONFIRMATION) + response = raw_input("\n" + STOP_CONFIRMATION) if not response.lower() in ("y", "yes"): return - + os.kill(tor_pid, signal.SIGTERM) def is_running():

1 0

[stem/master] Caching expansion and test prompt
by atagar＠torproject.org 21 Aug '12

21 Aug '12

commit 92a0bf0d6afe39db45108626d2e89cde70997a2a Merge: ac5be8c 683eeb2 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 21 18:11:11 2012 -0700 Caching expansion and test prompt I was planning to simply add caching for GETCONF and SETCONF requests, but ended up making a few other changes on the way. The most prominent is a new 'prompt' script that you can use to quickly get python interpretor with a controller instance. Handy for testing. cr neena (https://trac.torproject.org/6631) prompt | 19 ++++++ stem/control.py | 107 +++++++++++++++++++++++++++------- stem/descriptor/server_descriptor.py | 3 +- stem/socket.py | 2 +- stem/util/connection.py | 2 + test/__init__.py | 1 + test/prompt.py | 88 ++++++++++++++++++++++++++++ 7 files changed, 197 insertions(+), 25 deletions(-)

1 0

[stem/master] Setting string attribute of OperationFailed
by atagar＠torproject.org 21 Aug '12

21 Aug '12

commit 75d7f077e4b23361bc163171a4ec38b137f019ee Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 18 11:36:38 2012 -0700 Setting string attribute of OperationFailed All OperationFailed subclasses had an empty string attribute, making stack traces pretty unhelpful. Before: >>> control.get_info('blarg') Traceback (most recent call last): File "<stdin>", line 1, in <module> File "stem/control.py", line 622, in get_info if default == UNDEFINED: raise exc stem.socket.InvalidArguments After: >>> control.get_info('blarg') Traceback (most recent call last): File "<stdin>", line 1, in <module> File "stem/control.py", line 622, in get_info if default == UNDEFINED: raise exc stem.socket.InvalidArguments: GETINFO request contained unrecognized keywords: blarg --- stem/socket.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index 5492e30..e76e841 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -570,7 +570,7 @@ class OperationFailed(ControllerError): :returns: object of OperationFailed class """ - super(ControllerError, self).__init__() + super(ControllerError, self).__init__(message) self.code = code self.message = message

1 0

[vidalia/alpha] Add changes file
by chiiph＠torproject.org 21 Aug '12

21 Aug '12

commit b4fae567313de6b99fe60843f98bac7f56bcfd88 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Aug 21 20:36:36 2012 -0300 Add changes file Also fix file description --- changes/transportsServer | 3 +++ src/vidalia/config/TransportSettings.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/transportsServer b/changes/transportsServer new file mode 100644 index 0000000..79404b3 --- /dev/null +++ b/changes/transportsServer @@ -0,0 +1,3 @@ + New features: + o Add the capabilities to configure a bridge with pluggable transports. + Resolves ticket 6412. diff --git a/src/vidalia/config/TransportSettings.cpp b/src/vidalia/config/TransportSettings.cpp index 748e77e..ce90f6f 100644 --- a/src/vidalia/config/TransportSettings.cpp +++ b/src/vidalia/config/TransportSettings.cpp @@ -10,7 +10,7 @@ /* ** \file TransportSettings.cpp -** \brief General Vidalia settings, such as language and interface style +** \brief Pluggable transport settings */ #include "TransportSettings.h"

1 0

[vidalia/alpha] Configure bridge with transport support
by chiiph＠torproject.org 21 Aug '12

21 Aug '12

commit 1fb2a4c79ff55a35cc6405a6cb0edc6646557a20 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Aug 14 20:46:00 2012 -0300 Configure bridge with transport support --- src/vidalia/CMakeLists.txt | 2 + src/vidalia/config/ServerPage.cpp | 68 ++++++++++++++++++++++++++ src/vidalia/config/ServerPage.h | 10 ++++ src/vidalia/config/ServerPage.ui | 76 +++++++++++++++++++++++------ src/vidalia/config/TransportSettings.cpp | 36 ++++++++++++++ src/vidalia/config/TransportSettings.h | 39 +++++++++++++++ 6 files changed, 215 insertions(+), 16 deletions(-) diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index c46a97b..b458752 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -143,6 +143,7 @@ set(vidalia_SRCS ${vidalia_SRCS} config/VSettings.cpp config/torrc/TorrcParser.cpp config/torrc/Torrc.cpp + config/TransportSettings.cpp ) qt4_wrap_cpp(vidalia_SRCS config/AbstractTorSettings.h @@ -166,6 +167,7 @@ qt4_wrap_cpp(vidalia_SRCS config/VidaliaSettings.h config/VSettings.h config/torrc/Torrc.h + config/TransportSettings.h ) if (USE_MINIUPNPC) include_directories(${MINIUPNPC_INCLUDE_DIR}) diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp index 31660a4..35d3955 100644 --- a/src/vidalia/config/ServerPage.cpp +++ b/src/vidalia/config/ServerPage.cpp @@ -23,6 +23,7 @@ #include "DomainValidator.h" #include "NicknameValidator.h" #include "BridgeUsageDialog.h" +#include "TransportSettings.h" #include "html.h" #include "stringutil.h" @@ -243,6 +244,27 @@ ServerPage::serverModeChanged(bool enabled) ui.lblBridgeUsage->setVisible(bridgeEnabled && Vidalia::torControl()->isConnected()); + TransportSettings transports; + ui.transportsFrame->setVisible(enabled && bridgeEnabled && transports.getTransports().size() > 0); + + if (ui.transportsFrame->isVisible()) { + QStringList transportList = transports.getTransports(); + foreach(QString transport, transportList) { + QCheckBox *chkTransport = new QCheckBox(transport); + ui.transportsFrame->layout()->addWidget(chkTransport); + _transportChecks.insert(transport, chkTransport); + } + loadTransports(); + } else { + while(ui.transportsFrame->layout()->count() > 2) { + ui.transportsFrame->layout()->takeAt(ui.transportsFrame->layout()->count() - 1); + } + foreach(QCheckBox *chk, _transportChecks) { + chk->deleteLater(); + } + _transportChecks.clear(); + } + if(bridgeEnabled) { if(ui.lineDirPort->text().length() != 0) { _tmpDirPort = ui.lineDirPort->text(); @@ -363,6 +385,8 @@ ServerPage::save(QString &errmsg) _settings->setUpnpEnabled(ui.chkEnableUpnp->isChecked()); #endif + saveTransports(); + return true; } @@ -756,3 +780,47 @@ ServerPage::toggleDisplayDay(const QString &str) else ui.spnDay->setMaximum(7); } + +void +ServerPage::loadTransports() +{ + disconnect(ui.chkEnableTransports, 0, 0, 0); + connect(ui.chkEnableTransports, SIGNAL(stateChanged(int)), this, SLOT(toggleTransports(int))); + QStringList stps = Vidalia::torrc()->value("ServerTransportPlugin"); + ui.chkEnableTransports->setCheckState(stps.size() > 0 ? Qt::Checked : Qt::Unchecked); + toggleTransports(stps.size() > 0 ? Qt::Checked : Qt::Unchecked); + foreach (QString stp, stps) { + QString transport = stp.split(" ").at(0); + if (_transportChecks.count(transport) > 0) { + _transportChecks[transport]->setChecked(true); + } else { + vWarn("Unsupported transport: %1").arg(transport); + } + } +} + +void +ServerPage::saveTransports() +{ + bool bridgeEnabled = ui.rdoBridgeMode->isChecked(); + TransportSettings transports; + + if (bridgeEnabled) { + Vidalia::torrc()->clear(QStringList() << "ServerTransportPlugin"); + foreach(QString key, _transportChecks.keys()) { + if (_transportChecks[key]->isChecked()) { + Vidalia::torrc()->setValue("ServerTransportPlugin", QString("%1 %2").arg(key).arg(transports.getSTP(key))); + } + } + } +} + +void +ServerPage::toggleTransports(int state) +{ + foreach(QCheckBox *chk, _transportChecks) { + chk->setEnabled(state == Qt::Checked); + chk->setChecked(false); + } +} + diff --git a/src/vidalia/config/ServerPage.h b/src/vidalia/config/ServerPage.h index b906a1f..18f4686 100644 --- a/src/vidalia/config/ServerPage.h +++ b/src/vidalia/config/ServerPage.h @@ -87,6 +87,9 @@ private slots: /** Called when the user selects a new item from cmbTime */ void toggleDisplayDay(const QString &str); + /** Called when the user toggle the Enable transports checkbox */ + void toggleTransports(int state); + private: /** Index values of rate values in the bandwidth limits dropdown box. */ enum BwRateIndex { @@ -118,6 +121,10 @@ private: /** Retrieves bridge usage history from Tor, parses and validates it, and * then displays it in a new dialog. */ void displayBridgeUsage(); + /** Loads the transport settings */ + void loadTransports(); + /** Saves the transport settings */ + void saveTransports(); /** A ServerSettings object used to get and set information about how a * local Tor server is configured. */ @@ -131,6 +138,9 @@ private: * re-added when selecting relay */ QString _tmpDirPort; bool _tmpMirror; + + /** List of checkboxes used to configure transports */ + QMap<QString, QCheckBox*> _transportChecks; }; #endif diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui index f26f7e4..1d7f91f 100644 --- a/src/vidalia/config/ServerPage.ui +++ b/src/vidalia/config/ServerPage.ui @@ -77,7 +77,7 @@ </sizepolicy> </property> <property name="currentIndex"> - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="ServerConfig"> <attribute name="title"> @@ -116,7 +116,7 @@ </property> </widget> </item> - <item row="3" column="6"> + <item row="3" column="5"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -129,7 +129,7 @@ </property> </spacer> </item> - <item row="4" column="0" colspan="6"> + <item row="4" column="0" colspan="5"> <widget class="QCheckBox" name="chkEnableUpnp"> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> @@ -142,7 +142,7 @@ </property> </widget> </item> - <item row="4" column="6"> + <item row="4" column="5"> <layout class="QHBoxLayout"> <item> <widget class="QPushButton" name="btnTestUpnp"> @@ -192,7 +192,7 @@ </item> </layout> </item> - <item row="1" column="1" colspan="7"> + <item row="1" column="1" colspan="6"> <widget class="QLineEdit" name="lineServerContact"> <property name="cursor"> <cursorShape>IBeamCursor</cursorShape> @@ -206,7 +206,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st </property> </widget> </item> - <item row="3" column="3" colspan="3"> + <item row="3" column="3" colspan="2"> <layout class="QHBoxLayout"> <item> <widget class="QLabel" name="lblDirPort"> @@ -276,33 +276,33 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st </property> </widget> </item> - <item row="2" column="2" colspan="6"> + <item row="6" column="0"> <spacer> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>321</width> - <height>20</height> + <width>20</width> + <height>40</height> </size> </property> </spacer> </item> - <item row="8" column="0"> + <item row="2" column="2" colspan="5"> <spacer> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> - <height>40</height> + <width>321</width> + <height>20</height> </size> </property> </spacer> </item> - <item row="3" column="5" colspan="2"> + <item row="3" column="4" colspan="2"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -315,7 +315,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st </property> </spacer> </item> - <item row="0" column="1" colspan="7"> + <item row="0" column="1" colspan="6"> <widget class="QLineEdit" name="lineServerNickname"> <property name="cursor"> <cursorShape>IBeamCursor</cursorShape> @@ -381,6 +381,50 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st </property> </widget> </item> + <item row="5" column="0" colspan="6"> + <widget class="QFrame" name="transportsFrame"> + <property name="frameShape"> + <enum>QFrame::Box</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="lineWidth"> + <number>1</number> + </property> + <property name="midLineWidth"> + <number>0</number> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>12</number> + </property> + <property name="topMargin"> + <number>12</number> + </property> + <property name="rightMargin"> + <number>12</number> + </property> + <item> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string><b>Transports</b></string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="chkEnableTransports"> + <property name="text"> + <string>Enable using transports</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> </layout> </widget> <widget class="QWidget" name="BandwidthLimits"> diff --git a/src/vidalia/config/TransportSettings.cpp b/src/vidalia/config/TransportSettings.cpp new file mode 100644 index 0000000..748e77e --- /dev/null +++ b/src/vidalia/config/TransportSettings.cpp @@ -0,0 +1,36 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file TransportSettings.cpp +** \brief General Vidalia settings, such as language and interface style +*/ + +#include "TransportSettings.h" + +TransportSettings::TransportSettings() + : VSettings("Transport") +{ + +} + +/** Returns the available transports */ +QStringList +TransportSettings::getTransports() +{ + return childKeys(); +} + +/** Returns the ServerTransportPlugin value for a given transport */ +QString +TransportSettings::getSTP(const QString &transport) +{ + return value(transport, "").toString(); +} diff --git a/src/vidalia/config/TransportSettings.h b/src/vidalia/config/TransportSettings.h new file mode 100644 index 0000000..2de073f --- /dev/null +++ b/src/vidalia/config/TransportSettings.h @@ -0,0 +1,39 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file TransportSettings.h +** \brief Pluggable transport settings +*/ + +#ifndef _TRANSPORTSETTINGS_H +#define _TRANSPORTSETTINGS_H + +#include "VSettings.h" + +#include <QtCore> + +class TransportSettings : public VSettings +{ + Q_OBJECT + +public: + /** Default constructor. */ + TransportSettings(); + + /** Returns the available transports */ + QStringList getTransports(); + + /** Returns the ServerTransportPlugin value for a given transport */ + QString getSTP(const QString &transport); +}; + +#endif +

1 0

[vidalia/alpha] Improve displaying settings at first run
by chiiph＠torproject.org 21 Aug '12

21 Aug '12

commit b33d85f1e130c2e40f656e65da6975da69098f2b Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Aug 15 20:58:54 2012 -0300 Improve displaying settings at first run --- src/vidalia/config/ServerPage.cpp | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp index 35d3955..2f5942f 100644 --- a/src/vidalia/config/ServerPage.cpp +++ b/src/vidalia/config/ServerPage.cpp @@ -112,6 +112,9 @@ ServerPage::ServerPage(QWidget *parent) connect(ui.cmbTime, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(toggleDisplayDay(const QString &))); + connect(ui.chkEnableTransports, SIGNAL(stateChanged(int)), + this, SLOT(toggleTransports(int))); + /* Set validators for address, mask and various port number fields */ ui.lineServerNickname->setValidator(new NicknameValidator(this)); ui.lineServerPort->setValidator(new QIntValidator(1, 65535, this)); @@ -247,7 +250,7 @@ ServerPage::serverModeChanged(bool enabled) TransportSettings transports; ui.transportsFrame->setVisible(enabled && bridgeEnabled && transports.getTransports().size() > 0); - if (ui.transportsFrame->isVisible()) { + if (enabled && bridgeEnabled && transports.getTransports().size() > 0) { QStringList transportList = transports.getTransports(); foreach(QString transport, transportList) { QCheckBox *chkTransport = new QCheckBox(transport); @@ -784,8 +787,6 @@ ServerPage::toggleDisplayDay(const QString &str) void ServerPage::loadTransports() { - disconnect(ui.chkEnableTransports, 0, 0, 0); - connect(ui.chkEnableTransports, SIGNAL(stateChanged(int)), this, SLOT(toggleTransports(int))); QStringList stps = Vidalia::torrc()->value("ServerTransportPlugin"); ui.chkEnableTransports->setCheckState(stps.size() > 0 ? Qt::Checked : Qt::Unchecked); toggleTransports(stps.size() > 0 ? Qt::Checked : Qt::Unchecked);

1 0