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

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

07 Sep '11

commit b70a0a43750f6aabe800a83bcd7fdd6a5a14911b Merge: 947012e 5f9cdee Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 7 12:11:35 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: configure.in Conflict was between two pieces of configure.in logic added to the same place. Trivial. changes/bug3909 | 3 +++ configure.in | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --cc configure.in index f3640cb,52ea094..824547c --- a/configure.in +++ b/configure.in @@@ -145,9 -118,12 +145,15 @@@ if test "$enable_local_appdata" = "yes" [Defined if we default to host local appdata paths on Windows]) fi +AC_ARG_ENABLE(bufferevents, + AS_HELP_STRING(--enable-bufferevents, use Libevent's buffered IO.)) + + dnl check for the correct "ar" when cross-compiling + AN_MAKEVAR([AR], [AC_PROG_AR]) + AN_PROGRAM([ar], [AC_PROG_AR]) + AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])]) + AC_PROG_AR + AC_PROG_CC AC_PROG_CPP AC_PROG_MAKE_SET

1 0

[tor/maint-0.2.2] Look for correct "ar" to cross-compile
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 5f9cdee8afd3fb0db835c19993fae476e0f00033 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 2 11:51:49 2011 -0400 Look for correct "ar" to cross-compile For some reason, autoconf doesn't by default have an "AC_PROG_AR" for this -- possibly it's assumed that any "ar" you have will work everyplace. Fixes bug 3909; found by sid77. This fixes a build issue first present in fdbdb4dc1500, but the bug (of not using a correct ar) has been in every Tor version ever: it just didn't matter until then. --- changes/bug3909 | 3 +++ configure.in | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug3909 b/changes/bug3909 new file mode 100644 index 0000000..0b4b292 --- /dev/null +++ b/changes/bug3909 @@ -0,0 +1,3 @@ + o Build fixes: + - Search for a platform-specific version of "ar" when cross-compiling. + Should fix builds on iOS. Found by Marco Bonetti. diff --git a/configure.in b/configure.in index 4e84298..52ea094 100644 --- a/configure.in +++ b/configure.in @@ -118,6 +118,12 @@ if test "$enable_local_appdata" = "yes"; then [Defined if we default to host local appdata paths on Windows]) fi +dnl check for the correct "ar" when cross-compiling +AN_MAKEVAR([AR], [AC_PROG_AR]) +AN_PROGRAM([ar], [AC_PROG_AR]) +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])]) +AC_PROG_AR + AC_PROG_CC AC_PROG_CPP AC_PROG_MAKE_SET

1 0

[tor/master] Make FetchUselessDescriptors fetch all desc types
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 3b02a959b32c1664a2a62b36badda343cca1bc6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 29 11:18:06 2011 -0400 Make FetchUselessDescriptors fetch all desc types Previously, if you were set up to use microdescriptors, and you weren't a cache, you'd never fetch router descriptors (except for bridges). Now FetchUselessDescriptors causes descriptors and mirodescs to get cached. Also, FetchUselessDescriptors changes the behavior of "UseMicrodescriptors auto" to be off, since there's no point in saying "UseMicrodescriptors 1" when you have full descriptors too. Fix for bug 3851; bugfix on 0.2.3.1-alpha. --- changes/bug3851 | 4 ++++ src/or/microdesc.c | 9 +++++++-- src/or/networkstatus.c | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/changes/bug3851 b/changes/bug3851 new file mode 100644 index 0000000..91572f0 --- /dev/null +++ b/changes/bug3851 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Make 'FetchUselessDescriptors' cause all descriptor types and + all consensus types get fetched. Fixes bug 3851; bugfix on + 0.2.3.1-alpha. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 627fad5..510b2f4 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -698,8 +698,9 @@ we_use_microdescriptors_for_circuits(const or_options_t *options) int ret = options->UseMicrodescriptors; if (ret == -1) { /* UseMicrodescriptors is "auto"; we need to decide: */ - /* So we decide that we'll use microdescriptors iff we are not a server */ - ret = ! server_mode(options); + /* So we decide that we'll use microdescriptors iff we are not a server, + * and we're not autofetching everything. */ + ret = !server_mode(options) && !options->FetchUselessDescriptors; } return ret; } @@ -710,6 +711,8 @@ we_fetch_microdescriptors(const or_options_t *options) { if (directory_caches_dir_info(options)) return 1; + if (options->FetchUselessDescriptors) + return 1; return we_use_microdescriptors_for_circuits(options); } @@ -719,6 +722,8 @@ we_fetch_router_descriptors(const or_options_t *options) { if (directory_caches_dir_info(options)) return 1; + if (options->FetchUselessDescriptors) + return 1; return ! we_use_microdescriptors_for_circuits(options); } diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 868c2a2..398f041 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1187,6 +1187,10 @@ we_want_to_fetch_flavor(const or_options_t *options, int flavor) * it ourselves. */ return 1; } + if (options->FetchUselessDescriptors) { + /* In order to get all descriptors, we need to fetch all consensuses. */ + return 1; + } /* Otherwise, we want the flavor only if we want to use it to build * circuits. */ return flavor == usable_consensus_flavor();

1 0

[tor/master] Merge remote-tracking branch 'public/bug3851'
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 947012e153e76ceb8015ea426a895f21b63cd677 Merge: 9ef2cd7 3b02a95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 7 11:22:24 2011 -0400 Merge remote-tracking branch 'public/bug3851' changes/bug3851 | 4 ++++ src/or/microdesc.c | 9 +++++++-- src/or/networkstatus.c | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-)

1 0

[vidalia/master] Update vidalia.pot
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit 4a084f175d5995c89666df71083cb5a334b3524e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Sep 7 11:41:54 2011 -0300 Update vidalia.pot --- src/vidalia/i18n/po/templates/vidalia.pot | 60 +++++++++++++--------------- 1 files changed, 28 insertions(+), 32 deletions(-) diff --git a/src/vidalia/i18n/po/templates/vidalia.pot b/src/vidalia/i18n/po/templates/vidalia.pot index 3070fb0..b273ebf 100644 --- a/src/vidalia/i18n/po/templates/vidalia.pot +++ b/src/vidalia/i18n/po/templates/vidalia.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Vidalia\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" -"POT-Creation-Date: 2011-03-09 13:05+0000\n" +"POT-Creation-Date: 2011-09-07 14:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: \n" "Language-Team: translations(a)vidalia-project.net\n" @@ -185,6 +185,10 @@ msgid "Select a file to use for Tor socket path" msgstr "" msgctxt "AdvancedPage" +msgid "Configure ControlPort automatically" +msgstr "" + +msgctxt "AdvancedPage" msgid "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." @@ -1251,43 +1255,35 @@ msgid "Vidalia encountered an error and needed to close" msgstr "" msgctxt "CrashReportDialog" -msgid "A crash report has been created that you can automatically send to the Vidalia developers to help identify and fix the problem. The submitted report does not contain any personally identifying information, but your connection to the crash reporting server may not be anonymous." +msgid "Restart Vidalia" msgstr "" msgctxt "CrashReportDialog" -msgid "Please also describe what you were doing before the application crashed (optional):" +msgid "Don't Restart" msgstr "" msgctxt "CrashReportDialog" -msgid "Send my crash report to the Vidalia developers" +msgid "Unable to restart Vidalia" msgstr "" msgctxt "CrashReportDialog" -msgid "Restart Vidalia" +msgid "We were unable to automatically restart Vidalia. Please restart Vidalia manually." msgstr "" msgctxt "CrashReportDialog" -msgid "Don't Restart" +msgid "Please fill a ticket in:" msgstr "" msgctxt "CrashReportDialog" -msgid "Unable to restart Vidalia" +msgid "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgstr "" msgctxt "CrashReportDialog" -msgid "We were unable to automatically restart Vidalia. Please restart Vidalia manually." -msgstr "" - -msgctxt "CrashReportUploader" -msgid "Connecting..." -msgstr "" - -msgctxt "CrashReportUploader" -msgid "Sending crash report..." +msgid "A crash report has been created that you can send to the Vidalia developers to help identify and fix the problem. The submitted report does not contain any personally identifying information." msgstr "" -msgctxt "CrashReportUploader" -msgid "Receiving response..." +msgctxt "CrashReportDialog" +msgid "with a description of what you were doing before the application crashed, along with the following files corresponding to the crash report:" msgstr "" msgctxt "GeneralPage" @@ -2015,10 +2011,6 @@ msgid "The following error occurred:" msgstr "" msgctxt "MainWindow" -msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2." -msgstr "" - -msgctxt "MainWindow" msgid "Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible." msgstr "" @@ -2032,6 +2024,10 @@ msgid "Your relay is shutting down.\n" msgstr "" msgctxt "MainWindow" +msgid "Bootstrapping torrc from %1 to %2" +msgstr "" + +msgctxt "MainWindow" msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" "\n" "Would you like to shutdown gracefully and give clients time to find a new relay?" @@ -2044,11 +2040,15 @@ msgid "Vidalia detected that the Tor software exited unexpectedly.\n" msgstr "" msgctxt "MainWindow" -msgid ", probably Telnet," +msgid "(probably Telnet)" +msgstr "" + +msgctxt "MainWindow" +msgid "(probably an email client)" msgstr "" msgctxt "MainWindow" -msgid ", probably an email client," +msgid "One of your applications %1 appears to be making a potentially unencrypted and unsafe connection to port %2." msgstr "" msgctxt "MessageLog" @@ -3505,14 +3505,6 @@ msgctxt "UpdatesAvailableDialog" msgid "Version" msgstr "" -msgctxt "UploadProgressDialog" -msgid "Uploading Crash Report" -msgstr "" - -msgctxt "UploadProgressDialog" -msgid "Unable to send report: %1" -msgstr "" - msgctxt "VMessageBox" msgid "OK" msgstr "" @@ -3606,6 +3598,10 @@ msgid "Unable to open log file '%1': %2" msgstr "" msgctxt "Vidalia" +msgid "Value required for parameter :" +msgstr "" + +msgctxt "Vidalia" msgid "Invalid language code specified:" msgstr ""

1 0

[torspec/master] Merge remote-tracking branch 'asn/bug3578'
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit f6261f0e32b60e078db5d393d51e8b8da4105593 Merge: 06cf12f abfd97f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 7 10:07:45 2011 -0400 Merge remote-tracking branch 'asn/bug3578' proposals/180-pluggable-transport.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)

1 0

[torspec/master] Trivial proposal 180 changes.
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit abfd97f8fa9fc2e3f0d77be963f0703cfdf8dff8 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Aug 9 22:28:41 2011 +0200 Trivial proposal 180 changes. * Capitalize 'bridge' in Bridge lines. * Delete trailing whitespace. * Change the SMETHOD-ERROR example; because of: "The proxy SHOULD ignore methods that it doesn't recognize." the previous SMETHOD-ERROR example was unsuccessful. --- proposals/180-pluggable-transport.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index 9cab75a..2a947bc 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -143,7 +143,7 @@ Specifications: Client behavior to use to connect to a bridge. The new format is: - bridge method address:port [[keyid=]id-fingerprint] [k=v] [k=v] [k=v] + Bridge method address:port [[keyid=]id-fingerprint] [k=v] [k=v] [k=v] To connect to such a bridge, the Tor program needs to know which SOCKS proxy will support the transport called "method". It @@ -160,7 +160,7 @@ Specifications: Client behavior Method names must be C identifiers. For reference, the old bridge format was - bridge address[:port] [id-fingerprint] + Bridge address[:port] [id-fingerprint] where port defaults to 443 and the id-fingerprint is optional. The new format can be distinguished from the old one by checking if the first argument has any non-C-identifier characters. (Looking for a @@ -168,8 +168,8 @@ Specifications: Client behavior optionally include whitespace in the old format, whitespace in the id-fingerprint is not permitted in the new format. - Example: if the bridge line is "bridge trebuchet www.example.com:3333 - keyid=09F911029D74E35BD84156C5635688C009F909F9 rocks=20 height=5.6m" + Example: if the bridge line is "bridge trebuchet www.example.com:3333 + keyid=09F911029D74E35BD84156C5635688C009F909F9 rocks=20 height=5.6m" AND if the Tor client knows that the 'trebuchet' method is supported, the client should connect to the proxy that provides the 'trebuchet' method, ask it to connect to www.example.com, and provide the string @@ -319,7 +319,7 @@ Managed proxy interface <NL> ::= <US-ASCII newline (line feed) character (10)> Tor MUST ignore lines with keywords that it doesn't recognize. - + First, if there's an error parsing the environment variables, the proxy should write: ENV-ERROR <errormessage> @@ -375,7 +375,7 @@ Managed proxy interface proxy should say: SMETHOD-ERROR <methodname> <errormessage> as in - SMETHOD-ERROR no support for the 'trebuchet' method + SMETHOD-ERROR could not setup 'trebuchet' method The 'address:port' part of an SMETHOD line is the address to put in the bridge line. The Options part is a list of space-separated @@ -427,7 +427,7 @@ Managed proxy interface down cleanly. The managed proxy configuration protocol version defined in this - section is "1". + section is "1". So, for example, if tor supports this configuration protocol it should set the environment variable: TOR_PT_MANAGED_TRANSPORT_VER=1

1 0

[vidalia/alpha] Improve the engine functionality
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit 871fc5a7cc4817e3b02fa08568d69b6325997a6f Author: Tomas Touceda <chiiph(a)torproject.org> Date: Tue Jul 26 00:24:52 2011 -0300 Improve the engine functionality Actually delete the engine, so the stop methods are called. Output the plugin exceptions to vInfo messages too, so problems in the stop method are actually printed somewhere. Add the state() method for the rest of the implementation of TBB. --- src/vidalia/MainWindow.cpp | 5 ++++- src/vidalia/plugin/PluginWrapper.cpp | 5 ++++- .../plugin/prototypes/HelperProcessPrototype.cpp | 11 +++++++++++ .../plugin/prototypes/HelperProcessPrototype.h | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 96d6482..46cd0db 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -118,7 +118,10 @@ MainWindow::MainWindow() } /** Destructor */ -MainWindow::~MainWindow() {} +MainWindow::~MainWindow() +{ + delete _engine; +} /** Calls the different methods that will handle the GUI "creation". * It's called once at the MainWindow creation. */ diff --git a/src/vidalia/plugin/PluginWrapper.cpp b/src/vidalia/plugin/PluginWrapper.cpp index 87a6ff1..c74ef7b 100644 --- a/src/vidalia/plugin/PluginWrapper.cpp +++ b/src/vidalia/plugin/PluginWrapper.cpp @@ -16,6 +16,7 @@ #include "PluginWrapper.h" #include "PluginEngine.h" #include "DebugDialog.h" +#include "Vidalia.h" #include <QtXml> @@ -156,8 +157,10 @@ PluginWrapper::checkExceptions() .arg(_engine->uncaughtExceptionLineNumber()) .arg(name())); DebugDialog::exceptDebug(tr("*** Backtrace:")); - foreach(QString line, _engine->uncaughtExceptionBacktrace()) + foreach(QString line, _engine->uncaughtExceptionBacktrace()) { + vInfo(line); DebugDialog::exceptDebug(line); + } _engine->clearExceptions(); diff --git a/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp b/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp index 2fcd126..6b91660 100644 --- a/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp +++ b/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp @@ -78,3 +78,14 @@ HelperProcessPrototype::setEnvironment(const QStringList &env) if(obj) obj->setEnvironment(env); } + +HelperProcess::ProcessState +HelperProcessPrototype::state() +{ + HelperProcess *obj = qscriptvalue_cast<HelperProcess *>(thisObject()); + + if(obj) + return obj->state(); + + return HelperProcess::NotRunning; +} diff --git a/src/vidalia/plugin/prototypes/HelperProcessPrototype.h b/src/vidalia/plugin/prototypes/HelperProcessPrototype.h index 1751347..1dae103 100644 --- a/src/vidalia/plugin/prototypes/HelperProcessPrototype.h +++ b/src/vidalia/plugin/prototypes/HelperProcessPrototype.h @@ -21,6 +21,7 @@ class HelperProcessPrototype : public QObject, public QScriptable Q_INVOKABLE bool isDone() const; Q_INVOKABLE QStringList systemEnvironment(); Q_INVOKABLE void setEnvironment(const QStringList &env); + Q_INVOKABLE QProcess::ProcessState state(); }; Q_DECLARE_METATYPE(HelperProcess *);

1 0

[vidalia/alpha] Add an autoconfiguration for ControlPort
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit 438113de5bc9288fbaa25f5c11a8ba7af9d7f10f Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Wed Jun 29 16:02:37 2011 -0300 Add an autoconfiguration for ControlPort --- src/vidalia/MainWindow.cpp | 56 ++++++++++++++++++++++++++-------- src/vidalia/config/AdvancedPage.cpp | 12 +++++++ src/vidalia/config/AdvancedPage.h | 3 ++ src/vidalia/config/AdvancedPage.ui | 19 ++++++++---- src/vidalia/config/TorSettings.cpp | 14 +++++++++ src/vidalia/config/TorSettings.h | 7 ++++ 6 files changed, 92 insertions(+), 19 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 46cd0db..a6c9fa4 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -528,8 +528,8 @@ MainWindow::start() /* Check if Tor is already running separately */ if(settings.getControlMethod() == ControlMethod::Port) { - if (net_test_connect(settings.getControlAddress(), - settings.getControlPort())) { + if(!settings.autoControlPort() && net_test_connect(settings.getControlAddress(), + settings.getControlPort())) { started(); return; } @@ -562,14 +562,21 @@ MainWindow::start() /* Specify Tor's data directory, if different from the default */ QString dataDirectory = settings.getDataDirectory(); + QString expDataDirectory = expand_filename(dataDirectory); if (!dataDirectory.isEmpty()) - args << "DataDirectory" << expand_filename(dataDirectory); + args << "DataDirectory" << expDataDirectory; if(settings.getControlMethod() == ControlMethod::Port) { - /* Add the intended control port value */ - quint16 controlPort = settings.getControlPort(); - if (controlPort) - args << "ControlPort" << QString::number(controlPort); + if(settings.autoControlPort()) { + args << "ControlPort" << "auto"; + args << "SocksPort" << "auto"; + args << "ControlPortWriteToFile" << QString("%1/port.conf").arg(expDataDirectory); + } else { + /* Add the intended control port value */ + quint16 controlPort = settings.getControlPort(); + if (controlPort) + args << "ControlPort" << QString::number(controlPort); + } } else { QString path = settings.getSocketPath(); args << "ControlSocket" << path; @@ -622,12 +629,35 @@ MainWindow::started() _delayedShutdownStarted = false; /* Remember whether we started Tor or not */ _isVidaliaRunningTor = _torControl->isVidaliaRunningTor(); - /* Try to connect to Tor's control port */ - if(settings.getControlMethod() == ControlMethod::Port) - _torControl->connect(settings.getControlAddress(), - settings.getControlPort()); - else - _torControl->connect(settings.getSocketPath()); + + if(settings.autoControlPort()) { + QString dataDirectory = settings.getDataDirectory(); + QFile file(QString("%1/port.conf").arg(expand_filename(dataDirectory))); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) + return; + + QTextStream in(&file); + if(!in.atEnd()) { + QString line = in.readLine(); + QStringList parts = line.split("="); + if(parts.size() != 2) return; + if(parts[0].trimmed() != "PORT") return; + + QStringList addrPort = parts[1].split(":"); + if(addrPort.size() != 2) return; + + QHostAddress addr(addrPort.at(0)); + quint16 port = addrPort.at(1).toInt(); + _torControl->connect(addr, port); + } + } else { + /* Try to connect to Tor's control port */ + if(settings.getControlMethod() == ControlMethod::Port) + _torControl->connect(settings.getControlAddress(), + settings.getControlPort()); + else + _torControl->connect(settings.getSocketPath()); + } setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor")); } diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index a879ecc..4e7c3f6 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -64,6 +64,7 @@ AdvancedPage::AdvancedPage(QWidget *parent) this, SLOT(displayTorrcDialog())); connect(ui.rdoControlPort, SIGNAL(toggled(bool)), this, SLOT(toggleControl(bool))); connect(ui.btnBrowseSocketPath, SIGNAL(clicked()), this, SLOT(browseSocketPath())); + connect(ui.chkAuto, SIGNAL(toggled(bool)), this, SLOT(toggleAuto(bool))); /* Hide platform specific features */ #if defined(Q_WS_WIN) @@ -187,6 +188,7 @@ AdvancedPage::save(QString &errmsg) _settings->setControlAddress(controlAddress); _settings->setControlPort(ui.lineControlPort->text().toUShort()); _settings->setSocketPath(ui.lineSocketPath->text()); + _settings->setAutoControlPort(ui.chkAuto->isChecked()); _settings->setAuthenticationMethod(authMethod); _settings->setUseRandomPassword(ui.chkRandomPassword->isChecked()); @@ -212,6 +214,7 @@ AdvancedPage::load() ui.lineControlPort->setText(QString::number(_settings->getControlPort())); ui.lineTorConfig->setText(_settings->getTorrc()); ui.lineTorDataDirectory->setText(_settings->getDataDirectory()); + ui.chkAuto->setChecked(_settings->autoControlPort()); ui.cmbAuthMethod->setCurrentIndex( authMethodToIndex(_settings->getAuthenticationMethod())); @@ -402,3 +405,12 @@ AdvancedPage::toggleControl(bool) #endif } } + +void +AdvancedPage::toggleAuto(bool) +{ + ui.lblAddress->setEnabled(!ui.chkAuto->isChecked()); + ui.lineControlAddress->setEnabled(!ui.chkAuto->isChecked()); + ui.label->setEnabled(!ui.chkAuto->isChecked()); + ui.lineControlPort->setEnabled(!ui.chkAuto->isChecked()); +} diff --git a/src/vidalia/config/AdvancedPage.h b/src/vidalia/config/AdvancedPage.h index 4ba26cc..4510310 100644 --- a/src/vidalia/config/AdvancedPage.h +++ b/src/vidalia/config/AdvancedPage.h @@ -75,6 +75,9 @@ private slots: * a more advanced way */ void displayTorrcDialog(); + /** Called when the user checks "Configure ControlPort automatically" */ + void toggleAuto(bool); + private: /** Returns the authentication method for the given <b>index</b>. */ TorSettings::AuthenticationMethod indexToAuthMethod(int index); diff --git a/src/vidalia/config/AdvancedPage.ui b/src/vidalia/config/AdvancedPage.ui index ed17c1d..3600cbc 100644 --- a/src/vidalia/config/AdvancedPage.ui +++ b/src/vidalia/config/AdvancedPage.ui @@ -37,7 +37,7 @@ <property name="verticalSpacing"> <number>5</number> </property> - <item row="5" column="0"> + <item row="6" column="0"> <widget class="QLabel" name="lblAuth"> <property name="text"> <string>Authentication:</string> @@ -57,7 +57,7 @@ </property> </widget> </item> - <item row="5" column="2" colspan="3"> + <item row="6" column="2" colspan="3"> <layout class="QHBoxLayout"> <property name="spacing"> <number>2</number> @@ -197,7 +197,7 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="5" column="0"> <widget class="QLabel" name="lblPath"> <property name="enabled"> <bool>false</bool> @@ -210,14 +210,14 @@ </property> </widget> </item> - <item row="4" column="1" colspan="2"> + <item row="5" column="1" colspan="2"> <widget class="QLineEdit" name="lineSocketPath"> <property name="enabled"> <bool>false</bool> </property> </widget> </item> - <item row="3" column="2"> + <item row="4" column="2"> <widget class="QRadioButton" name="rdoControlSocket"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> @@ -230,7 +230,7 @@ </property> </widget> </item> - <item row="4" column="3"> + <item row="5" column="3"> <widget class="QPushButton" name="btnBrowseSocketPath"> <property name="enabled"> <bool>false</bool> @@ -240,6 +240,13 @@ </property> </widget> </item> + <item row="3" column="2"> + <widget class="QCheckBox" name="chkAuto"> + <property name="text"> + <string>Configure ControlPort automatically</string> + </property> + </widget> + </item> </layout> </item> </layout> diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index b05b428..42e036f 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -44,6 +44,7 @@ #define SETTING_REJECT_PLAINTEXT_PORTS "RejectPlaintextPorts" #define SETTING_BOOTSTRAP "Bootstrap" #define SETTING_BOOTSTRAP_FROM "BootstrapFrom" +#define SETTING_AUTOCONTROL "AutoControl" /** Default to using hashed password authentication */ #define DEFAULT_AUTH_METHOD PasswordAuth @@ -92,6 +93,7 @@ TorSettings::TorSettings(TorControl *torControl) setDefault(SETTING_REJECT_PLAINTEXT_PORTS, QList<QVariant>()); setDefault(SETTING_BOOTSTRAP, false); setDefault(SETTING_BOOTSTRAP_FROM, ""); + setDefault(SETTING_AUTOCONTROL, true); } /** Applies any changes to Tor's control port or authentication settings. */ @@ -450,3 +452,15 @@ TorSettings::bootstrapFrom() const { return QDir::convertSeparators(value(SETTING_BOOTSTRAP_FROM).toString()); } + +bool +TorSettings::autoControlPort() const +{ + return value(SETTING_AUTOCONTROL).toBool(); +} + +void +TorSettings::setAutoControlPort(const bool autoControl) +{ + setValue(SETTING_AUTOCONTROL, autoControl); +} diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h index a4f8ec9..5038c3d 100644 --- a/src/vidalia/config/TorSettings.h +++ b/src/vidalia/config/TorSettings.h @@ -72,6 +72,13 @@ public: /** Get the current control method */ ControlMethod::Method getControlMethod() const; + /** Returns true if Vidalia will get the ControlPort automatically from + * Tor */ + bool autoControlPort() const; + + /** Sets whether Vidalia should get the ControlPort from Tor */ + void setAutoControlPort(const bool auto); + /** Set the control method */ void setControlMethod(ControlMethod::Method method);

1 0

[vidalia/alpha] Improve how the advance settings behave with the autoport
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit bd5b133def31530861d1bf0aa908b2c7ffced011 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Thu Jul 28 14:12:03 2011 -0300 Improve how the advance settings behave with the autoport Tries to avoid confusion by just not displaying what host and port is being used, so that it's completely transparent to the user. --- src/vidalia/config/AdvancedPage.cpp | 16 ++++++++++------ src/vidalia/config/AdvancedPage.ui | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index 4e7c3f6..12842bc 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -185,8 +185,10 @@ AdvancedPage::save(QString &errmsg) _settings->setDataDirectory(dataDir); } - _settings->setControlAddress(controlAddress); - _settings->setControlPort(ui.lineControlPort->text().toUShort()); + if(!ui.chkAuto->isChecked()) { + _settings->setControlAddress(controlAddress); + _settings->setControlPort(ui.lineControlPort->text().toUShort()); + } _settings->setSocketPath(ui.lineSocketPath->text()); _settings->setAutoControlPort(ui.chkAuto->isChecked()); @@ -394,6 +396,7 @@ AdvancedPage::toggleControl(bool) ui.lblPath->setEnabled(false); ui.lineSocketPath->setEnabled(false); ui.btnBrowseSocketPath->setEnabled(false); + ui.chkAuto->setEnabled(true); } else { #if !defined(Q_OS_WIN32) ui.lblAddress->setEnabled(false); @@ -402,6 +405,7 @@ AdvancedPage::toggleControl(bool) ui.lblPath->setEnabled(true); ui.lineSocketPath->setEnabled(true); ui.btnBrowseSocketPath->setEnabled(true); + ui.chkAuto->setEnabled(false); #endif } } @@ -409,8 +413,8 @@ AdvancedPage::toggleControl(bool) void AdvancedPage::toggleAuto(bool) { - ui.lblAddress->setEnabled(!ui.chkAuto->isChecked()); - ui.lineControlAddress->setEnabled(!ui.chkAuto->isChecked()); - ui.label->setEnabled(!ui.chkAuto->isChecked()); - ui.lineControlPort->setEnabled(!ui.chkAuto->isChecked()); + ui.lblAddress->setVisible(!ui.chkAuto->isChecked()); + ui.lineControlAddress->setVisible(!ui.chkAuto->isChecked()); + ui.label->setVisible(!ui.chkAuto->isChecked()); + ui.lineControlPort->setVisible(!ui.chkAuto->isChecked()); } diff --git a/src/vidalia/config/AdvancedPage.ui b/src/vidalia/config/AdvancedPage.ui index 3600cbc..7776a18 100644 --- a/src/vidalia/config/AdvancedPage.ui +++ b/src/vidalia/config/AdvancedPage.ui @@ -240,7 +240,7 @@ </property> </widget> </item> - <item row="3" column="2"> + <item row="2" column="2"> <widget class="QCheckBox" name="chkAuto"> <property name="text"> <string>Configure ControlPort automatically</string>

1 0