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

[metrics-web/master] Add .tpf tarballs and specify the new format.
by karsten＠torproject.org 30 May '12

30 May '12

commit 252e368c441cad7c1c9e61755731db15a5c5259a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 30 10:58:00 2012 +0200 Add .tpf tarballs and specify the new format. --- .../torproject/ernie/web/ResearchDataServlet.java | 19 ++ web/WEB-INF/data.jsp | 20 ++- web/WEB-INF/formats.jsp | 189 +++++++++++++++----- 3 files changed, 177 insertions(+), 51 deletions(-) diff --git a/src/org/torproject/ernie/web/ResearchDataServlet.java b/src/org/torproject/ernie/web/ResearchDataServlet.java index 1df5eee..e8ae79d 100644 --- a/src/org/torproject/ernie/web/ResearchDataServlet.java +++ b/src/org/torproject/ernie/web/ResearchDataServlet.java @@ -91,6 +91,8 @@ public class ResearchDataServlet extends HttpServlet { SortedMap<Date, String[]> bridgeDescriptors = new TreeMap<Date, String[]>(java.util.Collections.reverseOrder()); String[] relayStatistics = new String[2]; + SortedMap<Date, String[]> torperfTarballs = + new TreeMap<Date, String[]>(java.util.Collections.reverseOrder()); SortedMap<String, Map<String, String[]>> torperfData = new TreeMap<String, Map<String, String[]>>(); SortedMap<Date, String[]> exitLists = @@ -172,6 +174,22 @@ public class ResearchDataServlet extends HttpServlet { int index = filename.endsWith(".asc") ? 1 : 0; relayStatistics[index] = url; + /* URL contains Torperf tarball. */ + } else if (filename.startsWith("torperf-20")) { + String yearMonth = filename.substring(filename.indexOf("20")); + yearMonth = yearMonth.substring(0, 7); + Date month = null; + try { + month = monthFormat.parse(yearMonth); + } catch (ParseException e) { + /* Ignore this URL. */ + continue; + } + if (!torperfTarballs.containsKey(month)) { + torperfTarballs.put(month, new String[2]); + } + torperfTarballs.get(month)[0] = url; + /* URL contains Torperf data file. */ } else if (filename.endsWith("b.data") || filename.endsWith("b.extradata")) { @@ -256,6 +274,7 @@ public class ResearchDataServlet extends HttpServlet { request.setAttribute("relayStatistics", relayStatistics); request.setAttribute("torperfData", torperfData); request.setAttribute("exitLists", exitLists); + request.setAttribute("torperfTarballs", torperfTarballs); request.setAttribute("torperfExperiments", torperfExperiments); request.setAttribute("bridgePoolAssignments", bridgePoolAssignments); request.getRequestDispatcher("WEB-INF/data.jsp").forward(request, diff --git a/web/WEB-INF/data.jsp b/web/WEB-INF/data.jsp index a4e88f2..06176db 100644 --- a/web/WEB-INF/data.jsp +++ b/web/WEB-INF/data.jsp @@ -182,12 +182,26 @@ We are continuously measuring the performance of the Tor network by periodically requesting files of different sizes and recording the time needed to do so. These measurements take place - on moria, siv, and torperf and use an unmodified Tor client. The - files below contain the output of the torperf application and are - updated every hour. + on moria, siv, and torperf and use an unmodified Tor client. + The files below contain the output of the torperf application. The data format is described <a href="formats.html#torperf">here</a>. <table width="100%" border="0" cellpadding="5" cellspacing="0" summary=""> + <c:forEach var="item" items="${torperfTarballs}" > + <fmt:formatDate var="longDate" pattern="MMMM yyyy" + value="${item.key}"/> + <tr> + <td> + <a href="${item.value[0]}">${longDate}</a> + </td> + </tr> + </c:forEach> + </table> + + The output above is the result of combining torperf request + data with information about used paths. + The raw files are also available below. + <table width="100%" border="0" cellpadding="5" cellspacing="0" summary=""> <c:forEach var="item" items="${torperfData}" > <tr> <td>${item.key}</td> diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 24647e0..5740c9f 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -85,7 +85,7 @@ are recent: <li><tt>@type bridge-server-descriptor 1.0</tt></li> <li><tt>@type bridge-extra-info 1.0</tt></li> -<li><tt>@type torperf 1.0</tt></li> +<li><tt>@type torperf 1.0</tt></li> <li><tt>@type bridge-pool-assignment 1.0</tt></li> <li><tt>@type gettor 1.0</tt></li> @@ -698,73 +698,166 @@ Torperf can be <a href="https://metrics.torproject.org/tools.html">downloaded</a> from the metrics website. +A Torperf results file contains a single line per Torperf run with +<tt>key=value</tt> pairs. +Such a result line is sufficient to learn about 1) the Tor and Torperf +configuration, 2) measurement results, and 3) additional information that +might help explain the results. +Known keys are explained below. +<ul> +<li>Configuration +<ul> +<li><tt>SOURCE:</tt> Configured name of the data source; required.</li> +<li><tt>FILESIZE:</tt> Configured file size in bytes; required.</li> +<li>Other meta data describing the Tor or Torperf configuration, e.g., +GUARD for a custom guard choice; optional.</li> +</ul> +<li>Measurement results +<ul> +<li><tt>START:</tt> Time when the connection process starts; +required.</li> +<li><tt>SOCKET:</tt> Time when the socket was created; required.</li> +<li><tt>CONNECT:</tt> Time when the socket was connected; required.</li> +<li><tt>NEGOTIATE:</tt> Time when SOCKS 5 authentication methods have been +negotiated; required.</li> +<li><tt>REQUEST:</tt> Time when the SOCKS request was sent; required.</li> +<li><tt>RESPONSE:</tt> Time when the SOCKS response was received; +required.</li> +<li><tt>DATAREQUEST:</tt> Time when the HTTP request was written; +required.</li> +<li><tt>DATARESPONSE:</tt> Time when the first response was received; +required.</li> +<li><tt>DATACOMPLETE:</tt> Time when the payload was complete; +required.</li> +<li><tt>WRITEBYTES:</tt> Total number of bytes written; required.</li> +<li><tt>READBYTES:</tt> Total number of bytes read; required.</li> +<li><tt>DIDTIMEOUT:</tt> 1 if the request timed out, 0 otherwise; +optional.</li> +<li><tt>DATAPERCx:</tt> Time when x% of expected bytes were read for +x = { 10, 20, 30, 40, 50, 60, 70, 80, 90 }; optional.</li> +<li>Other measurement results, e.g., START_RENDCIRC, GOT_INTROCIRC, etc. +for hidden-service measurements; optional.</li> +</ul> +<li>Additional information +<ul> +<li><tt>LAUNCH:</tt> Time when the circuit was launched; optional.</li> +<li><tt>USED_AT:</tt> Time when this circuit was used; optional.</li> +<li><tt>PATH:</tt> List of relays in the circuit, separated by commas; +optional.</li> +<li><tt>BUILDTIMES:</tt> List of times when circuit hops were built, +separated by commas; optional.</li> +<li><tt>TIMEOUT:</tt> Circuit build timeout that the Tor client used when +building this circuit; optional.</li> +<li><tt>QUANTILE:</tt> Circuit build time quantile that the Tor client +uses to determine its circuit-build timeout; optional.</li> +<li><tt>CIRC_ID:</tt> Circuit identifier of the circuit used for this +measurement; optional.</li> +<li><tt>USED_BY:</tt> Stream identifier of the stream used for this +measurement; optional.</li> +<li>Other fields containing additional information; optional.</li> +</ul> +</ul> +<blockquote> -Torperf can produce two output files: <tt>.data</tt> and <tt>.extradata</tt>. -The <tt>.data</tt> file contains timestamps for nine substeps and the byte -summaries for downloading a test file via Tor. -The document below shows an example output of a Torperf run. -The timestamps in the upper part of this output are seconds and -microseconds since 1970-01-01 00:00:00.000000. +Torperf <tt>.tpf</tt> output lines for a single request to download a +50 KiB file (reformatted): + + + +<tt>BUILDTIMES=1.16901898384,1.86555600166,2.13295292854</tt> +<tt>CIRC_ID=9878</tt> +<tt>CONNECT=1338357901.42</tt> +<tt>DATACOMPLETE=1338357902.91</tt> +<tt>DATAPERC10=1338357902.48</tt> +<tt>DATAPERC20=1338357902.48</tt> +<tt>DATAPERC30=1338357902.61</tt> +<tt>DATAPERC40=1338357902.64</tt> +<tt>DATAPERC50=1338357902.65</tt> +<tt>DATAPERC60=1338357902.74</tt> +<tt>DATAPERC70=1338357902.74</tt> +<tt>DATAPERC80=1338357902.75</tt> +<tt>DATAPERC90=1338357902.79</tt> +<tt>DATAREQUEST=1338357901.83</tt> +<tt>DATARESPONSE=1338357902.25</tt> +<tt>DIDTIMEOUT=0</tt> +<tt>FILESIZE=51200</tt> +<tt>LAUNCH=1338357661.74</tt> +<tt>NEGOTIATE=1338357901.42</tt> +<tt>PATH=$980D326017CEF4CBBF4089FBABE767DC83D059AF,$03545609092A24C71CCAD2F4523F5CCC6714F159,$CAC3CF7154AE9C656C4096DC38B4EFA145905654</tt> +<tt>QUANTILE=0.800000</tt> +<tt>READBYTES=51442</tt> +<tt>REQUEST=1338357901.42</tt> +<tt>RESPONSE=1338357901.83</tt> +<tt>SOCKET=1338357901.42</tt> +<tt>SOURCE=torperf</tt> +<tt>START=1338357901.42</tt> +<tt>TIMEOUT=5049</tt> +<tt>USED_AT=1338357902.91</tt> +<tt>USED_BY=18869</tt> +<tt>WRITEBYTES=75</tt> +</blockquote> + +Torperf can produce two output files: <tt>.data</tt> and +<tt>.extradata</tt>. +The <tt>.data</tt> file contains timestamps for request substeps and the +byte summaries for downloading a test file via Tor. +The document below shows an example output of a Torperf run. +The timestamps are seconds and microseconds since 1970-01-01 +00:00:00.000000. Torperf can be configured to write <tt>.extradata</tt> files by attaching a Tor controller and writing certain controller events to disk. -The content of a <tt>.extradata</tt> line is shown in the lower part of -the document below. -The first column indicates if this circuit was actually used to fetch -the data (<tt>ok</tt>) or if Tor chose a different circuit because this -circuit was problematic (<tt>error</tt>). -For every <tt>error</tt> entry there should be a following <tt>ok</tt> entry, -unless the network of the Torperf instance is dead or the resource is -unavailable. -The circuit build completion time in the <tt>.extradata</tt> line is the -time between Torperf sent a SOCKS request and received a SOCKS response in -the <tt>.data</tt> file. -The three or more hops of the circuit are listed by relay fingerprint and -nickname. -An <tt>=</tt> sign between the two means that a relay has the <tt>Named</tt> -flag, whereas the <tt>~</tt> sign means it doesn't. +The format of a <tt>.extradata</tt> line is similar to the combined format +as specified above, except that it can only contain "Additional +information" keywords. <blockquote> -Torperf output lines for a single request to download a 50 KiB -file (reformatted and annotated with comments): +Torperf <tt>.data</tt> and <tt>.extradata</tt> output lines for a +single request to download a 50 KiB file (reformatted and annotated with +comments): <tt># Timestamps and byte summaries contained in .data files:</tt> -<tt>1293543301 762678 # Connection process started</tt> -<tt>1293543301 762704 # After socket is created</tt> -<tt>1293543301 763074 # After socket is connected</tt> -<tt>1293543301 763190 # After authentication methods are negotiated (SOCKS 5 only)</tt> -<tt>1293543301 763816 # After SOCKS request is sent</tt> -<tt>1293543302 901783 # After SOCKS response is received</tt> -<tt>1293543302 901818 # After HTTP request is written</tt> -<tt>1293543304 445732 # After first response is received</tt> -<tt>1293543305 456664 # After payload is complete</tt> +<tt>1338357901 422336 # Connection process started</tt> +<tt>1338357901 422346 # After socket is created</tt> +<tt>1338357901 422521 # After socket is connected</tt> +<tt>1338357901 422604 # After authentication methods are negotiated (SOCKS 5 only)</tt> +<tt>1338357901 423550 # After SOCKS request is sent</tt> +<tt>1338357901 839639 # After SOCKS response is received</tt> +<tt>1338357901 839849 # After HTTP request is written</tt> +<tt>1338357902 258157 # After first response is received</tt> +<tt>1338357902 914263 # After payload is complete</tt> <tt>75 # Written bytes</tt> <tt>51442 # Read bytes</tt> <tt>0 # Timeout (optional field)</tt> -<tt>1293543304 546828 # After 10% of expected bytes are read (optional field)</tt> -<tt>1293543304 647924 # After 20% of expected bytes are read (optional field)</tt> -<tt>1293543304 749012 # After 30% of expected bytes are read (optional field)</tt> -<tt>1293543304 850109 # After 40% of expected bytes are read (optional field)</tt> -<tt>1293543304 951201 # After 50% of expected bytes are read (optional field)</tt> -<tt>1293543305 052293 # After 60% of expected bytes are read (optional field)</tt> -<tt>1293543305 153381 # After 70% of expected bytes are read (optional field)</tt> -<tt>1293543305 254482 # After 80% of expected bytes are read (optional field)</tt> -<tt>1293543305 355579 # After 90% of expected bytes are read (optional field)</tt> -<tt></tt> +<tt>1338357902 481591 # After 10% of expected bytes are read (optional field)</tt> +<tt>1338357902 482719 # After 20% of expected bytes are read (optional field)</tt> +<tt>1338357902 613169 # After 30% of expected bytes are read (optional field)</tt> +<tt>1338357902 647108 # After 40% of expected bytes are read (optional field)</tt> +<tt>1338357902 651764 # After 50% of expected bytes are read (optional field)</tt> +<tt>1338357902 743705 # After 60% of expected bytes are read (optional field)</tt> +<tt>1338357902 743876 # After 70% of expected bytes are read (optional field)</tt> +<tt>1338357902 757475 # After 80% of expected bytes are read (optional field)</tt> +<tt>1338357902 795100 # After 90% of expected bytes are read (optional field)</tt> + + + <tt># Path information contained in .extradata files:</tt> -<tt>ok # Status code</tt> -<tt>1293543302 # Circuit build completion time</tt> -<tt>$2F265B37920BDFE474BF795739978EEFA4427510=fejk4 # 1st hop</tt> -<tt>$66CA87E164F1CFCE8C3BB5C095217A28578B8BAF=blutmagie3 # 2nd hop</tt> -<tt>$76997E6557828E8E57F70FDFBD93FB3AA470C620~Amunet8 # 3rd hop</tt> +<tt>CIRC_ID=9878</tt> +<tt>LAUNCH=1338357661.74</tt> +<tt>PATH=$980D326017CEF4CBBF4089FBABE767DC83D059AF,$03545609092A24C71CCAD2F4523F5CCC6714F159,$CAC3CF7154AE9C656C4096DC38B4EFA145905654</tt> +<tt>BUILDTIMES=1.16901898384,1.86555600166,2.13295292854</tt> +<tt>USED_AT=1338357902.91</tt> +<tt>USED_BY=18869</tt> +<tt>TIMEOUT=5049</tt> +<tt>QUANTILE=0.800000</tt> </blockquote> <hr>

1 0

[metrics-db/master] Tweak some Torperf-related log messages.
by karsten＠torproject.org 30 May '12

30 May '12

commit 2288810bad25e2a7639f3a9146abb01e5c6233f2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 30 08:18:32 2012 +0200 Tweak some Torperf-related log messages. --- src/org/torproject/ernie/db/TorperfDownloader.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/ernie/db/TorperfDownloader.java b/src/org/torproject/ernie/db/TorperfDownloader.java index ddd202a..058e29b 100644 --- a/src/org/torproject/ernie/db/TorperfDownloader.java +++ b/src/org/torproject/ernie/db/TorperfDownloader.java @@ -286,15 +286,15 @@ public class TorperfDownloader { * format, either with additional information from the .extradata * file or without it. */ if (lineD.isEmpty()) { - this.logger.finer("Skipping empty line " + dataFile.getName() + ":" - + d++ + "."); + this.logger.finer("Skipping empty line " + dataFile.getName() + + ":" + d++ + "."); lineD = brD.readLine(); continue; } SortedMap<String, String> data = this.parseDataLine(lineD); if (data == null) { - this.logger.warning("Skipping illegal line .data:" + d++ + " '" - + lineD + "'."); + this.logger.finer("Skipping illegal line " + dataFile.getName() + + ":" + d++ + " '" + lineD + "'."); lineD = brD.readLine(); continue; } @@ -332,8 +332,9 @@ public class TorperfDownloader { } extradata = this.parseExtradataLine(lineE); if (extradata == null) { - this.logger.warning("Skipping Illegal line .extradata:" + e++ - + " '" + lineE + "'."); + this.logger.finer("Skipping Illegal line " + + extradataFile.getName() + ":" + e++ + " '" + lineE + + "'."); lineE = brE.readLine(); continue; } @@ -364,8 +365,8 @@ public class TorperfDownloader { break; } else { this.logger.finer("Skipping " + extradataFile.getName() + ":" - + e++ + " which is too old to be merged with .data:" + d - + "."); + + e++ + " which is too old to be merged with " + + dataFile.getName() + ":" + d + "."); lineE = brE.readLine(); continue; }

1 0

[vidalia/alpha] Wrapper class for socket access in ControlSocket class
by chiiph＠torproject.org 30 May '12

30 May '12

commit 49c2f16a4ac4776544f076f954e701b2c8081a17 Author: Sebastian Baginski <sebthestampede(a)gmail.com> Date: Sun May 27 10:51:33 2012 +0200 Wrapper class for socket access in ControlSocket class --- changes/bug5519.2 | 3 + src/torcontrol/ControlSocket.cpp | 133 +++++++++++++++++++++++++++---------- src/torcontrol/ControlSocket.h | 19 +++--- 3 files changed, 110 insertions(+), 45 deletions(-) diff --git a/changes/bug5519.2 b/changes/bug5519.2 new file mode 100644 index 0000000..e619fc7 --- /dev/null +++ b/changes/bug5519.2 @@ -0,0 +1,3 @@ + Internal cleanups and improvements: + o Wrapper class for socket access in ControlSocket + class. Fixes ticket 5519. diff --git a/src/torcontrol/ControlSocket.cpp b/src/torcontrol/ControlSocket.cpp index fb5daa7..fd5f31e 100644 --- a/src/torcontrol/ControlSocket.cpp +++ b/src/torcontrol/ControlSocket.cpp @@ -19,26 +19,92 @@ #include "stringutil.h" +#include <QLocalSocket> +#include <QTcpSocket> + /** Timeout reads in 250ms. We can set this to a short value because if there * isn't any data to read, we want to return anyway. */ #define READ_TIMEOUT 250 +/** A simple helper class to wrap the sockets access code. */ +class ControlSocket::SocketWrapper{ + +public: + SocketWrapper(ControlMethod::Method method) + :_method(method) + { + _tcpSocket = new QTcpSocket(); + _localSocket = new QLocalSocket(); + } + + ~SocketWrapper() + { + delete _localSocket; + delete _tcpSocket; + } + + ControlMethod::Method getMethod() const + { + return _method; + } + + QIODevice * socket() const + { + if (_method == ControlMethod::Socket) + return _localSocket; + else + return _tcpSocket; + } + + bool isConnected() const + { + if (_method==ControlMethod::Socket) + return (_localSocket->isValid() && _localSocket->state() == QLocalSocket::ConnectedState); + else + return (_tcpSocket->isValid() && _tcpSocket->state() == QAbstractSocket::ConnectedState); + } + + void flush() + { + if (_method==ControlMethod::Socket) + _localSocket->flush(); + else + _tcpSocket->flush(); + } + + void connectToHost(const QHostAddress &address, quint16 port) + { + _tcpSocket->connectToHost(address, port); + } + + void disconnectFromHost() + { + _tcpSocket->disconnectFromHost(); + } + + void connectToServer(const QString &name) + { + _localSocket->connectToServer(name); + } + + void disconnectFromServer() + { + _localSocket->disconnectFromServer(); + } + +private: + QTcpSocket *_tcpSocket; /**< Socket used in the connection */ + QLocalSocket *_localSocket; /**< Socket used in the connection */ + ControlMethod::Method _method; /**< Connection method. */ +}; + + /** Default constructor. */ ControlSocket::ControlSocket(ControlMethod::Method method) { - _tcpSocket = new QTcpSocket(); - _localSocket = new QLocalSocket(); - _method = method; - switch(_method) { - case ControlMethod::Port: - _socket = _tcpSocket; - break; - - case ControlMethod::Socket: - _socket = _localSocket; - break; - } + _sock = new SocketWrapper(method); + _socket = _sock->socket(); QObject::connect(_socket, SIGNAL(readyRead()), this, SIGNAL(readyRead())); QObject::connect(_socket, SIGNAL(disconnected()), this, SIGNAL(disconnected())); @@ -47,54 +113,57 @@ ControlSocket::ControlSocket(ControlMethod::Method method) this, SIGNAL(error(QAbstractSocket::SocketError))); } +/** Destructor. */ +ControlSocket::~ControlSocket() +{ + delete _sock; +} + /** Returns true if the control socket is connected and ready to send or * receive. */ bool -ControlSocket::isConnected() +ControlSocket::isConnected() const { - switch(_method) { - case ControlMethod::Port: - return (_tcpSocket->isValid() && _tcpSocket->state() == QAbstractSocket::ConnectedState); - break; + return _sock->isConnected(); +} - default: - case ControlMethod::Socket: - return (_localSocket->isValid() && _localSocket->state() == QLocalSocket::ConnectedState); - break; - } +ControlMethod::Method +ControlSocket::getMethod() const +{ + return _sock->getMethod(); } /** Connects to address:port */ void ControlSocket::connectToHost(const QHostAddress &address, quint16 port) { - _tcpSocket->connectToHost(address, port); + _sock->connectToHost(address, port); } /** Disconnects from host */ void ControlSocket::disconnectFromHost() { - _tcpSocket->disconnectFromHost(); + _sock->disconnectFromHost(); } /** Connects to a unix socket file */ void ControlSocket::connectToServer(const QString &name) { - _localSocket->connectToServer(name); + _sock->connectToServer(name); } /** Disconnects from the socket */ void ControlSocket::disconnectFromServer() { - _localSocket->disconnectFromServer(); + _sock->disconnectFromServer(); } /** Interface to QTcpSocket::canReadLine */ bool -ControlSocket::canReadLine() +ControlSocket::canReadLine() const { return _socket->canReadLine(); } @@ -174,15 +243,7 @@ ControlSocket::sendCommand(ControlCommand cmd, QString *errmsg) return err(errmsg, tr("Error sending control command. [%1]") .arg(_socket->errorString())); } - switch(_method) { - case ControlMethod::Port: - _tcpSocket->flush(); - break; - - case ControlMethod::Socket: - _localSocket->flush(); - break; - } + _sock->flush(); return true; } diff --git a/src/torcontrol/ControlSocket.h b/src/torcontrol/ControlSocket.h index 27e65b7..77ed282 100644 --- a/src/torcontrol/ControlSocket.h +++ b/src/torcontrol/ControlSocket.h @@ -20,9 +20,8 @@ #include "ControlReply.h" #include "ControlMethod.h" -#include <QtCore> -#include <QLocalSocket> -#include <QTcpSocket> +#include <QObject> +#include <QAbstractSocket> class ControlSocket : public QObject { @@ -31,6 +30,8 @@ class ControlSocket : public QObject public: /** Default constructor. */ ControlSocket(ControlMethod::Method method = ControlMethod::Port); + /** Destructor. */ + ~ControlSocket(); /** Send a command to Tor */ bool sendCommand(ControlCommand cmd, QString *errmsg = 0); @@ -39,9 +40,9 @@ public: /** Returns true if the control socket is connected and ready to send or * receive. */ - bool isConnected(); + bool isConnected() const; /** Interface to each socket's canReadLine implementation */ - bool canReadLine(); + bool canReadLine() const; void connectToHost(const QHostAddress &address, quint16 port); /** Disconnects from host */ @@ -51,7 +52,7 @@ public: /** Disconnects from the socket */ void disconnectFromServer(); - ControlMethod::Method getMethod() { return _method; } + ControlMethod::Method getMethod() const; /** Returns the string description of error. */ static QString toString(const QAbstractSocket::SocketError error); @@ -73,10 +74,10 @@ protected: bool readLine(QString &line, QString *errmsg = 0); private: - QTcpSocket *_tcpSocket; /**< Socket used in the connection */ - QLocalSocket *_localSocket; /**< Socket used in the connection */ + class SocketWrapper; + + SocketWrapper * _sock; /**< Helper object to convenient use both sockets */ QIODevice *_socket; /**< Abstract pointer to transparently use both sockets */ - ControlMethod::Method _method; }; #endif

1 0

[vidalia/alpha] fix for possible infinite loop in ControlConnection
by chiiph＠torproject.org 30 May '12

30 May '12

commit 6205ea37dc834390f4a21be8ad75939e7827064a Author: Sebastian Baginski <sebthestampede(a)gmail.com> Date: Sat May 26 13:17:16 2012 +0200 fix for possible infinite loop in ControlConnection --- changes/bug5519 | 3 +++ src/torcontrol/ControlConnection.cpp | 31 ++++++++++++++++++++----------- src/torcontrol/ControlConnection.h | 2 ++ 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/changes/bug5519 b/changes/bug5519 new file mode 100644 index 0000000..461fd6b --- /dev/null +++ b/changes/bug5519 @@ -0,0 +1,3 @@ + Internal cleanups and improvements: + o Fix possible infinite loop in ControlConnection + object. Fixes bug 5519. diff --git a/src/torcontrol/ControlConnection.cpp b/src/torcontrol/ControlConnection.cpp index 389a6e3..8141733 100644 --- a/src/torcontrol/ControlConnection.cpp +++ b/src/torcontrol/ControlConnection.cpp @@ -112,17 +112,7 @@ ControlConnection::connect() void ControlConnection::disconnect() { - /** If there are any messages waiting for a response, clear them. */ - if (_sendWaiter->status() == SendCommandEvent::SendWaiter::Waiting) - _sendWaiter->setResult(false, tr("Control socket is not connected.")); - - while (!_recvQueue.isEmpty()) { - ReceiveWaiter *w = _recvQueue.dequeue(); - w->setResult(false, ControlReply(), - tr("Control socket is not connected.")); - - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - } + clearCommandQueue(); setStatus(Disconnecting); @@ -140,6 +130,23 @@ ControlConnection::disconnect() _sock->disconnect(this); } +/** Clears all waiting commands. */ +void +ControlConnection::clearCommandQueue() +{ + /** If there are any messages waiting for a response, clear them. */ + if (_sendWaiter->status() == SendCommandEvent::SendWaiter::Waiting) + _sendWaiter->setResult(false, tr("Control socket is not connected.")); + + while (!_recvQueue.isEmpty()) { + ReceiveWaiter *w = _recvQueue.dequeue(); + w->setResult(false, ControlReply(), + tr("Control socket is not connected.")); + + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } +} + /** Called when the control socket is connected. This method checks that the * control protocol version of the Tor we connected to is at least V1. */ void @@ -241,6 +248,8 @@ ControlConnection::setStatus(Status status) .arg(statusString(_status)) .arg(statusString(status)); _status = status; + if (_status == Disconnected) + clearCommandQueue(); } /** Sends a control command to Tor and waits for the reply. */ diff --git a/src/torcontrol/ControlConnection.h b/src/torcontrol/ControlConnection.h index 0ce8940..8bd9020 100644 --- a/src/torcontrol/ControlConnection.h +++ b/src/torcontrol/ControlConnection.h @@ -90,6 +90,8 @@ private: void setStatus(Status status); /** Returns the string description of status. */ QString statusString(Status status); + /** Clears all waiting commands. */ + void clearCommandQueue(); /** Main thread implementation. */ void run();

1 0

[vidalia/alpha] Remove Find bridges button and the rest of the functionality
by chiiph＠torproject.org 30 May '12

30 May '12

commit ea29851d943845c8b0f7b976bdabf1b78e137434 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon May 14 11:33:28 2012 -0300 Remove Find bridges button and the rest of the functionality --- src/vidalia/CMakeLists.txt | 31 ++--- src/vidalia/config/BridgeDownloader.cpp | 149 -------------------- src/vidalia/config/BridgeDownloader.h | 122 ---------------- .../config/BridgeDownloaderProgressDialog.cpp | 90 ------------ .../config/BridgeDownloaderProgressDialog.h | 83 ----------- .../config/BridgeDownloaderProgressDialog.ui | 73 ---------- src/vidalia/config/NetworkPage.cpp | 91 ------------ src/vidalia/config/NetworkPage.h | 15 -- src/vidalia/config/NetworkPage.ui | 79 +---------- 9 files changed, 19 insertions(+), 714 deletions(-) diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index 30e2a9f..0ccbdad 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -1,12 +1,12 @@ ## ## $Id$ -## +## ## 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 +## 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 +## 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. ## @@ -65,7 +65,7 @@ configure_file( add_subdirectory(i18n) ## About dialog sources -set(vidalia_SRCS +set(vidalia_SRCS about/AboutDialog.cpp about/LicenseDialog.cpp ) @@ -106,8 +106,6 @@ set(vidalia_SRCS ${vidalia_SRCS} config/AbstractTorSettings.cpp config/AdvancedPage.cpp config/AppearancePage.cpp - config/BridgeDownloader.cpp - config/BridgeDownloaderProgressDialog.cpp config/BridgeUsageDialog.cpp config/ConfigDialog.cpp config/ConfigPageStack.cpp @@ -134,8 +132,6 @@ qt4_wrap_cpp(vidalia_SRCS config/AbstractTorSettings.h config/AdvancedPage.h config/AppearancePage.h - config/BridgeDownloader.h - config/BridgeDownloaderProgressDialog.h config/BridgeUsageDialog.h config/ConfigDialog.h config/ConfigPage.h @@ -212,7 +208,6 @@ qt4_wrap_ui(vidalia_SRCS bwgraph/BandwidthGraph.ui config/AdvancedPage.ui config/AppearancePage.ui - config/BridgeDownloaderProgressDialog.ui config/BridgeUsageDialog.ui config/ConfigDialog.ui config/GeneralPage.ui @@ -320,7 +315,7 @@ qt4_wrap_cpp(vidalia_SRCS if (APPLE) ## Set the output file name (make it uppercase on OS X) set(vidalia_BIN Vidalia) - + ## Create an OS X application bundle set(MACOSX_BUNDLE_BUNDLE_NAME Vidalia) set(MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION}) @@ -334,10 +329,10 @@ if (APPLE) set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/) add_executable(${vidalia_BIN} MACOSX_BUNDLE ${vidalia_SRCS}) - ## Specify location of custom Info.plist file + ## Specify location of custom Info.plist file configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in ${CMAKE_CURRENT_BINARY_DIR}/MacOSXBundleInfo.plist) - set_target_properties(${vidalia_BIN} PROPERTIES MACOSX_BUNDLE_INFO_PLIST + set_target_properties(${vidalia_BIN} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/MacOSXBundleInfo.plist) ## Get the location of the app bundle for the current configuration @@ -352,7 +347,7 @@ if (APPLE) COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${MACOSX_BUNDLE_DIRECTORY}/share/tor COMMAND cp - ARGS ${CMAKE_CURRENT_SOURCE_DIR}/res/icons/*.icns + ARGS ${CMAKE_CURRENT_SOURCE_DIR}/res/icons/*.icns ${MACOSX_BUNDLE_DIRECTORY}/Contents/Resources/ ) @@ -367,7 +362,7 @@ if (APPLE) COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${outdir} COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different + ARGS -E copy_if_different ${MARBLE_DATA_DIR}/${it} ${outdir}/${outfile} ) endforeach(it) @@ -376,7 +371,7 @@ if (APPLE) if (MARBLE_PLUGINS) add_custom_command(TARGET ${vidalia_BIN} POST_BUILD COMMAND ${CMAKE_COMMAND} - ARGS -E make_directory + ARGS -E make_directory ${MACOSX_BUNDLE_DIRECTORY}/Contents/Resources/plugins ) foreach(it ${MARBLE_PLUGINS}) @@ -407,7 +402,7 @@ else(APPLE) COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${outdir} COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different ${MARBLE_DATA_DIR}/${it} + ARGS -E copy_if_different ${MARBLE_DATA_DIR}/${it} ${CMAKE_CURRENT_BINARY_DIR}/data/${it} ) endforeach(it) @@ -421,7 +416,7 @@ else(APPLE) foreach(it ${MARBLE_PLUGINS}) add_custom_command(TARGET ${vidalia_BIN} POST_BUILD COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different ${it} + ARGS -E copy_if_different ${it} ${CMAKE_CURRENT_BINARY_DIR}/plugins/marble/ ) endforeach(it) diff --git a/src/vidalia/config/BridgeDownloader.cpp b/src/vidalia/config/BridgeDownloader.cpp deleted file mode 100644 index 1cf47ea..0000000 --- a/src/vidalia/config/BridgeDownloader.cpp +++ /dev/null @@ -1,149 +0,0 @@ -/* -** 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 BridgeDownloader.cpp -** \brief Downloads a list of new bridge addresses via HTTPS -*/ - -#include "BridgeDownloader.h" -#include "Vidalia.h" - -#define BRIDGEDB_HOST "bridges.torproject.org" -#define BRIDGEDB_PORT 443 - -BridgeDownloader::BridgeDownloader(QObject *parent) - : QObject(parent) -{ - _https = new QNetworkAccessManager(); - - connect(_https, SIGNAL(finished(QNetworkReply *)), - this, SLOT(httpsRequestFinished(QNetworkReply *))); - connect(_https, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)), - this, SLOT(sslErrors(QNetworkReply *, QList<QSslError>))); -} - -void -BridgeDownloader::setProxy(const QString &host, int port, - const QString &username, const QString &password) -{ - _https->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, host, port, username, password)); -} - -bool -BridgeDownloader::downloadBridges(BridgeDownloadMethod method) -{ - if (! isMethodSupported(method)) - return false; - - switch (method) { - case DownloadMethodHttps: - startHttpsDownload(); - break; - - default: - break; - } - return true; -} - -bool -BridgeDownloader::isMethodSupported(BridgeDownloadMethod method) -{ - switch (method) { - case DownloadMethodHttps: - return QSslSocket::supportsSsl(); - - default: - break; - } - return false; -} - -void -BridgeDownloader::startHttpsDownload() -{ - emit statusChanged(tr("Starting HTTPS bridge request...")); - emit downloadProgress(0, 0); - - _reply = _https->get(QNetworkRequest(QUrl("https://bridges.torproject.org/?format=plain"))); - connect(_reply, SIGNAL(downloadProgress(qint64, qint64)), - this, SIGNAL(downloadProgress(qint64, qint64))); - vInfo("Sending an HTTPS bridge request to %1:%2.").arg(BRIDGEDB_HOST) - .arg(BRIDGEDB_PORT); -} - -void -BridgeDownloader::cancelBridgeRequest() -{ - _reply->close(); - disconnect(_reply, 0, 0, 0); -} - -void -BridgeDownloader::httpsStateChanged(int state) -{ - switch (state) { - case QHttp::Connecting: - emit statusChanged(tr("Connecting to %1:%2...").arg(BRIDGEDB_HOST) - .arg(BRIDGEDB_PORT)); - break; - - case QHttp::Sending: - emit statusChanged(tr("Sending an HTTPS request for bridges...")); - break; - - case QHttp::Reading: - emit statusChanged(tr("Downloading a list of bridges...")); - break; - - default: - break; - } -} - -void -BridgeDownloader::httpsRequestFinished(QNetworkReply *reply) -{ - if (reply->error() != QNetworkReply::NoError) { - QString errorString = reply->errorString(); - vWarn("Bridge request failed: %2").arg(errorString); - - emit bridgeRequestFailed(errorString); - } else { - QByteArray response = reply->readAll(); - vInfo("Bridge request complete: received %2 bytes.").arg(response.size()); - - QStringList bridges, lines = QString(response).split("\n"); - foreach (QString line, lines) { - line = line.trimmed(); - if (line.startsWith("bridge ", Qt::CaseInsensitive)) - bridges << line; - } - emit bridgeRequestFinished(bridges); - } - _reply->close(); - disconnect(_reply,0,0,0); -} - -void -BridgeDownloader::sslErrors(QNetworkReply *reply, const QList<QSslError> &sslErrors) -{ - QString errorString; - QStringList errorStrings; - - vWarn("%1 SSL error(s) when requesting bridge information:") - .arg(sslErrors.size()); - foreach (QSslError sslError, sslErrors) { - errorString = sslError.errorString(); - errorStrings << errorString; - vWarn(" SSL Error: %1").arg(errorString); - } -} diff --git a/src/vidalia/config/BridgeDownloader.h b/src/vidalia/config/BridgeDownloader.h deleted file mode 100644 index 7bef313..0000000 --- a/src/vidalia/config/BridgeDownloader.h +++ /dev/null @@ -1,122 +0,0 @@ -/* -** 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 BridgeDownloader.h -** \brief Downloads a list of new bridge addresses via HTTPS -*/ - -#ifndef _BRIDGEDOWNLOADER_H -#define _BRIDGEDOWNLOADER_H - -#include <QtNetwork> - -class BridgeDownloader : public QObject -{ - Q_OBJECT - -public: - /** Available bridge download methods. */ - enum BridgeDownloadMethod { - DownloadMethodHttps, /** Download via an HTTPS connection. */ - }; - - /** Default constructor. - */ - BridgeDownloader(QObject *parent = 0); - - /** Initiates a request for a set of bridges using the specified - * download method. Returns true if the request was initiated - * successfully, or false on error. - */ - bool downloadBridges(BridgeDownloadMethod method); - - /** Enables HTTPS proxy support, using the proxy server host on - * port port. A username and password can also - * optionally be supplied, if required by the proxy. - */ - void setProxy(const QString &host, int port, - const QString &username = QString(), - const QString &password = QString()); - - /** Returns true if method is supported by the currently - * available Qt libraries. - */ - static bool isMethodSupported(BridgeDownloadMethod method); - -public slots: - /** Cancels any pending bridge download requests. - */ - void cancelBridgeRequest(); - -signals: - /** Emitted when the underlying QHttp object reads data from an HTTPS - * response. done indicates how many bytes out of total - * have been read so far. Note that total may be 0 if the expected - * total size of the response is not known. - */ - void downloadProgress(qint64 done, qint64 total); - - /** Emitted when the status of the bridge request changes. status - * describes the new current state of the request. - */ - void statusChanged(const QString &status); - - /** Emitted when the previous request for bridge addresses completes - * successfully. The QStringList bridges contains a (possibly empty) - * list of bridge addresses parsed from the received response. - */ - void bridgeRequestFinished(const QStringList &bridges); - - /** Emitted when the previous request for bridge addresses fails. The - * QString error is a human-readable string describing the error - * encountered. - */ - void bridgeRequestFailed(const QString &error); - -private slots: - /** Called when the state of the underlying QHttp object changes. A - * statusChanged() signal is emitted with the appropriate text - * describing the new state of the request. - */ - void httpsStateChanged(int state); - - /** Called when the underlying QHttp object used to make the bridge - * request completes. error is set to false if the request was - * successful, or true if the request failed. If id does not - * match the request ID previously returned by QHttp::get(), then the - * signal is ignored since it is the result of a close() or abort() - * request. - */ - void httpsRequestFinished(QNetworkReply *reply); - - /** Called when the HTTPS connection encounters one or more - * sslErrors. Currently the errors are just logged and - * bridgeRequestFailed() is not emitted, since QHttp will also - * emit - */ - void sslErrors(QNetworkReply *, const QList<QSslError> &sslErrors); - -private: - /** Initiates an HTTPS connection to bridges.torproject.org to start - * downloading a set of bridges. - */ - void startHttpsDownload(); - - /** Used to connect to the bridge database, send an HTTPS request for - * new bridge addresses and then read the response. */ - QNetworkAccessManager* _https; - - /** Identifier of the current bridge request */ - QNetworkReply *_reply; -}; - -#endif - diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp deleted file mode 100644 index 9150988..0000000 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp +++ /dev/null @@ -1,90 +0,0 @@ -/* -** 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 BridgeDownloaderProgressDialog.cpp -** \brief Displays the progress of a request for bridge addresses -*/ - -#include "BridgeDownloaderProgressDialog.h" - -#include <QTimer> - - -BridgeDownloaderProgressDialog::BridgeDownloaderProgressDialog(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - - connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), - this, SLOT(buttonClicked(QAbstractButton *))); - - setModal(true); -} - -void -BridgeDownloaderProgressDialog::setVisible(bool visible) -{ - if (visible) { - ui.progressBar->setRange(0, 0); - ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel); - } - QDialog::setVisible(visible); -} - -void -BridgeDownloaderProgressDialog::setStatus(const QString &status) -{ - ui.lblStatus->setText(status); -} - -void -BridgeDownloaderProgressDialog::setDownloadProgress(qint64 done, qint64 total) -{ - ui.progressBar->setRange(0, total); - ui.progressBar->setValue(done); -} - -void -BridgeDownloaderProgressDialog::bridgeRequestFinished(const QStringList &bridges) -{ - Q_UNUSED(bridges); - - accept(); -} - -void -BridgeDownloaderProgressDialog::bridgeRequestFailed(const QString &error) -{ - ui.lblStatus->setText(tr("Unable to download bridges: %1").arg(error)); - - ui.progressBar->setRange(0, 1); - ui.progressBar->setValue(1); - - ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel - | QDialogButtonBox::Retry - | QDialogButtonBox::Help); -} - -void -BridgeDownloaderProgressDialog::buttonClicked(QAbstractButton *button) -{ - int standardButton = ui.buttonBox->standardButton(button); - if (standardButton == QDialogButtonBox::Retry) { - setStatus(tr("Retrying bridge request...")); - setDownloadProgress(0, 0); - ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel); - - QTimer::singleShot(1000, this, SIGNAL(retry())); - } else { - done(standardButton); - } -} - diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.h b/src/vidalia/config/BridgeDownloaderProgressDialog.h deleted file mode 100644 index 34f15c2..0000000 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.h +++ /dev/null @@ -1,83 +0,0 @@ -/* -** 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 BridgeDownloaderProgressDialog.h -** \brief Displays the progress of a request for bridge addresses -*/ - -#ifndef _BRIDGEDOWNLOADERPROGRESSDIALOG_H -#define _BRIDGEDOWNLOADERPROGRESSDIALOG_H - -#include "ui_BridgeDownloaderProgressDialog.h" - -#include <QDialog> - - -class BridgeDownloaderProgressDialog : public QDialog -{ - Q_OBJECT - -public: - /** Default constructor. - */ - BridgeDownloaderProgressDialog(QWidget *parent = 0); - -public slots: - /** Sets the status message text in the dialog to status. - */ - void setStatus(const QString &status); - - /** Updates the bridge download progress bar to value out of - * maximum steps. If value and maximum are both 0, - * then a "busy" progress bar is displayed. - */ - void setDownloadProgress(qint64 value, qint64 maximum); - - /** Called when the bridge download completes successfully and discards - * the progress dialog with an Accept result code. bridges - * contains the list of bridges downloaded, but is currently ignored. - */ - void bridgeRequestFinished(const QStringList &bridges); - - /** Called when the bridge download fails. The string error - * provides a human-readable description of the reason the download - * failed, which is displayed for the user. - */ - void bridgeRequestFailed(const QString &error); - -signals: - /** Emitted when the user clicks the "Retry" button after a previous - * bridge request has failed. - */ - void retry(); - -protected: - /** Overloaded method called when the progress dialog is first shown in - * order to initialize the progress bar, status text and dialog button - * box. - */ - virtual void setVisible(bool visible); - -private slots: - /** Called when button is clicked in the progress dialog's - * QDialogButtonBox. Dismisses the dialog and sets the result code to - * the QDialogButtonBox::StandardButton enum value indicated by - * button. - */ - void buttonClicked(QAbstractButton *button); - -private: - /**< Qt Designer generated object. */ - Ui::BridgeDownloaderProgressDialog ui; -}; - -#endif - diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.ui b/src/vidalia/config/BridgeDownloaderProgressDialog.ui deleted file mode 100644 index 84210a6..0000000 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.ui +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>BridgeDownloaderProgressDialog</class> - <widget class="QDialog" name="BridgeDownloaderProgressDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>366</width> - <height>105</height> - </rect> - </property> - <property name="windowTitle"> - <string>Downloading Bridges</string> - </property> - <property name="windowIcon"> - <iconset resource="../res/vidalia.qrc"> - <normaloff>:/images/32x32/network-workgroup.png</normaloff>:/images/32x32/network-workgroup.png</iconset> - </property> - <property name="modal"> - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" rowspan="2"> - <widget class="QLabel" name="lblPixmap"> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../res/vidalia.qrc">:/images/48x48/network-workgroup.png</pixmap> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="lblStatus"> - <property name="text"> - <string/> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QProgressBar" name="progressBar"> - <property name="value"> - <number>0</number> - </property> - <property name="textVisible"> - <bool>false</bool> - </property> - <property name="format"> - <string/> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel</set> - </property> - </widget> - </item> - </layout> - </widget> - <resources> - <include location="../res/vidalia.qrc"/> - </resources> - <connections/> -</ui> diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index a520996..beeb075 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -17,7 +17,6 @@ #include "NetworkSettings.h" #include "VMessageBox.h" #include "Vidalia.h" -#include "BridgeDownloaderProgressDialog.h" #include "DomainValidator.h" #include "stringutil.h" @@ -52,7 +51,6 @@ NetworkPage::NetworkPage(QWidget *parent) connect(ui.lineBridge, SIGNAL(returnPressed()), this, SLOT(addBridge())); connect(ui.lblHelpFindBridges, SIGNAL(linkActivated(QString)), this, SLOT(onLinkActivated(QString))); - connect(ui.btnFindBridges, SIGNAL(clicked()), this, SLOT(findBridges())); connect(ui.cmboProxyType, SIGNAL(currentIndexChanged(int)), this, SLOT(proxyTypeChanged(int))); @@ -63,17 +61,6 @@ NetworkPage::NetworkPage(QWidget *parent) ui.listBridges, this, SLOT(copySelectedBridgesToClipboard())); - if (! BridgeDownloader::isMethodSupported(BridgeDownloader::DownloadMethodHttps)) { - ui.btnFindBridges->setVisible(false); - ui.lblHelpFindBridges->setText( - tr("<a href=\"bridges.finding\">How can I find bridges?</a>")); - _bridgeDownloader = 0; - } else { - _bridgeDownloader = new BridgeDownloader(this); - connect(_bridgeDownloader, SIGNAL(bridgeRequestFinished(QStringList)), - this, SLOT(bridgeRequestFinished(QStringList))); - } - #if defined(Q_WS_MAC) /* On OS X, the network page looks better without frame titles. Everywhere * else needs titles or else there's a break in the frame border. */ @@ -334,84 +321,6 @@ NetworkPage::load() ui.listBridges->addItems(_settings->getBridgeList()); } -/** Called when the user clicks the "Find Bridges Now" button. - * Attempts to establish an HTTPS connection to bridges.torproject.org - * and download one or more bridge addresses. */ -void -NetworkPage::findBridges() -{ - BridgeDownloaderProgressDialog *dlg = new BridgeDownloaderProgressDialog(this); - - connect(_bridgeDownloader, SIGNAL(statusChanged(QString)), - dlg, SLOT(setStatus(QString))); - connect(_bridgeDownloader, SIGNAL(downloadProgress(qint64, qint64)), - dlg, SLOT(setDownloadProgress(qint64, qint64))); - connect(_bridgeDownloader, SIGNAL(bridgeRequestFailed(QString)), - dlg, SLOT(bridgeRequestFailed(QString))); - connect(_bridgeDownloader, SIGNAL(bridgeRequestFinished(QStringList)), - dlg, SLOT(bridgeRequestFinished(QStringList))); - connect(dlg, SIGNAL(retry()), this, SLOT(startBridgeRequest())); - - startBridgeRequest(); - switch (dlg->exec()) { - case QDialogButtonBox::Cancel: - _bridgeDownloader->cancelBridgeRequest(); - break; - - case QDialogButtonBox::Help: - emit helpRequested("bridges.finding"); - break; - } - - delete dlg; -} - -/** Starts a new request for additional bridge addresses. */ -void -NetworkPage::startBridgeRequest() -{ - if (ui.chkUseProxy->isChecked() && - ui.cmboProxyType->currentIndex() == NetworkSettings::HttpHttpsProxy) { - _bridgeDownloader->setProxy(ui.lineProxyAddress->text(), - ui.lineProxyPort->text().toUInt(), - ui.lineProxyUsername->text(), - ui.lineProxyPassword->text()); - } - - _bridgeDownloader->downloadBridges(BridgeDownloader::DownloadMethodHttps); -} - -/** Called when a previous bridge request initiated by the findBridges() - * method has completed. bridges contains a list of all bridges - * received. */ -void -NetworkPage::bridgeRequestFinished(const QStringList &bridges) -{ - bool foundNewBridges = false; - - foreach (QString bridge, bridges) { - QString address = bridge.trimmed().split(" ").at(1); - if (ui.listBridges->findItems(address, Qt::MatchContains).isEmpty()) { - ui.listBridges->addItem(address); - foundNewBridges = true; - } - } - - if (! foundNewBridges) { - QMessageBox dlg(this); - dlg.setIcon(QMessageBox::Information); - dlg.setText(tr("No new bridges are currently available. You can either " - "wait a while and try again, or try another method of " - "finding new bridges.")); - dlg.setInformativeText(tr("Click Help to see other methods of finding " - "new bridges.")); - dlg.setStandardButtons(QMessageBox::Ok | QMessageBox::Help); - - if (dlg.exec() == QMessageBox::Help) - emit helpRequested("bridges.finding"); - } -} - /** Disable proxy username and password fields when the user wants to use * a SOCKS 4 proxy. */ void diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h index c8a2cad..db52db7 100644 --- a/src/vidalia/config/NetworkPage.h +++ b/src/vidalia/config/NetworkPage.h @@ -19,7 +19,6 @@ #include "ui_NetworkPage.h" #include "ConfigPage.h" #include "Vidalia.h" -#include "BridgeDownloader.h" class NetworkSettings; @@ -69,26 +68,12 @@ private slots: /** Called when a link in a label is clicked. url is the target of * the clicked link.*/ void onLinkActivated(const QString &url); - /** Called when the user clicks the "Find Bridges Now" button. Calls - * startBridgeRequest() to start a new request for additional bridge - * addresses, and displays a progress dialog for the user. */ - void findBridges(); - /** Starts a new request for additional bridge addresses. */ - void startBridgeRequest(); - /** Called when a previous bridge request initiated by the findBridges() - * method has completed. bridges contains a list of all bridges - * received. */ - void bridgeRequestFinished(const QStringList &bridges); /** Disable proxy username and password fields when the user wants to use * a SOCKS 4 proxy. */ void proxyTypeChanged(int selection); private: - /** Helper class used to facilitate downloading one or more bridge - * addresses. */ - BridgeDownloader* _bridgeDownloader; - /** Qt Designer generated object */ Ui::NetworkPage ui; diff --git a/src/vidalia/config/NetworkPage.ui b/src/vidalia/config/NetworkPage.ui index 4704604..3fc301b 100644 --- a/src/vidalia/config/NetworkPage.ui +++ b/src/vidalia/config/NetworkPage.ui @@ -14,12 +14,6 @@ <enum>Qt::NoContextMenu</enum> </property> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> <item> <widget class="QCheckBox" name="chkUseProxy"> <property name="toolTip"> @@ -57,12 +51,6 @@ <string>Proxy Settings</string> </property> <layout class="QGridLayout"> - <property name="margin"> - <number>9</number> - </property> - <property name="spacing"> - <number>6</number> - </property> <item row="0" column="0"> <widget class="QLabel" name="lblProxyAddress"> <property name="text"> @@ -75,12 +63,6 @@ </item> <item row="0" column="1" colspan="2"> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QLineEdit" name="lineProxyAddress"/> </item> @@ -118,12 +100,6 @@ </item> <item row="1" column="1" colspan="2"> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QLineEdit" name="lineProxyUsername"/> </item> @@ -148,7 +124,7 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -206,12 +182,6 @@ <string>Firewall Settings</string> </property> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> <item> <widget class="QLabel" name="lblReachablePorts"> <property name="text"> @@ -263,20 +233,8 @@ <string>Bridge Settings</string> </property> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> <item> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QLabel" name="lblAddBridge"> <property name="text"> @@ -289,7 +247,7 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -301,20 +259,8 @@ </item> <item> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QLineEdit" name="lineBridge"> <property name="maxLength"> @@ -336,12 +282,6 @@ </item> <item> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QToolButton" name="btnAddBridge"> <property name="text"> @@ -392,7 +332,7 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height> @@ -407,19 +347,12 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> - <widget class="QPushButton" name="btnFindBridges"> - <property name="text"> - <string>Find Bridges Now</string> - </property> - </widget> - </item> - <item> <widget class="QLabel" name="lblHelpFindBridges"> <property name="cursor"> <cursorShape>PointingHandCursor</cursorShape> </property> <property name="text"> - <string><a href="bridges.finding">How else can I find bridges?</a></string> + <string><a href="bridges.finding">How can I find bridges?</a></string> </property> </widget> </item> @@ -428,7 +361,7 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -446,7 +379,7 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height>

1 0

[vidalia/alpha] Make PluginPath follow the path convention
by chiiph＠torproject.org 30 May '12

30 May '12

commit 1648525c7adca264857cd2d919168244fa51b29f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun May 20 15:43:37 2012 -0300 Make PluginPath follow the path convention --- src/vidalia/plugin/PluginEngine.cpp | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/vidalia/plugin/PluginEngine.cpp b/src/vidalia/plugin/PluginEngine.cpp index a263753..097ed1e 100644 --- a/src/vidalia/plugin/PluginEngine.cpp +++ b/src/vidalia/plugin/PluginEngine.cpp @@ -39,7 +39,12 @@ PluginEngine::PluginEngine(QObject *parent) globalObject().setProperty("sleep", newFunction(sleep)); VidaliaSettings settings; - globalObject().setProperty("pluginPath", QScriptValue(settings.pluginPath())); + QDir path(settings.pluginPath()); + if(path.isRelative()) { + path.setPath(QApplication::applicationDirPath() + "/" + settings.pluginPath()); + } + + globalObject().setProperty("pluginPath", QScriptValue(path.canonicalPath())); DebugDialog::outputDebug("Available extensions:"); foreach(QString ext, availableExtensions()) @@ -58,9 +63,12 @@ PluginEngine::loadAllPlugins() DebugDialog::outputDebug("Loading all plugins..."); VidaliaSettings settings; - QDir path = QDir(settings.pluginPath()); + QDir path(settings.pluginPath()); + if(path.isRelative()) { + path.setPath(QApplication::applicationDirPath() + "/" + settings.pluginPath()); + } - DebugDialog::outputDebug(QString("PluginPath=%1").arg(path.absolutePath())); + DebugDialog::outputDebug(QString("PluginPath=%1").arg(path.canonicalPath())); foreach(QString pdir, path.entryList(QDir::NoDotAndDotDot|QDir::AllDirs)) { QFileInfo finfo(QString("%1%2%3")

1 0

[vidalia/alpha] Make sure there is a ReceiveWaiter in the queue before sending any control commands
by chiiph＠torproject.org 30 May '12

30 May '12

commit 594bacda9e5550c3bf4032328babccc959c54cdb Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri May 25 18:45:55 2012 -0300 Make sure there is a ReceiveWaiter in the queue before sending any control commands --- changes/raceCondition | 3 +++ src/torcontrol/ControlConnection.cpp | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/changes/raceCondition b/changes/raceCondition new file mode 100644 index 0000000..82e4b3c --- /dev/null +++ b/changes/raceCondition @@ -0,0 +1,3 @@ + Internal cleanups and improvements: + o Make sure there is a ReceiveWaiter in the queue before issuing a + ControlCommand to avoid deadlocks in the event loop. \ No newline at end of file diff --git a/src/torcontrol/ControlConnection.cpp b/src/torcontrol/ControlConnection.cpp index 389a6e3..6497147 100644 --- a/src/torcontrol/ControlConnection.cpp +++ b/src/torcontrol/ControlConnection.cpp @@ -251,21 +251,24 @@ ControlConnection::send(const ControlCommand &cmd, bool result = false; QString errstr; - if (send(cmd, &errstr)) { - /* Create and enqueue a new receive waiter */ - ReceiveWaiter *w = new ReceiveWaiter(); - _recvQueue.enqueue(w); + /* Preentively create and enqueue a new receive waiter */ + ReceiveWaiter *w = new ReceiveWaiter(); + _recvQueue.enqueue(w); + if (send(cmd, &errstr)) { /* Wait for and get the result, clean up, and return */ result = w->getResult(&reply, &errstr); + if (!result) tc::error("Failed to receive control reply: %1").arg(errstr); - delete w; } else { tc::error("Failed to send control command (%1): %2").arg(cmd.keyword()) .arg(errstr); + _recvQueue.dequeue(); } + delete w; + if (!result && errmsg) *errmsg = errstr; return result;

1 0

[vidalia/alpha] Process events while waiting for port.conf file
by chiiph＠torproject.org 30 May '12

30 May '12

commit 2e0987f4d42a192ee2b5222b9db0d373ea8822f5 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri May 25 19:05:48 2012 -0300 Process events while waiting for port.conf file --- changes/portconf | 3 +++ src/vidalia/MainWindow.cpp | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/portconf b/changes/portconf new file mode 100644 index 0000000..74be88a --- /dev/null +++ b/changes/portconf @@ -0,0 +1,3 @@ + Internal cleanups and improvements: + o Call QCoreApplication::processEvents() while waiting to read + port.conf so that Vidalia does not freeze. \ No newline at end of file diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index cd4bf27..90e8706 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -779,6 +779,7 @@ MainWindow::connectToTor() #else sleep(1); #endif + QCoreApplication::processEvents(); } if(tries >= maxtries) {

1 0

[vidalia/alpha] Check that Vidalia has authenticated before allowing sending any other ControlCommand
by chiiph＠torproject.org 30 May '12

30 May '12

commit 5a954b7a4cc2511ff9aa4a3153d5448f9037ce27 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri May 25 19:02:23 2012 -0300 Check that Vidalia has authenticated before allowing sending any other ControlCommand --- changes/authenticated | 2 ++ src/torcontrol/TorControl.cpp | 21 ++++++++++++++++++++- src/torcontrol/TorControl.h | 5 +++++ 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/changes/authenticated b/changes/authenticated new file mode 100644 index 0000000..905b6c7 --- /dev/null +++ b/changes/authenticated @@ -0,0 +1,2 @@ + Internal cleanups and improvements: + o Do not send ControlCommands if Vidalia haven't authenticated yet. \ No newline at end of file diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index fbf602d..84de11f 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -26,7 +26,7 @@ /** Default constructor */ TorControl::TorControl(ControlMethod::Method method) - : QObject(), _shouldContinue(true), _reason("") { + : QObject(), _shouldContinue(true), _reason(""), _authenticated(false) { #define RELAY_SIGNAL(src, sig) \ QObject::connect((src), (sig), this, (sig)) @@ -266,6 +266,7 @@ TorControl::disconnect() { if (isConnected()) _controlConn->disconnect(); + _authenticated = false; } /** Emits the proper bootstrapStatusChanged */ @@ -330,6 +331,15 @@ TorControl::isConnected() bool TorControl::send(ControlCommand cmd, ControlReply &reply, QString *errmsg) { + if (!_authenticated and (cmd.keyword() != "AUTHENTICATE") and + (cmd.keyword() != "PROTOCOLINFO") and + (cmd.keyword() != "QUIT")) { + if (errmsg) + *errmsg = "TorControl not authenticated"; + + return false; + } + if (_controlConn->send(cmd, reply, errmsg)) { if (reply.getStatus() == "250") { return true; @@ -397,6 +407,8 @@ TorControl::authenticate(const QString &password, QString *errmsg) void TorControl::onAuthenticated() { + _authenticated = true; + /* The version of Tor isn't going to change while we're connected to it, so * save it for later. */ getInfo("version", _torVersion); @@ -410,6 +422,13 @@ TorControl::onAuthenticated() emit authenticated(); } +/** Returns true if the process has passed through auth successfully */ +bool +TorControl::isAuthenticated() +{ + return _authenticated; +} + /** Sends a PROTOCOLINFO command to Tor and parses the response. */ ProtocolInfo TorControl::protocolInfo(QString *errmsg) diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index 3c5f6d7..ec91679 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -81,6 +81,8 @@ public: bool authenticate(const QByteArray cookie, QString *errmsg = 0); /** Sends an authentication password to Tor. */ bool authenticate(const QString &password = QString(), QString *errmsg = 0); + /** Returns true if the process has passed through auth successfully */ + bool isAuthenticated(); /** Sends a PROTOCOLINFO command to Tor and parses the response. */ ProtocolInfo protocolInfo(QString *errmsg = 0); @@ -413,6 +415,9 @@ private: bool _shouldContinue; QString _reason; + /** True when the process has passed through the auth successfully */ + bool _authenticated; + /** Send a message to Tor and read the response */ bool send(ControlCommand cmd, ControlReply &reply, QString *errmsg = 0); /** Send a message to Tor and discard the response */

1 0

[vidalia/alpha] Update title after Vidalia has authenticated
by chiiph＠torproject.org 30 May '12

30 May '12

commit 3e6ca870506dad1e3a886251554a23001699216e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri May 25 19:03:42 2012 -0300 Update title after Vidalia has authenticated --- src/vidalia/MainWindow.cpp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index c97ab35..cd4bf27 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -185,7 +185,6 @@ MainWindow::createGUI() createMenuBar(); createToolBar(); createTrayIcon(); - updateTitle(); // We need to create this tab at the beggining // and we must specify the statusBar @@ -1032,6 +1031,9 @@ MainWindow::connectFailed(QString errmsg) void MainWindow::authenticated() { + // We update the title once we are authenticated + updateTitle(); + TorSettings settings; _torControl->clearErrState();

1 0