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

[vidalia/alpha] Make widgets microdescriptor friendly
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 79599ac7c838d3ba0c87af1e91c9605be30cc21f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Feb 13 12:49:56 2012 -0300 Make widgets microdescriptor friendly --- src/vidalia/network/RouterDescriptorView.cpp | 10 ++++--- src/vidalia/network/RouterInfoDialog.cpp | 34 ++++++++++++++++++++----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp index 6d9370c..44376d7 100644 --- a/src/vidalia/network/RouterDescriptorView.cpp +++ b/src/vidalia/network/RouterDescriptorView.cpp @@ -106,10 +106,11 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist) /* Add the IP address and router platform information */ html.append(trow(tcol(b(tr("IP Address:"))) + tcol(rd.ip().toString()))); - html.append(trow(tcol(b(tr("Platform:"))) + tcol(rd.platform()))); + if(!rd.platform().isEmpty()) + html.append(trow(tcol(b(tr("Platform:"))) + tcol(rd.platform()))); /* If the router is online, then show the uptime and bandwidth stats. */ - if (!rd.offline()) { + if (!rd.offline() and rd.uptime() != 0) { qint64 minBandwidth = (qint64)qMin(rd.observedBandwidth(), qMin(rd.averageBandwidth(), rd.burstBandwidth())); @@ -121,8 +122,9 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist) } /* Date the router was published */ - html.append(trow(tcol(b(tr("Last Updated:"))) + - tcol(string_format_datetime(rd.published()) + " GMT"))); + if(!string_format_datetime(rd.published()).isEmpty()) + html.append(trow(tcol(b(tr("Last Updated:"))) + + tcol(string_format_datetime(rd.published()) + " GMT"))); html.append("</table>"); diff --git a/src/vidalia/network/RouterInfoDialog.cpp b/src/vidalia/network/RouterInfoDialog.cpp index 806d3e9..f3074d1 100644 --- a/src/vidalia/network/RouterInfoDialog.cpp +++ b/src/vidalia/network/RouterInfoDialog.cpp @@ -41,13 +41,31 @@ RouterInfoDialog::setRouterInfo(const QStringList &desc, { RouterDescriptor rd(desc); - ui.lblName->setText(rd.name()); - ui.lblIPAddress->setText(rd.ip().toString()); - ui.lblPlatform->setText(rd.platform()); - ui.lblBandwidth->setText(string_format_bandwidth(rd.observedBandwidth())); - ui.lblLastUpdated->setText(string_format_datetime(rd.published()) + " GMT"); - ui.lblUptime->setText(string_format_uptime(adjustUptime(rd.uptime(), - rd.published()))); + ui.lblName->setText(status.name()); + ui.lblIPAddress->setText(status.ipAddress().toString()); + if(rd.platform().isEmpty()) { + ui.lblPlatformLabel->setVisible(false); + ui.lblPlatform->setVisible(false); + } else { + ui.lblPlatform->setText(rd.platform()); + } + + if(rd.observedBandwidth() == 0) { + ui.lblBandwidthLabel->setVisible(false); + ui.lblBandwidth->setVisible(false); + } else { + ui.lblBandwidth->setText(string_format_bandwidth(rd.observedBandwidth())); + } + + ui.lblLastUpdated->setText(string_format_datetime(status.published()) + " GMT"); + + if(rd.uptime() == 0) { + ui.lblUptimeLabel->setVisible(false); + ui.lblUptime->setVisible(false); + } else { + ui.lblUptime->setText(string_format_uptime(adjustUptime(rd.uptime(), + status.published()))); + } if (rd.hibernating()) { ui.lblStatus->setText(tr("Hibernating")); @@ -74,5 +92,7 @@ void RouterInfoDialog::setLocation(const QString &location) { ui.lblLocation->setText(location); + ui.lblLocation->setVisible(!location.isEmpty()); + ui.lblLocationLabel->setVisible(!location.isEmpty()); }

1 0

[vidalia/alpha] Add support for MicroDescriptors
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit dd10e9d90d1a6e6b0099f49b6a1b46cc7209ec61 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Feb 13 12:37:47 2012 -0300 Add support for MicroDescriptors --- src/torcontrol/RouterDescriptor.cpp | 95 ++++++++++++++++++++++------------ src/torcontrol/RouterDescriptor.h | 27 ++++++++-- src/torcontrol/TorControl.cpp | 19 +++++++- src/torcontrol/TorControl.h | 2 + 4 files changed, 104 insertions(+), 39 deletions(-) diff --git a/src/torcontrol/RouterDescriptor.cpp b/src/torcontrol/RouterDescriptor.cpp index e63ca20..3634f3e 100644 --- a/src/torcontrol/RouterDescriptor.cpp +++ b/src/torcontrol/RouterDescriptor.cpp @@ -21,8 +21,8 @@ /** Constructor. Just assigns the ID and determines whether the router is * responsive or not based on the presence of a "!" at the start of the ID. * See tor-spec.txt for details. */ -RouterDescriptor::RouterDescriptor(QStringList descriptor) -{ +RouterDescriptor::RouterDescriptor(QStringList descriptor, bool microdesc) + : _microdesc(microdesc), _observedBandwidth(0), _uptime(0) { _status = Online; parseDescriptor(descriptor); } @@ -31,38 +31,56 @@ RouterDescriptor::RouterDescriptor(QStringList descriptor) void RouterDescriptor::parseDescriptor(QStringList descriptor) { - foreach (QString line, descriptor) { - if (line.startsWith("router ")) { - QStringList parts = line.remove(0,qstrlen("router ")).split(" "); - _name = parts.at(0); - _ip = QHostAddress(parts.at(1)); - _orPort = (quint16)parts.at(2).toUInt(); - _dirPort = (quint16)parts.at(4).toUInt(); - } else if (line.startsWith("platform ")) { - _platform = line.remove(0,qstrlen("platform ")); - } else if (line.startsWith("published ")) { - _published = QDateTime::fromString( - line.remove(0,qstrlen("published ")), - "yyyy-MM-dd HH:mm:ss"); - _published.setTimeSpec(Qt::UTC); - } else if (line.startsWith("opt fingerprint ")) { - _fingerprint = line.remove(0,qstrlen("opt fingerprint ")); - _id = _fingerprint.remove(" "); - } else if (line.startsWith("fingerprint ")) { - _fingerprint = line.remove(0,qstrlen("fingerprint ")); - _id = _fingerprint.remove(" "); - } else if (line.startsWith("uptime ")) { - _uptime = (quint64)line.remove(0,qstrlen("uptime ")).toULongLong(); - } else if (line.startsWith("bandwidth ")) { - QStringList bw = line.remove(0,qstrlen("bandwidth ")).split(" "); - _avgBandwidth = (quint64)bw.at(0).toULongLong(); - _burstBandwidth = (quint64)bw.at(1).toULongLong(); - _observedBandwidth = (quint64)bw.at(2).toULongLong(); - } else if (line.startsWith("contact ")) { - _contact = line.remove(0,qstrlen("contact ")); - } else if (line.startsWith("hibernating ")) { - if (line.remove(0,qstrlen("hibernating ")).trimmed() == "1") { - _status = Hibernating; + if(_microdesc) { + bool key = false; + foreach(QString line, descriptor) { + if(line.startsWith("onion-key")) { + key = true; + } else if(line.startsWith("p ")) { + _exitPolicy = line.remove(0,qstrlen("p ")); + } else if(line.startsWith("family ")) { + _family = line.remove(0,qstrlen("family ")); + } + + if(key) + _onionKey += line; + if(line.startsWith("-----END RSA PUBLIC KEY-----")) + key = false; + } + } else { + foreach (QString line, descriptor) { + if (line.startsWith("router ")) { + QStringList parts = line.remove(0,qstrlen("router ")).split(" "); + _name = parts.at(0); + _ip = QHostAddress(parts.at(1)); + _orPort = (quint16)parts.at(2).toUInt(); + _dirPort = (quint16)parts.at(4).toUInt(); + } else if (line.startsWith("platform ")) { + _platform = line.remove(0,qstrlen("platform ")); + } else if (line.startsWith("published ")) { + _published = QDateTime::fromString( + line.remove(0,qstrlen("published ")), + "yyyy-MM-dd HH:mm:ss"); + _published.setTimeSpec(Qt::UTC); + } else if (line.startsWith("opt fingerprint ")) { + _fingerprint = line.remove(0,qstrlen("opt fingerprint ")); + _id = _fingerprint.remove(" "); + } else if (line.startsWith("fingerprint ")) { + _fingerprint = line.remove(0,qstrlen("fingerprint ")); + _id = _fingerprint.remove(" "); + } else if (line.startsWith("uptime ")) { + _uptime = (quint64)line.remove(0,qstrlen("uptime ")).toULongLong(); + } else if (line.startsWith("bandwidth ")) { + QStringList bw = line.remove(0,qstrlen("bandwidth ")).split(" "); + _avgBandwidth = (quint64)bw.at(0).toULongLong(); + _burstBandwidth = (quint64)bw.at(1).toULongLong(); + _observedBandwidth = (quint64)bw.at(2).toULongLong(); + } else if (line.startsWith("contact ")) { + _contact = line.remove(0,qstrlen("contact ")); + } else if (line.startsWith("hibernating ")) { + if (line.remove(0,qstrlen("hibernating ")).trimmed() == "1") { + _status = Hibernating; + } } } } @@ -80,3 +98,12 @@ RouterDescriptor::status() return tr("Offline"); } +void +RouterDescriptor::appendRouterStatusInfo(const RouterStatus &rs) +{ + _id = rs.id(); + _name = rs.name(); + _ip = rs.ipAddress(); + _orPort = rs.orPort(); + _dirPort = rs.dirPort(); +} diff --git a/src/torcontrol/RouterDescriptor.h b/src/torcontrol/RouterDescriptor.h index d4ff868..d0c3400 100644 --- a/src/torcontrol/RouterDescriptor.h +++ b/src/torcontrol/RouterDescriptor.h @@ -22,6 +22,7 @@ #include <QList> #include <QHostAddress> +#include "RouterStatus.h" class RouterDescriptor { @@ -29,16 +30,16 @@ class RouterDescriptor public: /** Possible router states. */ - enum RouterStatus { + enum RouterStatusEnum { Online, /**< Router is online and reachable. */ Hibernating, /**< Router is currently hibernating. */ Offline /**< Router is unresponsive. */ }; /** Default constructor. */ - RouterDescriptor() {} + RouterDescriptor(bool microdesc = false) : _microdesc(microdesc) {} /** Constructor. */ - RouterDescriptor(QStringList descriptor); + RouterDescriptor(QStringList descriptor, bool microdesc = false); /** Returns the router's name. */ QString name() const { return _name; } @@ -86,11 +87,23 @@ public: /** Sets the descriptors status to Offline if offline is true. */ void setOffline(bool offline) { _status = (offline ? Offline : Online); } + /** Microdescriptor */ + /** Returns the onion key for this router */ + QString onionKey() const { return _onionKey; } + /** Returns this router's family */ + QString family() const { return _family; } + /** Returns this router's exit policy */ + QString exitPolicy() const { return _exitPolicy; } + + /** Uses the RouterStatus information to update key elements of the + * descriptor */ + void appendRouterStatusInfo(const RouterStatus &rs); + private: /** Parses this router's descriptor for relevant information. */ void parseDescriptor(QStringList descriptor); - RouterStatus _status; /**< Availability status of this router. */ + RouterStatusEnum _status;/**< Availability status of this router. */ QString _id; /**< Router's descriptor ID. */ QString _name; /**< The router's name. */ QString _fingerprint; /**< Router's fingerprint. */ @@ -105,6 +118,12 @@ private: quint64 _burstBandwidth; /**< Burst bandwidth. */ quint64 _observedBandwidth; /**< Observed bandwidth. */ QString _location; /**< Geographic location information. */ + + /** Microdescriptor info */ + bool _microdesc; /** */ + QString _onionKey; /** Router SSL key */ + QString _exitPolicy; /** Exit policy */ + QString _family; /** Family */ }; #endif diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index e95f9c7..b547a40 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -945,6 +945,20 @@ TorControl::resetConf(QString key, QString *errmsg) return resetConf(QStringList() << key, errmsg); } +bool +TorControl::useMicrodescriptors(QString *errmsg) +{ + if(!errmsg) + errmsg = new QString(); + + QString mdres, fetchres; + if(!getConf("UseMicrodescriptors", mdres, errmsg)) + return false; + if(!getConf("FetchUselessDescriptors", fetchres, errmsg)) + return false; + return (mdres == "1") or (mdres == "auto" and fetchres == "0"); +} + /** Returns an unparsed router descriptor for the router whose fingerprint * matches id. The returned text can later be parsed by the * RouterDescriptor class. If id is invalid, then an empty @@ -952,6 +966,9 @@ TorControl::resetConf(QString key, QString *errmsg) QStringList TorControl::getRouterDescriptorText(const QString &id, QString *errmsg) { + if(useMicrodescriptors(errmsg)) + return getInfo("md/id/" + id, errmsg).toStringList(); + return getInfo("desc/id/" + id, errmsg).toStringList(); } @@ -961,7 +978,7 @@ TorControl::getRouterDescriptorText(const QString &id, QString *errmsg) RouterDescriptor TorControl::getRouterDescriptor(const QString &id, QString *errmsg) { - return RouterDescriptor(getRouterDescriptorText(id, errmsg)); + return RouterDescriptor(getRouterDescriptorText(id, errmsg), useMicrodescriptors()); } /** Returns the status of the router whose fingerprint matches id. If diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index c16758c..cc486a1 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -168,6 +168,8 @@ public: /** Tells Tor to reset a configuration key back to its default value. */ bool resetConf(QString key, QString *errmsg = 0); + /** Returns true if UseMicrodescriptors is enabled */ + bool useMicrodescriptors(QString *errmsg = 0); /** Returns an unparsed router descriptor for the router whose fingerprint * matches id. The returned text can later be parsed by the * RouterDescriptor class. If id is invalid, then an empty

1 0

[vidalia/alpha] Explicitly save location, otherwise it won't display in the RouterInfoDialog
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 8f9179be72a13ad1aa2a7d9c17a6c4e5a67e64a6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Feb 13 12:52:48 2012 -0300 Explicitly save location, otherwise it won't display in the RouterInfoDialog --- src/vidalia/network/RouterListItem.cpp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/vidalia/network/RouterListItem.cpp b/src/vidalia/network/RouterListItem.cpp index db558bf..c2a8c85 100644 --- a/src/vidalia/network/RouterListItem.cpp +++ b/src/vidalia/network/RouterListItem.cpp @@ -102,6 +102,8 @@ RouterListItem::setLocation(const GeoIpRecord &geoip) if (_rd) _rd->setLocation(geoip.toString()); + + _location = geoip; _countryCode = geoip.countryCode(); }

1 0

[vidalia/alpha] Port TorMapWidget and the rest to work with the latest Marble
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 56dbd017aa1e8c5af851aafa7357ff90aaa70b0a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Feb 13 12:45:00 2012 -0300 Port TorMapWidget and the rest to work with the latest Marble --- src/vidalia/CMakeLists.txt | 2 - src/vidalia/network/TorMapWidget.cpp | 107 ++++++----------- src/vidalia/network/TorMapWidget.h | 7 +- src/vidalia/network/TorMapWidgetInputHandler.cpp | 138 ---------------------- src/vidalia/network/TorMapWidgetInputHandler.h | 55 --------- src/vidalia/network/TorMapWidgetPopupMenu.cpp | 37 ++---- src/vidalia/network/TorMapWidgetPopupMenu.h | 20 +--- 7 files changed, 58 insertions(+), 308 deletions(-) diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index 4a28504..315bf37 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -260,12 +260,10 @@ qt4_wrap_cpp(vidalia_SRCS if (USE_MARBLE) set(vidalia_SRCS ${vidalia_SRCS} network/TorMapWidget.cpp - network/TorMapWidgetInputHandler.cpp network/TorMapWidgetPopupMenu.cpp ) qt4_wrap_cpp(vidalia_SRCS network/TorMapWidget.h - network/TorMapWidgetInputHandler.h network/TorMapWidgetPopupMenu.h ) else(USE_MARBLE) diff --git a/src/vidalia/network/TorMapWidget.cpp b/src/vidalia/network/TorMapWidget.cpp index e222218..aa8abd7 100644 --- a/src/vidalia/network/TorMapWidget.cpp +++ b/src/vidalia/network/TorMapWidget.cpp @@ -14,11 +14,15 @@ */ #include "TorMapWidget.h" -#include "TorMapWidgetInputHandler.h" #include "TorMapWidgetPopupMenu.h" #include "Vidalia.h" #include <MarbleModel.h> +#include <MarbleWidgetInputHandler.h> +#include <GeoDataPlacemark.h> +#include <GeoDataTreeModel.h> +#include <GeoDataDocument.h> +#include <GeoDataFolder.h> #include <HttpDownloadManager.h> #include <QStringList> @@ -26,8 +30,8 @@ using namespace Marble; /** QPens to use for drawing different map elements */ -#define CIRCUIT_NORMAL_PEN QPen(Qt::blue, 2.0) -#define CIRCUIT_SELECTED_PEN QPen(Qt::green, 3.0) +#define CIRCUIT_NORMAL_PEN QPen(QBrush(QColor(0,51,102)), 2.0) +#define CIRCUIT_SELECTED_PEN QPen(QBrush(QColor(65,146,75)), 3.0) /** Default constructor */ @@ -42,22 +46,24 @@ TorMapWidget::TorMapWidget(QWidget *parent) model()->downloadManager()->setDownloadEnabled(false); - TorMapWidgetInputHandler *handler = new TorMapWidgetInputHandler(); + _document = new Marble::GeoDataDocument(); + _folder = new Marble::GeoDataFolder(); + model()->treeModel()->addDocument(_document); + model()->treeModel()->addFeature(_document, _folder); + TorMapWidgetPopupMenu *popupMenu = new TorMapWidgetPopupMenu(this); - connect(handler, SIGNAL(featureClicked(QPoint,Qt::MouseButton)), - popupMenu, SLOT(featureClicked(QPoint,Qt::MouseButton))); - connect(popupMenu, SIGNAL(displayRouterInfo(QString)), - this, SIGNAL(displayRouterInfo(QString))); + // Properly disable all right click menus + inputHandler()->setMouseButtonPopupEnabled(Qt::RightButton, false); - /* We can't call setInputHandler() until MarbleWidget has called its - * internal _q_initGui() method, which doesn't happen until a - * QTimer::singleShot(0, this, SLOT(_q_initGui())) timer set in its - * constructor times out. So force that event to process now. */ - vApp->processEvents(QEventLoop::ExcludeUserInputEvents - | QEventLoop::ExcludeSocketNotifiers); + // Hack to disable Marble's menus + disconnect(inputHandler(), SIGNAL(lmbRequest(int,int)), + 0,0); - setInputHandler(handler); + connect(inputHandler(), SIGNAL(lmbRequest(int,int)), + popupMenu, SLOT(featureLeftClicked(int,int))); + connect(popupMenu, SIGNAL(displayRouterInfo(QString)), + this, SIGNAL(displayRouterInfo(QString))); } /** Destructor */ @@ -70,38 +76,23 @@ TorMapWidget::~TorMapWidget() void TorMapWidget::addRouter(const RouterDescriptor &desc, const GeoIpRecord &geoip) { - QString kml; qreal lon = geoip.longitude(); qreal lat = geoip.latitude(); quint64 bw; - + bw = qMin(desc.averageBandwidth(), desc.burstBandwidth()); bw = qMin(bw, desc.observedBandwidth()); - kml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" - "<kml xmlns=\"http://earth.google.com/kml/2.0\">" - "<Document>" - " <Style id=\"normalPlacemark\">" - " <IconStyle><Icon><href>:/images/icons/placemark-relay.png</href></Icon></IconStyle>" - " </Style>" - ); - - kml.append("<Placemark>"); - kml.append("<styleUrl>#normalPlacemark</styleUrl>"); - kml.append(QString("<name>%1</name>").arg(desc.name())); - kml.append(QString("<description>%1</description>").arg(desc.id())); - kml.append(QString("<role>1</role>")); - kml.append(QString("<address>%1</address>").arg(geoip.toString())); - kml.append(QString("<CountryNameCode>%1</CountryNameCode>").arg(geoip.country())); - kml.append(QString("<pop>%1</pop>").arg(10 * bw)); - kml.append(QString("<Point>" - " <coordinates>%1,%2</coordinates>" - "</Point>").arg(lon).arg(lat)); - kml.append("</Placemark>"); - kml.append("</Document></kml>"); - QString id = desc.id(); - addPlacemarkData(kml, id); + + GeoDataPlacemark *pm = new GeoDataPlacemark(desc.name()); + pm->setDescription(desc.id()); + pm->setRole("1"); + pm->setAddress(geoip.toString()); + pm->setCountryCode(geoip.country()); + pm->setPopularity(10 * bw); + pm->setCoordinate(lon, lat, 0.0, GeoDataCoordinates::Degree); + model()->treeModel()->addFeature(_folder, pm); _routers.insert(id, GeoDataCoordinates(lon, lat, 0.0, GeoDataCoordinates::Degree)); } @@ -154,19 +145,6 @@ TorMapWidget::removeCircuit(const CircuitId &circid) repaint(); } -/** Selects and highlights the router on the map. */ -void -TorMapWidget::selectRouter(const QString &id) -{ -#if 0 - if (_routers.contains(id)) { - QPair<QPointF, bool> *routerPair = _routers.value(id); - routerPair->second = true; - } - repaint(); -#endif -} - /** Selects and highlights the circuit with the id circid * on the map. */ void @@ -184,13 +162,6 @@ TorMapWidget::selectCircuit(const CircuitId &circid) void TorMapWidget::deselectAll() { -#if 0 - /* Deselect all router points */ - foreach (QString router, _routers.keys()) { - QPair<QPointF,bool> *routerPair = _routers.value(router); - routerPair->second = false; - } -#endif /* Deselect all circuit paths */ foreach (CircuitGeoPath *path, _circuits.values()) { path->second = false; @@ -204,7 +175,7 @@ void TorMapWidget::clear() { foreach (QString id, _routers.keys()) { - removePlacemarkKey(id); + model()->removeGeoData(id); } foreach (CircuitId circid, _circuits.keys()) { @@ -234,18 +205,10 @@ TorMapWidget::zoomToFit() void TorMapWidget::zoomToCircuit(const CircuitId &circid) { -#if 0 if (_circuits.contains(circid)) { - QPair<QPainterPath*,bool> *pair = _circuits.value(circid); - QRectF rect = ((QPainterPath *)pair->first)->boundingRect(); - if (!rect.isNull()) { - float zoomLevel = 1.0 - qMax(rect.height()/float(MAP_HEIGHT), - rect.width()/float(MAP_WIDTH)); - - zoom(rect.center().toPoint(), zoomLevel+0.2); - } + CircuitGeoPath *pair = _circuits.value(circid); + centerOn(pair->first.latLonAltBox(), true); } -#endif } /** Zooms in on the router with the given id. */ @@ -257,7 +220,7 @@ TorMapWidget::zoomToRouter(const QString &id) GeoDataCoordinates coords = _routers.value(id); coords.geoCoordinates(lon, lat, GeoDataPoint::Degree); - zoomView(maximumZoom()); + zoomView(zoomFromDistance(1000)); centerOn(lon, lat, true); } } diff --git a/src/vidalia/network/TorMapWidget.h b/src/vidalia/network/TorMapWidget.h index f371198..bfc946b 100644 --- a/src/vidalia/network/TorMapWidget.h +++ b/src/vidalia/network/TorMapWidget.h @@ -33,6 +33,8 @@ typedef QPair<Marble::GeoDataLineString, bool> CircuitGeoPath; +class Marble::GeoDataDocument; +class Marble::GeoDataFolder; class TorMapWidget : public Marble::MarbleWidget { @@ -48,8 +50,6 @@ public: void addRouter(const RouterDescriptor &desc, const GeoIpRecord &geoip); /** Plots the given circuit on the map. */ void addCircuit(const CircuitId &circid, const QStringList &path); - /** Selects and hightlights a router on the map. */ - void selectRouter(const QString &id); /** Selects and highlights a circuit on the map. */ void selectCircuit(const CircuitId &circid); @@ -82,6 +82,9 @@ private: QHash<QString, Marble::GeoDataCoordinates> _routers; /** Stores circuit information */ QHash<CircuitId, CircuitGeoPath*> _circuits; + + Marble::GeoDataDocument *_document; + Marble::GeoDataFolder *_folder; }; #endif diff --git a/src/vidalia/network/TorMapWidgetInputHandler.cpp b/src/vidalia/network/TorMapWidgetInputHandler.cpp deleted file mode 100644 index 467594b..0000000 --- a/src/vidalia/network/TorMapWidgetInputHandler.cpp +++ /dev/null @@ -1,138 +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. -*/ - -#include "TorMapWidgetInputHandler.h" - -#include <MarbleWidget.h> -#include <MarbleMap.h> -#include <MarbleModel.h> -#include <ViewParams.h> -#include <ViewportParams.h> - -#include <QTimer> -#include <QMouseEvent> -#include <QWheelEvent> -#include <QPersistentModelIndex> - -using namespace Marble; - - -/** Amount to zoom in or out when responding to mouse double clicks. This - * value was taken from MarbleMap.cpp. - */ -#define MAP_ZOOM_STEP 40 - -/** Number of units the mouse must be clicked and dragged before it will - * force a map rotation and repaint. -*/ -#define MIN_DRAG_THRESHOLD 3 - - -TorMapWidgetInputHandler::TorMapWidgetInputHandler() - : MarbleWidgetInputHandler() -{ -} - -bool -TorMapWidgetInputHandler::eventFilter(QObject *obj, QEvent *e) -{ - Q_UNUSED(obj); - - QWheelEvent *wheelEvent = 0; - QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(e); - - switch (e->type()) { - case QEvent::MouseButtonPress: - _mousePressedX = mouseEvent->x(); - _mousePressedY = mouseEvent->y(); - _mousePressedLon = m_widget->centerLongitude(); - _mousePressedLat = m_widget->centerLatitude(); - - if (pointHasFeatures(mouseEvent->pos())) - emit featureClicked(mouseEvent->pos(), mouseEvent->button()); - else - m_widget->setCursor(Qt::ClosedHandCursor); - break; - - case QEvent::MouseButtonRelease: - if (! pointHasFeatures(mouseEvent->pos())) - m_widget->setCursor(Qt::OpenHandCursor); - else - m_widget->setCursor(Qt::PointingHandCursor); - break; - - case QEvent::MouseMove: - if (mouseEvent->buttons() & Qt::LeftButton) { - // Pan the map if the left button is pressed while dragging - int dx = mouseEvent->x() - _mousePressedX; - int dy = mouseEvent->y() - _mousePressedY; - - if (abs(dx) <= MIN_DRAG_THRESHOLD && abs(dy) <= MIN_DRAG_THRESHOLD) - return true; - m_widget->setCursor(Qt::ClosedHandCursor); - - qreal dir = 1; - if (m_widget->projection() == Spherical) { - if (m_widget->map()->viewParams()->viewport()->polarity() > 0) { - if (mouseEvent->y() < (-m_widget->northPoleY() + m_widget->height()/2)) - dir = -1; - } else { - if (mouseEvent->y() > (+m_widget->northPoleY() + m_widget->height()/2)) - dir = -1; - } - } - - qreal radius = (qreal)(m_widget->radius()); - qreal lon = (qreal)(_mousePressedLon) - 90.0 * dir * dx / radius; - qreal lat = (qreal)(_mousePressedLat) + 90.0 * dy / radius; - m_widget->centerOn(lon, lat, false); - - return true; - } else { - // Change the mouse cursor if we're hovering over a relay placemark - if (pointHasFeatures(mouseEvent->pos()) > 0) - m_widget->setCursor(Qt::PointingHandCursor); - else - m_widget->setCursor(Qt::OpenHandCursor); - } - break; - - case QEvent::MouseButtonDblClick: - // Adjust the zoom level on the map - if (mouseEvent->button() == Qt::LeftButton) { - m_widget->zoomViewBy(MAP_ZOOM_STEP); - return true; - } else if (mouseEvent->button() == Qt::RightButton) { - m_widget->zoomViewBy(-MAP_ZOOM_STEP); - return true; - } - break; - - case QEvent::Wheel: - // Adjust the zoom level on the map - m_widget->setViewContext(Marble::Animation); - - wheelEvent = static_cast<QWheelEvent*>(e); - m_widget->zoomViewBy((int)(wheelEvent->delta() / 3)); - m_mouseWheelTimer->start(400); - return true; - - default: - break; - } - return MarbleWidgetInputHandler::eventFilter(obj, e); -} - -bool -TorMapWidgetInputHandler::pointHasFeatures(const QPoint &point) const -{ - return (m_widget->model()->whichFeatureAt(point).size() > 0); -} - diff --git a/src/vidalia/network/TorMapWidgetInputHandler.h b/src/vidalia/network/TorMapWidgetInputHandler.h deleted file mode 100644 index 066a4dc..0000000 --- a/src/vidalia/network/TorMapWidgetInputHandler.h +++ /dev/null @@ -1,55 +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. -*/ - -#ifndef _TORMAPWIDGETINPUTHANDLER_H -#define _TORMAPWIDGETINPUTHANDLER_H - -#include "MarbleWidgetInputHandler.h" - -#include <QEvent> -#include <QObject> -#include <QPoint> - - -class TorMapWidgetInputHandler : public Marble::MarbleWidgetInputHandler -{ - Q_OBJECT - -public: - /** Default constructor. - */ - TorMapWidgetInputHandler(); - -signals: - /** Emitted when the user clicks on a map feature located at point. - * button indicates which mouse button was clicked. - */ - void featureClicked(const QPoint &point, Qt::MouseButton button); - -protected: - /** Filter and handles event e that was sent to widget obj. - * obj is always a MarbleWidget object. - */ - virtual bool eventFilter(QObject *obj, QEvent *e); - -private: - /** Returns true if the map has one or more features located at the screen - * position point. - */ - bool pointHasFeatures(const QPoint &point) const; - - int _mousePressedX; - int _mousePressedY; - qreal _mousePressedLon; - qreal _mousePressedLat; -}; - -#endif - diff --git a/src/vidalia/network/TorMapWidgetPopupMenu.cpp b/src/vidalia/network/TorMapWidgetPopupMenu.cpp index a98c7e6..983b16e 100644 --- a/src/vidalia/network/TorMapWidgetPopupMenu.cpp +++ b/src/vidalia/network/TorMapWidgetPopupMenu.cpp @@ -18,6 +18,7 @@ #include <MarbleModel.h> #include <MarblePlacemarkModel.h> +#include <MarbleWidgetInputHandler.h> #include <QChar> #include <QVector> @@ -31,41 +32,29 @@ TorMapWidgetPopupMenu::TorMapWidgetPopupMenu(TorMapWidget *widget) _widget(widget) { _leftClickMenu = new QMenu(widget); + + _widget->inputHandler()->setMouseButtonPopupEnabled(Qt::LeftButton, true); + connect(_leftClickMenu, SIGNAL(triggered(QAction*)), this, SLOT(relaySelected(QAction*))); } void -TorMapWidgetPopupMenu::featureClicked(const QPoint &pos, Qt::MouseButton btn) +TorMapWidgetPopupMenu::featureLeftClicked(int x, int y) { - switch (btn) { - case Qt::LeftButton: - featureLeftClicked(pos); - break; - - case Qt::RightButton: - break; - - default: - break; - } -} + QVector<const GeoDataPlacemark*> features = _widget->whichFeatureAt(QPoint(x,y)); + QVector<const GeoDataPlacemark*>::const_iterator it = features.constBegin(); + QVector<const GeoDataPlacemark*>::const_iterator const itEnd = features.constEnd(); -void -TorMapWidgetPopupMenu::featureLeftClicked(const QPoint &pos) -{ - QVector<QModelIndex>::const_iterator it; - QVector<QModelIndex> features = _widget->model()->whichFeatureAt(pos); QString name, id; int numRelays = 0; _leftClickMenu->clear(); - for (it = features.constBegin(); it != features.constEnd(); ++it) { - QChar role = (*it).data(MarblePlacemarkModel::GeoTypeRole).toChar(); - if (role == '1') { + for (; it != itEnd; ++it) { + if ((*it)->role() == "1") { /* Normal Tor Relay */ - name = (*it).data().toString(); - id = (*it).data(MarblePlacemarkModel::DescriptionRole).toString(); + name = (*it)->name(); + id = (*it)->description(); QAction *action = _leftClickMenu->addAction(name); action->setData(id); @@ -76,7 +65,7 @@ TorMapWidgetPopupMenu::featureLeftClicked(const QPoint &pos) if (numRelays == 1) emit displayRouterInfo(id); else if (numRelays > 1) - _leftClickMenu->popup(_widget->mapToGlobal(pos)); + _leftClickMenu->popup(_widget->mapToGlobal(QPoint(x,y))); } void diff --git a/src/vidalia/network/TorMapWidgetPopupMenu.h b/src/vidalia/network/TorMapWidgetPopupMenu.h index c83ded3..4381b72 100644 --- a/src/vidalia/network/TorMapWidgetPopupMenu.h +++ b/src/vidalia/network/TorMapWidgetPopupMenu.h @@ -35,14 +35,14 @@ public: TorMapWidgetPopupMenu(TorMapWidget *widget); public slots: - /** Called when the user clicks on one or more map features located at mouse - * position pos. button specifies the mouse button clicked. - * A popup menu will be displayed depending on which mouse button was - * clicked. + /** Called when the user left-clicks on one or more placemarks at mouse + * position pos. If only one relay placemark exists at pos, + * then the displayRouterInfo() signal will be emitted. Otherwise, a + * popup menu will be displayed listing all placemarks at this location. * * \sa featureLeftClicked */ - void featureClicked(const QPoint &pos, Qt::MouseButton button); + void featureLeftClicked(int x, int y); signals: /** Emitted when the user selects the router placemark whose fingerprint @@ -50,16 +50,6 @@ signals: */ void displayRouterInfo(const QString &id); -protected: - /** Called when the user left-clicks on one or more placemarks at mouse - * position pos. If only one relay placemark exists at pos, - * then the displayRouterInfo() signal will be emitted. Otherwise, a - * popup menu will be displayed listing all placemarks at this location. - * - * \sa featureLeftClicked - */ - virtual void featureLeftClicked(const QPoint &pos); - private slots: /** Called when the user selects a relay from the popup menu used to * disambiguate a location with multiple relay placemarks.

1 0

[vidalia/alpha] Load routers asynchronously
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 693a7754c5010f756140f805e22a0168b52be630 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Feb 13 12:54:20 2012 -0300 Load routers asynchronously --- src/vidalia/network/NetViewer.cpp | 53 ++++++++++++++++++++++++++++--------- src/vidalia/network/NetViewer.h | 25 ++++++++++++----- 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index 0e0a161..0a88ec5 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -224,12 +224,8 @@ NetViewer::refresh() /* Clear the data */ clear(); - /* Load router information */ - loadNetworkStatus(); - /* Load existing address mappings */ - loadAddressMap(); - /* Load Circuits and Streams information */ - loadConnections(); + /* Async router load */ + preLoadNetworkStatus(); /* Ok, they can refresh again. */ ui.actionRefresh->setEnabled(true); @@ -331,21 +327,52 @@ NetViewer::help() } /** Retrieves a list of all running routers from Tor and their descriptors, - * and adds them to the RouterListWidget. */ + * and adds them to the _router list. */ void -NetViewer::loadNetworkStatus() +NetViewer::preLoadNetworkStatus() { NetworkStatus networkStatus = _torControl->getNetworkStatus(); - foreach (RouterStatus rs, networkStatus) { + + if(_torControl->useMicrodescriptors()) + ui.treeRouterList->hideColumn(RouterListWidget::StatusColumn); + + foreach(RouterStatus rs, networkStatus) { if (!rs.isRunning()) continue; - + RouterDescriptor rd = _torControl->getRouterDescriptor(rs.id()); + if(_torControl->useMicrodescriptors()) { + rd.appendRouterStatusInfo(rs); + } if (!rd.isEmpty()) - addRouter(rd); + _routers << rd; QCoreApplication::processEvents(); } + + _it = _routers.constBegin(); + QTimer::singleShot(200, this, SLOT(loadNetworkStatus())); +} + +/** Adds routers to the RouterListWidget after they have been loaded + * in the internal _router list */ +void +NetViewer::loadNetworkStatus() +{ + int count = 0, thres = 10; + for(; _it != _routers.constEnd() and count < thres; ++_it, ++count) { + addRouter((*_it)); + QCoreApplication::processEvents(); + } + + if(_it != _routers.constEnd()) + QTimer::singleShot(10, this, SLOT(loadNetworkStatus())); + else { + /* Load existing address mappings */ + loadAddressMap(); + /* Load Circuits and Streams information */ + loadConnections(); + } } /** Adds a router to our list of servers and retrieves geographic location @@ -420,8 +447,8 @@ NetViewer::routerSelected(const QList<RouterDescriptor> &routers) * map. But our current map sucks and you can't even tell when one is * selected anyway. Worry about this when we actually get to Marble. */ - if (routers.size() == 1) - _map->selectRouter(routers[0].id()); + // if (routers.size() == 1) + // _map->selectRouter(routers[0].id()); } /** Called when the user selects a router on the network map. Displays a diff --git a/src/vidalia/network/NetViewer.h b/src/vidalia/network/NetViewer.h index b1c40be..0293306 100644 --- a/src/vidalia/network/NetViewer.h +++ b/src/vidalia/network/NetViewer.h @@ -73,6 +73,10 @@ public slots: /** Clears all known information */ void clear(); + /** Adds a router to our list of servers and retrieves geographic location + * information for the server. */ + void addRouter(const RouterDescriptor &rd); + protected: /** Called when the user changes the UI translation. */ void retranslateUi(); @@ -105,17 +109,18 @@ private slots: * returnPressed from the search field. */ void onRouterSearch(); + /** Adds routers to the RouterListWidget after they have been loaded + * in the internal _router list */ + void loadNetworkStatus(); + private: /** */ void setupGeoIpResolver(); - /** Retrieves a list of all running routers from Tor and their descriptors, - * and adds them to the RouterListWidget. */ - void loadNetworkStatus(); /** Loads a list of address mappings from Tor. */ void loadAddressMap(); - /** Adds a router to our list of servers and retrieves geographic location - * information for the server. */ - void addRouter(const RouterDescriptor &rd); + /** Retrieves a list of all running routers from Tor and their descriptors, + * and adds them to the _routers list. */ + void preLoadNetworkStatus(); /** TorControl object used to talk to Tor. */ TorControl* _torControl; @@ -125,7 +130,13 @@ private: GeoIpResolver _geoip; /** Stores a list of address mappings from Tor. */ AddressMap _addressMap; - + + /** RouterDescriptor list that is used to load the routers in an + * asyc way */ + QList<RouterDescriptor> _routers; + /** Iterator to keep the loaded routers at any time */ + QList<RouterDescriptor>::const_iterator _it; + /** Widget that displays the Tor network map. */ #if defined(USE_MARBLE) TorMapWidget* _map;

1 0

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

05 Mar '12

commit dcdb261f6034d0431403830f9224fb7a5934cb1f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:31:43 2012 -0300 Add a changes file --- changes/featNetworkMap | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/featNetworkMap b/changes/featNetworkMap new file mode 100644 index 0000000..740ac7a --- /dev/null +++ b/changes/featNetworkMap @@ -0,0 +1,3 @@ + o Migrate the code that handles Marble to the new library + interface. It works as expected with the latest Marble from the + upstream git repo. \ No newline at end of file

1 0

[vidalia/alpha] Make TorControl work without threads
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit a3b901fa122bc8f4b82a48d3eb3fae1fede86898 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 24 17:13:51 2012 -0300 Make TorControl work without threads --- src/torcontrol/ControlConnection.cpp | 98 +++++++++++----------------------- src/torcontrol/ControlConnection.h | 3 +- src/torcontrol/SendCommandEvent.cpp | 18 +----- src/torcontrol/TorControl.cpp | 4 ++ src/vidalia/MainWindow.cpp | 56 +++++++++---------- 5 files changed, 67 insertions(+), 112 deletions(-) diff --git a/src/torcontrol/ControlConnection.cpp b/src/torcontrol/ControlConnection.cpp index 365da32..21cb527 100644 --- a/src/torcontrol/ControlConnection.cpp +++ b/src/torcontrol/ControlConnection.cpp @@ -29,21 +29,19 @@ /** Default constructor. */ ControlConnection::ControlConnection(ControlMethod::Method method, TorEvents *events) + : QObject() { _events = events; _status = Unset; _sock = 0; _sendWaiter = new SendCommandEvent::SendWaiter(); _method = method; + _connected = false; } /** Destructor. */ ControlConnection::~ControlConnection() { - /* Exit the event loop */ - exit(); - /* Wait for the thread to finish */ - wait(); /* Clean up after the send waiter */ delete _sendWaiter; } @@ -52,7 +50,7 @@ ControlConnection::~ControlConnection() void ControlConnection::connect(const QHostAddress &addr, quint16 port) { - if (isRunning()) { + if (_connected) { tc::error("Bug: Tried to call ControlConnection::connect() when the " "control thread is already running."); return; @@ -65,15 +63,14 @@ ControlConnection::connect(const QHostAddress &addr, quint16 port) _connectAttempt = 0; setStatus(Connecting); - /* Kick off the thread in which the control socket will live */ - QThread::start(); + run(); } /** Connect to the specified Tor control socket interface. */ void ControlConnection::connect(const QString &addr) { - if (isRunning()) { + if (_connected) { tc::error("Bug: Tried to call ControlConnection::connect() when the " "control thread is already running."); return; @@ -83,8 +80,7 @@ ControlConnection::connect(const QString &addr) _connectAttempt = 0; setStatus(Connecting); - /* Kick off the thread in which the control socket will live */ - QThread::start(); + run(); } /** Attempt to establish a connection to Tor's control interface. We will try @@ -97,7 +93,6 @@ ControlConnection::connect() tc::debug("Connecting to Tor (Attempt %1 of %2)").arg(_connectAttempt) .arg(MAX_CONNECT_ATTEMPTS); - _connMutex.lock(); switch(_method) { case ControlMethod::Socket: _sock->connectToServer(_path); @@ -108,15 +103,26 @@ ControlConnection::connect() _sock->connectToHost(_addr, _port); break; } - _connMutex.unlock(); } /** Disconnect from Tor's control interface. */ 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); + } + setStatus(Disconnecting); - _connMutex.lock(); + switch(_method) { case ControlMethod::Socket: _sock->disconnectFromServer(); @@ -127,7 +133,11 @@ ControlConnection::disconnect() _sock->disconnectFromHost(); break; } - _connMutex.unlock(); + + _sock->disconnect(this); + delete _sock; + delete _connectTimer; + _sock = 0; } /** Called when the control socket is connected. This method checks that the @@ -136,6 +146,7 @@ void ControlConnection::onConnected() { setStatus(Connected); + _connected = true; emit connected(); } @@ -145,8 +156,8 @@ void ControlConnection::onDisconnected() { setStatus(Disconnected); + _connected = false; emit disconnected(); - exit(0); } /** Called when the control socket encounters error. */ @@ -186,9 +197,9 @@ ControlConnection::onError(QAbstractSocket::SocketError error) void ControlConnection::cancelConnect() { + _connected = false; tc::warn("Control connection attempt cancelled."); setStatus(Disconnected); - exit(0); } /** Returns true if the control socket is connected to Tor. */ @@ -202,7 +213,6 @@ ControlConnection::isConnected() ControlConnection::Status ControlConnection::status() { - QMutexLocker locker(&_statusMutex); return _status; } @@ -227,7 +237,6 @@ ControlConnection::statusString(Status status) void ControlConnection::setStatus(Status status) { - QMutexLocker locker(&_statusMutex); tc::debug("Control connection status changed from '%1' to '%2'") .arg(statusString(_status)) .arg(statusString(status)); @@ -242,12 +251,10 @@ ControlConnection::send(const ControlCommand &cmd, bool result = false; QString errstr; - _recvMutex.lock(); if (send(cmd, &errstr)) { /* Create and enqueue a new receive waiter */ ReceiveWaiter *w = new ReceiveWaiter(); _recvQueue.enqueue(w); - _recvMutex.unlock(); /* Wait for and get the result, clean up, and return */ result = w->getResult(&reply, &errstr); @@ -257,7 +264,6 @@ ControlConnection::send(const ControlCommand &cmd, } else { tc::error("Failed to send control command (%1): %2").arg(cmd.keyword()) .arg(errstr); - _recvMutex.unlock(); } if (!result && errmsg) @@ -271,13 +277,10 @@ ControlConnection::send(const ControlCommand &cmd, bool ControlConnection::send(const ControlCommand &cmd, QString *errmsg) { - _connMutex.lock(); if (!_sock || !_sock->isConnected()) { - _connMutex.unlock(); return err(errmsg, tr("Control socket is not connected.")); } QCoreApplication::postEvent(_sock, new SendCommandEvent(cmd, _sendWaiter)); - _connMutex.unlock(); return _sendWaiter->getResult(errmsg); } @@ -286,7 +289,6 @@ ControlConnection::send(const ControlCommand &cmd, QString *errmsg) void ControlConnection::onReadyRead() { - QMutexLocker locker(&_connMutex); ReceiveWaiter *waiter; QString errmsg; @@ -304,12 +306,10 @@ ControlConnection::onReadyRead() /* Response to a previous command */ tc::debug("Control Reply: %1").arg(reply.toString()); - _recvMutex.lock(); if (!_recvQueue.isEmpty()) { waiter = _recvQueue.dequeue(); waiter->setResult(true, reply); } - _recvMutex.unlock(); } } else { tc::error("Unable to read control reply: %1").arg(errmsg); @@ -323,7 +323,6 @@ void ControlConnection::run() { /* Create a new control socket */ - _connMutex.lock(); _sock = new ControlSocket(_method); _connectTimer = new QTimer(); @@ -341,33 +340,8 @@ ControlConnection::run() QObject::connect(_connectTimer, SIGNAL(timeout()), this, SLOT(connect()), Qt::DirectConnection); - _connMutex.unlock(); - /* Attempt to connect to Tor */ connect(); - tc::debug("Starting control connection event loop."); - exec(); - tc::debug("Exited control connection event loop."); - - /* Clean up the socket */ - _connMutex.lock(); - _sock->disconnect(this); - delete _sock; - delete _connectTimer; - _sock = 0; - _connMutex.unlock(); - - /* 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.")); - - _recvMutex.lock(); - while (!_recvQueue.isEmpty()) { - ReceiveWaiter *w = _recvQueue.dequeue(); - w->setResult(false, ControlReply(), - tr("Control socket is not connected.")); - } - _recvMutex.unlock(); } @@ -379,16 +353,9 @@ bool ControlConnection::ReceiveWaiter::getResult(ControlReply *reply, QString *errmsg) { - forever { - _mutex.lock(); - if (_status == Waiting) { - _waitCond.wait(&_mutex); - _mutex.unlock(); - } else { - _mutex.unlock(); - break; - } - } + while(_status == Waiting) + QCoreApplication::processEvents(); + if (errmsg) { *errmsg = _errmsg; } @@ -402,11 +369,8 @@ ControlConnection::ReceiveWaiter::setResult(bool success, const ControlReply &reply, const QString &errmsg) { - _mutex.lock(); _status = (success ? Success : Failed); - _reply = reply; + _reply = reply; _errmsg = errmsg; - _mutex.unlock(); - _waitCond.wakeAll(); } diff --git a/src/torcontrol/ControlConnection.h b/src/torcontrol/ControlConnection.h index 5a56ced..d2d2965 100644 --- a/src/torcontrol/ControlConnection.h +++ b/src/torcontrol/ControlConnection.h @@ -29,7 +29,7 @@ #include <QHostAddress> -class ControlConnection : public QThread +class ControlConnection : public QObject { Q_OBJECT @@ -127,6 +127,7 @@ private: }; QQueue<ReceiveWaiter *> _recvQueue; /**< Objects waiting for a reply. */ SendCommandEvent::SendWaiter* _sendWaiter; + bool _connected; }; #endif diff --git a/src/torcontrol/SendCommandEvent.cpp b/src/torcontrol/SendCommandEvent.cpp index 8472324..cf66a1a 100644 --- a/src/torcontrol/SendCommandEvent.cpp +++ b/src/torcontrol/SendCommandEvent.cpp @@ -16,8 +16,7 @@ #include "SendCommandEvent.h" -#include <QMutexLocker> - +#include <QCoreApplication> SendCommandEvent::SendCommandEvent(const ControlCommand &cmd, SendWaiter *w) : QEvent(QEvent::User) @@ -30,26 +29,16 @@ SendCommandEvent::SendCommandEvent(const ControlCommand &cmd, SendWaiter *w) void SendCommandEvent::SendWaiter::setResult(bool success, const QString &errmsg) { - _mutex.lock(); _status = (success ? Success : Failed); _errmsg = errmsg; - _mutex.unlock(); - _waitCond.wakeAll(); } /** Waits for and gets the result of the send operation. */ bool SendCommandEvent::SendWaiter::getResult(QString *errmsg) { - forever { - _mutex.lock(); - if (_status == Waiting) { - _waitCond.wait(&_mutex); - _mutex.unlock(); - } else { - _mutex.unlock(); - break; - } + while(_status == Waiting) { + QCoreApplication::processEvents(); } if (errmsg) { *errmsg = _errmsg; @@ -61,6 +50,5 @@ SendCommandEvent::SendWaiter::getResult(QString *errmsg) SendCommandEvent::SendWaiter::SenderStatus SendCommandEvent::SendWaiter::status() { - QMutexLocker locker(&_mutex); return _status; } diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index e95f9c7..603ba94 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -101,6 +101,7 @@ TorControl::~TorControl() if (isVidaliaRunningTor()) { stop(); } + _controlConn->disconnect(); delete _controlConn; } @@ -132,6 +133,9 @@ TorControl::stop(QString *errmsg) { bool rc = false; + if(!errmsg) + errmsg = new QString(); + if (!isVidaliaRunningTor()) { *errmsg = tr("Vidalia has not started Tor. " "You need to stop Tor through the interface you started it."); diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 65e1e3c..1c4241f 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -557,7 +557,6 @@ MainWindow::aboutToQuit() QObject::disconnect(_torControl, 0, 0, 0); } - /** Attempts to start Tor. If Tor fails to start, then startFailed() will be * called with an error message containing the reason. */ void @@ -892,34 +891,6 @@ void MainWindow::connected() { authenticate(); - if(_torControl->isVidaliaRunningTor()) { - QString err; - if(!_torControl->takeOwnership(&err)) - vWarn(err); - } - - TorSettings settings; - if(settings.autoControlPort()) { - // We want to remember the ports if it's on auto - QString control_str = "", socks_str = ""; - if(_torControl->getInfo("net/listeners/control", control_str)) { - QStringList control_parts = control_str.split(":"); - if(control_parts.size() > 1) - control_str = control_parts[1]; - } - if(_torControl->getInfo("net/listeners/socks", socks_str)) { - QStringList socks_parts = socks_str.split(":"); - if(socks_parts.size() > 1) - socks_str = socks_parts[1]; - } - - _previousControlPort = control_str; - _previousSocksPort = socks_str; - } else { - // Otherwise we want to clear the remembered ports - _previousControlPort = ""; - _previousSocksPort = ""; - } } /** Called when the connection to the control socket fails. The reason will be @@ -952,6 +923,29 @@ MainWindow::connectFailed(QString errmsg) void MainWindow::authenticated() { + TorSettings settings; + if(settings.autoControlPort()) { + // We want to remember the ports if it's on auto + QString control_str = "", socks_str = ""; + if(_torControl->getInfo("net/listeners/control", control_str)) { + QStringList control_parts = control_str.split(":"); + if(control_parts.size() > 1) + control_str = control_parts[1]; + } + if(_torControl->getInfo("net/listeners/socks", socks_str)) { + QStringList socks_parts = socks_str.split(":"); + if(socks_parts.size() > 1) + socks_str = socks_parts[1]; + } + + _previousControlPort = control_str; + _previousSocksPort = socks_str; + } else { + // Otherwise we want to clear the remembered ports + _previousControlPort = ""; + _previousSocksPort = ""; + } + ServerSettings serverSettings(_torControl); QString errmsg; @@ -1143,6 +1137,10 @@ MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs) case BootstrapStatus::BootstrappingDone: description = tr("Connected to the Tor network!"); warn = false; /* probably false anyway */ + // There could be a condition where the circuitEstablished + // signal is not emitted, so we want to assure that the green + // onion appears at the end + circuitEstablished(); break; default: description = tr("Unrecognized startup status");

1 0

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

05 Mar '12

commit 460c17784fa60b40c52b52408b8e7471ee87146c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:34:10 2012 -0300 Add a changes file --- changes/featAsyncControl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/featAsyncControl b/changes/featAsyncControl new file mode 100644 index 0000000..36da183 --- /dev/null +++ b/changes/featAsyncControl @@ -0,0 +1,2 @@ + o Removes the need for threads to handle interaction with the + ControlPort. It now uses asynchronous IO through Qt's event loop. \ No newline at end of file

1 0

[vidalia/alpha] Version bump to 0.3.2-git
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 5288d65615d1fb0d128f2c9d9aae03759b5024be Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:37:04 2012 -0300 Version bump to 0.3.2-git --- CMakeLists.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3325b90..a8ea862 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ set(VER_MAJOR "0") set(VER_MINOR "3") -set(VER_PATCH "1") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") +set(VER_PATCH "2") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

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

05 Mar '12

commit 868091e62451a3a2c1b267671ed3214cc1f11783 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:28:27 2012 -0300 Add a changes file --- changes/featSettings | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/featSettings b/changes/featSettings new file mode 100644 index 0000000..9622b01 --- /dev/null +++ b/changes/featSettings @@ -0,0 +1,6 @@ + o Implements a torrc parser and editor and uses that to take every + tor configuration option from the vidalia.conf file to the + torrc. Vidalia now just needs to know the minimal information to + connect to the tor process (ControlPort or ControlSocket and + authentication) and everything else would be handled through the + torrc file. \ No newline at end of file

1 0