- tor-commits - lists.torproject.org

[vidalia/alpha] Add a way to set and retrieve if we should warn the user when setting ExitNodes
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 78ad28354fd28494f77b9dd89cb5dde093042579 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 13:04:50 2012 -0300 Add a way to set and retrieve if we should warn the user when setting ExitNodes --- src/vidalia/config/VidaliaSettings.cpp | 13 +++++++++++++ src/vidalia/config/VidaliaSettings.h | 10 +++++++++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index ff9bc6d..8386d64 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -90,6 +90,7 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_ALLOW_PANIC, false); setDefault(SETTING_PANIC_PATH, ""); setDefault(SETTING_FIRST_RUN, true); + setDefault(SETTING_REMEMBER_DONTWARNEXIT, true); } /** Gets the currently preferred language code for Vidalia. */ @@ -380,3 +381,15 @@ VidaliaSettings::setFirstRun(bool val) { setValue(SETTING_FIRST_RUN, val); } + +bool +VidaliaSettings::dontWarnExitNodes() const +{ + return value(SETTING_REMEMBER_DONTWARNEXIT).toBool(); +} + +void +VidaliaSettings::setDontWarnExitNodes(bool val) +{ + setValue(SETTING_REMEMBER_DONTWARNEXIT, val); +} diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h index d088ac0..68cbd3b 100644 --- a/src/vidalia/config/VidaliaSettings.h +++ b/src/vidalia/config/VidaliaSettings.h @@ -21,7 +21,8 @@ #include <QDateTime> /** Public setting keys */ -#define SETTING_REMEMBER_SHUTDOWN "RememberShutdown" +#define SETTING_REMEMBER_SHUTDOWN "RememberShutdown" +#define SETTING_REMEMBER_DONTWARNEXIT "DontWarnExitNodes" /** Handles saving and restoring Vidalia's settings, such as the * location of Tor, the control port, etc. @@ -151,6 +152,13 @@ public: bool firstRun() const; /** Sets Vidalia's first run option */ void setFirstRun(bool val); + + /** Returns true if Vidalia should warn the user when setting Exit + * nodes by hand */ + bool dontWarnExitNodes() const; + /** Sets wether Vidalia should warn the user when setting Exit nodes + * by hand */ + void setDontWarnExitNodes(bool val); }; #endif

1 0

[vidalia/alpha] Improve handling of ControlPort and SocksPort settings
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 94c3f4f7c63eecd3ba161da4897fb7e9ca7e6b6a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 13:04:06 2012 -0300 Improve handling of ControlPort and SocksPort settings --- src/vidalia/config/AdvancedPage.cpp | 3 ++- src/vidalia/config/TorSettings.cpp | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index 0c538c7..51214a4 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -458,7 +458,8 @@ AdvancedPage::toggleAuto(bool) ui.lineControlAddress->setVisible(!ui.chkAuto->isChecked()); ui.label->setVisible(!ui.chkAuto->isChecked()); ui.lineControlPort->setVisible(!ui.chkAuto->isChecked()); - ui.lineControlPort->setText("9051"); + if (ui.lineControlPort->text() == "0") + ui.lineControlPort->setText("9051"); } void diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index bf9d48e..df56b12 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -108,12 +108,9 @@ TorSettings::apply(QString *errmsg) { Torrc *torrc = Vidalia::torrc(); - torrc->clear(QStringList() - << TOR_ARG_SOCKSPORT - << SETTING_CONTROL_PORT); - torrc->setValue(SETTING_DATA_DIRECTORY, volatileValue(SETTING_DATA_DIRECTORY).toString()); + torrc->clear(QStringList() << SETTING_SOCKS_PORT); if(volatileValue(SETTING_AUTOCONTROL).toBool()) { torrc->setValue(SETTING_CONTROL_PORT, "auto"); torrc->setValue(SETTING_SOCKS_PORT, "auto"); @@ -121,14 +118,23 @@ TorSettings::apply(QString *errmsg) } else { QString socks = volatileValue(SETTING_SOCKS_PORT).toString(); QString control = volatileValue(SETTING_CONTROL_PORT).toString(); + + if (socks == "0") + socks = "9050"; + { - with_torrc_value(SETTING_SOCKS_PORT) - socks = ret.at(0); + with_torrc_value(SETTING_SOCKS_PORT) { + if (ret.at(0) != "auto") + socks = ret.at(0); + } } { - with_torrc_value(SETTING_CONTROL_PORT) - control = ret.at(0); + with_torrc_value(SETTING_CONTROL_PORT) { + if (ret.at(0) != "auto") + control = ret.at(0); + } } + torrc->setValue(SETTING_SOCKS_PORT, socks); torrc->setValue(SETTING_CONTROL_PORT, control); }

1 0

[vidalia/alpha] Add ExitNode handling in TorSettings
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 1aaa15bb51c608518c022ae1b9ad8d1f7343a75c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 13:02:09 2012 -0300 Add ExitNode handling in TorSettings Even if we are not using this in the AdvancedPage, we need to set the volatileValue. --- src/vidalia/config/AdvancedPage.cpp | 3 +++ src/vidalia/config/TorSettings.cpp | 28 ++++++++++++++++++++++++++++ src/vidalia/config/TorSettings.h | 5 +++++ 3 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index 8e617fd..0c538c7 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -269,6 +269,9 @@ AdvancedPage::load() ui.chkEnablePanic->setChecked(settings.allowPanic()); ui.linePanicPath->setText(settings.panicPath()); + + /** We need to keep the ExitNodes settings, even if we don't use it here */ + _settings->setExitNodes(_settings->exitNodes()); } /** Called when the user selects a different authentication method from the diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index b7da39a..bf9d48e 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -48,6 +48,7 @@ #define SETTING_BOOTSTRAP_FROM "BootstrapFrom" #define SETTING_AUTOCONTROL "AutoControl" #define SETTING_DISABLE_NETWORK "DisableNetwork" +#define SETTING_EXITNODES "ExitNodes" /** Default to using hashed password authentication */ #define DEFAULT_AUTH_METHOD PasswordAuth @@ -161,6 +162,14 @@ TorSettings::apply(QString *errmsg) torrc->setValue(SETTING_DISABLE_NETWORK, volatileValue(SETTING_DISABLE_NETWORK).toBool() ? "1" : "0"); + QString exitNodes = volatileValue(SETTING_EXITNODES).toString(); + + if (exitNodes.isEmpty()) { + torrc->clear(QStringList() << SETTING_EXITNODES); + } else { + torrc->setValue(SETTING_EXITNODES, exitNodes); + } + return torrc->apply(Vidalia::torControl(), errmsg); } @@ -572,3 +581,22 @@ TorSettings::setAutoControlPort(const bool autoControl) { setVolatileValue(SETTING_AUTOCONTROL, autoControl); } + + +/** Returns the selected exit nodes */ +QStringList +TorSettings::exitNodes() const +{ + QStringList exitNodes; + with_torrc_value(SETTING_EXITNODES) { + exitNodes = ret.at(0).split(","); + } + return exitNodes; +} + +/** Sets the exit nodes to the specified list */ +void +TorSettings::setExitNodes(const QStringList &exitNodes) +{ + setVolatileValue(SETTING_EXITNODES, exitNodes.join(",")); +} diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h index 6feabe7..a8c6e06 100644 --- a/src/vidalia/config/TorSettings.h +++ b/src/vidalia/config/TorSettings.h @@ -149,6 +149,11 @@ public: /** Sets the location of the bootstrap torrc file */ void setBootstrapFrom(const QString &from); + /** Returns the selected exit nodes */ + QStringList exitNodes() const; + /** Sets the exit nodes to the specified list */ + void setExitNodes(const QStringList &exitNodes); + private: /** Returns the AuthenticationMethod enum value for the string * description of the authentication method given in <b>authMethod</b>. */

1 0

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

12 Jun '12

commit d7786e7ec3bcef9943066e98bf620fc165e57ae0 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 14:30:12 2012 -0300 Add changes file --- changes/pickExitNodes | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/pickExitNodes b/changes/pickExitNodes new file mode 100644 index 0000000..32ebd1a --- /dev/null +++ b/changes/pickExitNodes @@ -0,0 +1,9 @@ + New features: + o Provide a way of hand picking exit nodes from the router list in + the Network Map. + + Internal cleanups and improvements: + o Fix return value from VMessageBox::question. + o Make TorControl::getRouterDescriptorText() default to regular + descriptors in case the microdescriptor is not available. + o Improve handling of ControlPort and SocksPort settings. \ No newline at end of file

1 0

[vidalia/alpha] Add icons
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 5c35be4c6a11a9411439446dc1128319980d6bab Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 14:29:50 2012 -0300 Add icons --- src/vidalia/network/RouterListWidget.cpp | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vidalia/network/RouterListWidget.cpp b/src/vidalia/network/RouterListWidget.cpp index b9a76b7..837c025 100644 --- a/src/vidalia/network/RouterListWidget.cpp +++ b/src/vidalia/network/RouterListWidget.cpp @@ -24,7 +24,9 @@ #define IMG_ZOOM ":/images/22x22/page-zoom.png" #define IMG_COPY ":/images/22x22/edit-copy.png" - +#define IMG_PLUS ":/images/22x22/list-add.png" +#define IMG_MINUS ":/images/22x22/list-remove.png" +#define IMG_INFO ":/images/16x16/dialog-information.png" RouterListWidget::RouterListWidget(QWidget *parent) : QTreeWidget(parent) @@ -79,12 +81,12 @@ RouterListWidget::contextMenuEvent(QContextMenuEvent *event) else connect(action, SIGNAL(triggered()), this, SLOT(zoomToSelectedRelay())); - routerInfoAction = menu->addAction(tr("Router Info")); + routerInfoAction = menu->addAction(QIcon(IMG_INFO), tr("Router Info")); connect(routerInfoAction, SIGNAL(triggered()), this, SLOT(displayRouterInfo())); RouterListItem *item = static_cast<RouterListItem*>(selected.first()); - useAsExit = menu->addAction(tr("Use as Exit node")); + useAsExit = menu->addAction(QIcon(IMG_PLUS), tr("Use as Exit node")); if (selected.size() > 1) { useAsExit->setEnabled(false); } else if (item->descriptor().exitPolicy().isEmpty()) { @@ -92,6 +94,7 @@ RouterListWidget::contextMenuEvent(QContextMenuEvent *event) } else { if (item->selectedExit()) { useAsExit->setText(tr("Do not use as Exit node")); + useAsExit->setIcon(QIcon(IMG_MINUS)); } connect(useAsExit, SIGNAL(triggered()), this, SLOT(useAsExit()));

1 0

[vidalia/alpha] Torrc inherits QObject
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 553ba78cec725b3c8e6e14030383954f6656b615 Author: Feroze Naina <ferozenaina(a)gmail.com> Date: Tue May 29 22:33:52 2012 +0530 Torrc inherits QObject --- src/vidalia/CMakeLists.txt | 1 + src/vidalia/config/torrc/Torrc.cpp | 2 +- src/vidalia/config/torrc/Torrc.h | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index 0ccbdad..41e5aa8 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -149,6 +149,7 @@ qt4_wrap_cpp(vidalia_SRCS config/TorSettings.h config/VidaliaSettings.h config/VSettings.h + config/torrc/Torrc.h ) if (USE_MINIUPNPC) include_directories(${MINIUPNPC_INCLUDE_DIR}) diff --git a/src/vidalia/config/torrc/Torrc.cpp b/src/vidalia/config/torrc/Torrc.cpp index d1589b9..8e96f89 100644 --- a/src/vidalia/config/torrc/Torrc.cpp +++ b/src/vidalia/config/torrc/Torrc.cpp @@ -19,7 +19,7 @@ #include <QtGlobal> Torrc::Torrc(const QString &torrcPath, const QString &defaultsPath) : - _torrcPath(torrcPath), changed(false) + QObject(), _torrcPath(torrcPath), changed(false) { load(torrcPath, defaultsPath); } diff --git a/src/vidalia/config/torrc/Torrc.h b/src/vidalia/config/torrc/Torrc.h index 22a7a13..fcdc6a3 100644 --- a/src/vidalia/config/torrc/Torrc.h +++ b/src/vidalia/config/torrc/Torrc.h @@ -21,7 +21,9 @@ #include "TorControl.h" #include "TorrcParser.h" -class Torrc { +class Torrc : public QObject +{ + Q_OBJECT public: /** Constructor */ Torrc(const QString &torrcPath, const QString &defaultsPath = "");

1 0

[vidalia/alpha] Add readme for special icon
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit be9059db6b88d0b4a90c974de713586e36b3164e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 14:33:29 2012 -0300 Add readme for special icon --- src/vidalia/res/16x16/detach-arrow.readme.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/vidalia/res/16x16/detach-arrow.readme.txt b/src/vidalia/res/16x16/detach-arrow.readme.txt new file mode 100644 index 0000000..88aa3d2 --- /dev/null +++ b/src/vidalia/res/16x16/detach-arrow.readme.txt @@ -0,0 +1,6 @@ +WooFunction Web Icon Set + +This icon set is released on the GNU General Public License. + +http://wefunction.com/ +http://www.woothemes.com140 \ No newline at end of file

1 0

[vidalia/alpha] Merge remote-tracking branch 'feroze/torrcprototype' into alpha
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit a74799264883ede23f2514624cd32d1b17211919 Merge: ecf4532 cfdacb2 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 14:36:31 2012 -0300 Merge remote-tracking branch 'feroze/torrcprototype' into alpha changes/TorrcPrototype | 3 + changes/external-prototype-macros | 3 + src/vidalia/CMakeLists.txt | 3 + src/vidalia/config/torrc/Torrc.cpp | 2 +- src/vidalia/config/torrc/Torrc.h | 4 +- src/vidalia/plugin/PluginEngine.cpp | 2 + src/vidalia/plugin/PluginEngine.h | 1 + .../plugin/prototypes/TorControlPrototype.cpp | 51 +-------------- src/vidalia/plugin/prototypes/TorrcPrototype.cpp | 71 ++++++++++++++++++++ src/vidalia/plugin/prototypes/TorrcPrototype.h | 63 +++++++++++++++++ src/vidalia/plugin/prototypes/prototypemacros.h | 49 ++++++++++++++ 11 files changed, 200 insertions(+), 52 deletions(-)

1 0

[vidalia/alpha] Fix when to display the relay offline tip in network map
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 0c5f2db3cba84d7f00ee77b5be3dea320ef8779a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 17:12:51 2012 -0300 Fix when to display the relay offline tip in network map --- changes/fixRouterOfflineNotification | 3 +++ src/vidalia/network/NetViewer.cpp | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/changes/fixRouterOfflineNotification b/changes/fixRouterOfflineNotification new file mode 100644 index 0000000..04c38ba --- /dev/null +++ b/changes/fixRouterOfflineNotification @@ -0,0 +1,3 @@ + Bugfixes relative to Vidalia 0.3.x: + o Show the "Why is my relay offline?" notification only if tor is + running one and it's marked as offline. diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index eb39ac8..9c2cd3b 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -396,11 +396,14 @@ NetViewer::preLoadNetworkStatus() NetworkStatus networkStatus = _torControl->getNetworkStatus(); ServerSettings settings(_torControl); - if(_torControl->isConnected() and settings.isServerEnabled()) - _routers << *RouterDescriptor::fromTorControl(_torControl); - else { - ui.lblConsensus->setVisible(false); - ui.lblOffline->setVisible(true); + if (settings.isServerEnabled()) { + RouterDescriptor *rd = RouterDescriptor::fromTorControl(_torControl); + if(_torControl->isConnected() and settings.isServerEnabled()) { + _routers << *rd; + } else { + ui.lblConsensus->setVisible(false); + ui.lblOffline->setVisible(rd->offline()); + } } bool usingMicrodescriptors = _torControl->useMicrodescriptors();

1 0

[vidalia/alpha] Properly name a private member variable and mark the Torrc as changed if a key is cleared
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 3a56ccd23d99242bc51f935538b3491f2b8169f9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 17:17:24 2012 -0300 Properly name a private member variable and mark the Torrc as changed if a key is cleared --- src/vidalia/config/torrc/Torrc.cpp | 11 ++++++----- src/vidalia/config/torrc/Torrc.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/vidalia/config/torrc/Torrc.cpp b/src/vidalia/config/torrc/Torrc.cpp index 8e96f89..18dd64d 100644 --- a/src/vidalia/config/torrc/Torrc.cpp +++ b/src/vidalia/config/torrc/Torrc.cpp @@ -19,7 +19,7 @@ #include <QtGlobal> Torrc::Torrc(const QString &torrcPath, const QString &defaultsPath) : - QObject(), _torrcPath(torrcPath), changed(false) + QObject(), _torrcPath(torrcPath), _changed(false) { load(torrcPath, defaultsPath); } @@ -39,7 +39,7 @@ Torrc::load(const QString &torrcPath, const QString &defaultsPath) bool Torrc::apply(TorControl *tc, QString *errmsg) { - if(not changed) + if(not _changed) return true; QFile torrc(_torrcPath); @@ -70,7 +70,7 @@ Torrc::apply(TorControl *tc, QString *errmsg) clearAll(); load(_torrcPath); - changed = false; + _changed = false; bool ret = true; if(tc && tc->isConnected()) { @@ -155,7 +155,7 @@ Torrc::setValue(const QString &key, const QString &value, const QString &comment .arg(value)); if(not comment.isEmpty() and val.second.line()->comment().isEmpty()) val.second.line()->setComment(comment); - changed = true; + _changed = true; return; } else if(not val.second.isMultilined() and val.first == value) { // if it's the same, leave it like that @@ -164,7 +164,7 @@ Torrc::setValue(const QString &key, const QString &value, const QString &comment } } - changed = true; + _changed = true; TorrcLine *line = new TorrcLine(QString("%1 %2") .arg(key) @@ -212,6 +212,7 @@ Torrc::clear(QStringList &keys) } } _torrcMap.remove(key); + _changed = true; } } diff --git a/src/vidalia/config/torrc/Torrc.h b/src/vidalia/config/torrc/Torrc.h index fcdc6a3..9d45742 100644 --- a/src/vidalia/config/torrc/Torrc.h +++ b/src/vidalia/config/torrc/Torrc.h @@ -71,7 +71,7 @@ class Torrc : public QObject QString _torrcPath; /** True if the config options have been changed */ - bool changed; + bool _changed; }; #endif

1 0