- tor-commits - lists.torproject.org

[vidalia/alpha] Add sleep to the plugin engine
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 41d32ca0135e88e45b4faecc3a2715bc08c1fe7d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 10:44:40 2011 -0300 Add sleep to the plugin engine Also, make sleep work on Windows when waiting for port.conf --- src/vidalia/MainWindow.cpp | 5 +++++ src/vidalia/plugin/PluginEngine.cpp | 18 ++++++++++++++++++ src/vidalia/plugin/PluginEngine.h | 1 + 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index e20bb08..88cb300 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -121,6 +121,7 @@ MainWindow::MainWindow() updateTorStatus(Stopped); #if defined(Q_WS_MAC) + VidaliaSettings settings; /* Display OSX dock icon if icon preference is not set to "Tray Only" */ if (settings.getIconPref() != VidaliaSettings::Tray) { ProcessSerialNumber psn = { 0, kCurrentProcess }; @@ -661,7 +662,11 @@ MainWindow::started() while((!file.open(QIODevice::ReadOnly | QIODevice::Text)) and (tries++ < maxtries)) { vWarn(QString("This is try number: %1.").arg(tries)); +#if defined(Q_WS_WIN) + Sleep(1000); +#else sleep(1); +#endif } if(tries >= maxtries) { diff --git a/src/vidalia/plugin/PluginEngine.cpp b/src/vidalia/plugin/PluginEngine.cpp index 41f9712..b3c35c1 100644 --- a/src/vidalia/plugin/PluginEngine.cpp +++ b/src/vidalia/plugin/PluginEngine.cpp @@ -36,6 +36,7 @@ PluginEngine::PluginEngine(QObject *parent) globalObject().setProperty("importExtension", newFunction(importExtension)); globalObject().setProperty("vdebug", newFunction(vdebug)); globalObject().setProperty("findWidget", newFunction(findWidget)); + globalObject().setProperty("sleep", newFunction(sleep)); VidaliaSettings settings; globalObject().setProperty("pluginPath", QScriptValue(settings.pluginPath())); @@ -201,3 +202,20 @@ PluginEngine::findWidget(QScriptContext *context, QScriptEngine *engine) return ret; } + +QScriptValue +PluginEngine::sleep(QScriptContext *context, QScriptEngine *engine) +{ + if(context->argumentCount() != 1) + return context->throwError(QString("sleep must be called with 1 parameter.")); + + int s = context->argument(1).toInt32(); + +#if defined(Q_WS_WIN) + Sleep(s*1000); +#else + !::sleep(s); +#endif + + return engine->nullValue(); +} diff --git a/src/vidalia/plugin/PluginEngine.h b/src/vidalia/plugin/PluginEngine.h index 2251e6c..c13e1cd 100644 --- a/src/vidalia/plugin/PluginEngine.h +++ b/src/vidalia/plugin/PluginEngine.h @@ -51,6 +51,7 @@ class PluginEngine : public QScriptEngine { // static QScriptValue includeScript(QScriptContext *context, QScriptEngine *engine); static QScriptValue vdebug(QScriptContext *context, QScriptEngine *engine); static QScriptValue findWidget(QScriptContext *context, QScriptEngine *engine); + static QScriptValue sleep(QScriptContext *context, QScriptEngine *engine); void loadAllPlugins(); void tryLoadPlugin(QDir path);

1 0

[vidalia/alpha] Adds a changes file
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 90f6631356968f97ab5993bec5264a3443f4192b Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Sep 7 13:57:11 2011 -0300 Adds a changes file --- changes/bug3843 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug3843 b/changes/bug3843 new file mode 100644 index 0000000..6ccd062 --- /dev/null +++ b/changes/bug3843 @@ -0,0 +1,2 @@ + o Check tor version and that settings are sanitized before trying to + use the port autoconfiguration feature. Fixes bug 3843. \ No newline at end of file

1 0

[vidalia/alpha] Improve a bit the string formatting
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit eec3363e4f1aa3023f3185b48bbe95302b14a718 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 10:46:52 2011 -0300 Improve a bit the string formatting --- src/vidalia/MainWindow.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 88cb300..df4048b 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -672,7 +672,7 @@ MainWindow::started() if(tries >= maxtries) { vWarn("Couldn't read port.conf file"); if(_torControl->isRunning()) { - connectFailed(tr("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n%2") + connectFailed(tr("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n %2") .arg(file.fileName()) .arg(file.errorString())); } else {

1 0

[vidalia/alpha] Merge branch 'bug3759_basiclog' into alpha
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 3668bd48a2342735c50a50ad0550220ccfea0de6 Merge: a9680d7 c121db9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 11:19:21 2011 -0300 Merge branch 'bug3759_basiclog' into alpha changes/bug3759 | 3 +++ src/vidalia/log/StatusEventItem.cpp | 12 ++++++------ src/vidalia/log/StatusEventItem.h | 6 +++--- src/vidalia/log/StatusEventWidget.cpp | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-)

1 0

[vidalia/alpha] Merge branch 'bug3342_time' into alpha
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 18eb653619600be620e997f87939cbe6827b88bb Merge: ced6b22 3e2eed6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 10:54:22 2011 -0300 Merge branch 'bug3342_time' into alpha changes/bug3342 | 2 ++ src/vidalia/config/ServerPage.cpp | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-)

1 0

[vidalia/alpha] Merge branch 'bug2188_bwgraph' into alpha
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit ced6b222368d99588948cdc4da6f4efd59193070 Merge: eec3363 86ec8d9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 10:53:35 2011 -0300 Merge branch 'bug2188_bwgraph' into alpha changes/bug2188 | 2 + src/vidalia/bwgraph/GraphFrame.cpp | 45 ++++++++++++++++++++++++++++++----- src/vidalia/bwgraph/GraphFrame.h | 4 +++ 3 files changed, 44 insertions(+), 7 deletions(-)

1 0

[vidalia/alpha] Provide toForeground for plugins
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit a9680d7b4055935d57791b01e1acf7cafc42610a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 11:19:04 2011 -0300 Provide toForeground for plugins --- .../plugin/prototypes/HelperProcessPrototype.cpp | 9 +++++++++ .../plugin/prototypes/HelperProcessPrototype.h | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp b/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp index 6b91660..2de8cf6 100644 --- a/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp +++ b/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp @@ -89,3 +89,12 @@ HelperProcessPrototype::state() return HelperProcess::NotRunning; } + +void +HelperProcessPrototype::toForeground() +{ + HelperProcess *obj = qscriptvalue_cast<HelperProcess *>(thisObject()); + + if(obj) + obj->toForeground(); +} diff --git a/src/vidalia/plugin/prototypes/HelperProcessPrototype.h b/src/vidalia/plugin/prototypes/HelperProcessPrototype.h index 1dae103..671a9f4 100644 --- a/src/vidalia/plugin/prototypes/HelperProcessPrototype.h +++ b/src/vidalia/plugin/prototypes/HelperProcessPrototype.h @@ -22,6 +22,7 @@ class HelperProcessPrototype : public QObject, public QScriptable Q_INVOKABLE QStringList systemEnvironment(); Q_INVOKABLE void setEnvironment(const QStringList &env); Q_INVOKABLE QProcess::ProcessState state(); + Q_INVOKABLE void toForeground(); }; Q_DECLARE_METATYPE(HelperProcess *);

1 0

[vidalia/alpha] Merge branch 'bug3898_auth' into alpha
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 29eeb14d7e5924b44a26b5090c5fbb4435233662 Merge: 3668bd4 8ab2ccd Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Sep 16 11:22:29 2011 -0300 Merge branch 'bug3898_auth' into alpha changes/bug3898 | 3 + src/vidalia/MainWindow.cpp | 98 +++++++++++++++++++++++++++----------------- src/vidalia/MainWindow.h | 4 ++ 3 files changed, 67 insertions(+), 38 deletions(-)

1 0

[vidalia/alpha] Fix #4290.
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit fe2070791056354f17296f48bc109f4e715d6b81 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Oct 30 13:56:15 2011 +0500 Fix #4290. Give an error if bridges option is checked and none are specified. --- src/vidalia/config/NetworkPage.cpp | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index 0fa33ca..e67686c 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -317,6 +317,13 @@ NetworkPage::save(QString &errmsg) } settings.setReachablePorts(reachablePorts); + if (ui.chkUseBridges->isChecked()) { + if (ui.listBridges->count() < 1) { + errmsg = tr("You must specify one or more briges."); + return false; + } + } + /* Save the bridge settings */ settings.setUseBridges(ui.chkUseBridges->isChecked()); for (int i = 0; i < ui.listBridges->count(); i++)

1 0

[vidalia/alpha] Updated help docs for #4290.
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 65c629223b9edf4e19b557807857bec9a409985b Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Oct 30 14:30:12 2011 +0500 Updated help docs for #4290. --- src/vidalia/help/content/en/config.html | 12 ++++-------- src/vidalia/help/content/po/en/config.po | 14 ++++++-------- src/vidalia/help/content/po/templates/config.pot | 12 ++++-------- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/src/vidalia/help/content/en/config.html b/src/vidalia/help/content/en/config.html index b1c25c0..c9dc681 100644 --- a/src/vidalia/help/content/en/config.html +++ b/src/vidalia/help/content/en/config.html @@ -86,14 +86,10 @@ network. 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73 </li> </ul> - Even if you do not know any bridge relay addresses, checking this checkbox - may still be helpful. Tor will encrypt its directory requests, which can - defeat blocking mechanisms that try to filter Tor's requests for - information about other relays. If connections to normal Tor relays are - also blocked, then you will need to learn a bridge relay address somehow - and add it here. See the help topic on <a href="bridges.html#finding">finding - bridge relays</a> for more information on how to learn new bridge relay - addresses and fingerprints. + If connections to normal Tor relays are blocked, then you will need to + learn a bridge relay address somehow and add it here. See the help topic + on <a href="bridges.html#finding">finding bridge relays</a> for more + information on how to learn new bridge relay addresses and fingerprints. </li> </ul> diff --git a/src/vidalia/help/content/po/en/config.po b/src/vidalia/help/content/po/en/config.po index 38567ae..ff4d8e6 100644 --- a/src/vidalia/help/content/po/en/config.po +++ b/src/vidalia/help/content/po/en/config.po @@ -142,14 +142,12 @@ msgstr "" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information " -"about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it " -"here. See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"<b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet " +"Service Provider) blocks connections to the Tor network, Tor can attempt to " +"avoid being filtered by encrypting its directory connections and connecting " +"to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha " +"or newer only). You can add bridge relays by specifying either their address " +"and port number, or their address, port number, and fingerprint." msgstr "" #. type: Content of: <html><body> diff --git a/src/vidalia/help/content/po/templates/config.pot b/src/vidalia/help/content/po/templates/config.pot index d40ebf7..0447e27 100644 --- a/src/vidalia/help/content/po/templates/config.pot +++ b/src/vidalia/help/content/po/templates/config.pot @@ -142,14 +142,10 @@ msgstr "" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information " -"about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it " -"here. See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to " +"learn a bridge relay address somehow and add it here. See the help topic on " +"<a href=\"bridges.html#finding\">finding bridge relays</a> for more " +"information on how to learn new bridge relay addresses and fingerprints." msgstr "" #. type: Content of: <html><body>

1 0