- tor-commits - lists.torproject.org

[vidalia/alpha] Display stream traffic in the Circuit list in the Network Map
by chiiph＠torproject.org 30 Jun '12

30 Jun '12

commit ece9744a678d5601fcf76a2cbb668a88422c75eb Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jun 29 21:50:37 2012 -0300 Display stream traffic in the Circuit list in the Network Map --- src/torcontrol/Stream.cpp | 4 +- src/torcontrol/Stream.h | 1 + src/torcontrol/TorControl.cpp | 2 + src/torcontrol/TorControl.h | 8 +++++ src/torcontrol/TorEvents.cpp | 26 ++++++++++++++++ src/torcontrol/TorEvents.h | 46 ++++++++++++++++++---------- src/vidalia/network/CircuitListWidget.cpp | 19 ++++++++++- src/vidalia/network/CircuitListWidget.h | 6 +++- src/vidalia/network/NetViewer.cpp | 4 ++ src/vidalia/network/NetViewer.ui | 23 ++++++++++++-- src/vidalia/network/StreamItem.cpp | 34 +++++++++++++++++++++ src/vidalia/network/StreamItem.h | 7 ++++ 12 files changed, 154 insertions(+), 26 deletions(-) diff --git a/src/torcontrol/Stream.cpp b/src/torcontrol/Stream.cpp index 7322d48..6f75bc0 100644 --- a/src/torcontrol/Stream.cpp +++ b/src/torcontrol/Stream.cpp @@ -88,8 +88,8 @@ Stream::isValidStreamId(const StreamId &streamId) return false; for (int i = 0; i < length; i++) { - char c = streamId[i].toAscii(); - if (c < '0' && c > '9' && c < 'A' && c > 'Z' && c < 'a' && c > 'z') + QChar c = streamId[i]; + if (!c.isLower() and !c.isUpper() and !c.isNumber()) return false; } return true; diff --git a/src/torcontrol/Stream.h b/src/torcontrol/Stream.h index f688391..8f1dfb0 100644 --- a/src/torcontrol/Stream.h +++ b/src/torcontrol/Stream.h @@ -26,6 +26,7 @@ /** Stream IDs contains 1-16 alphanumeric ASCII characters. */ typedef QString StreamId; +Q_DECLARE_METATYPE(StreamId) class Stream diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index c9893ce..01bfb1d 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -41,6 +41,8 @@ TorControl::TorControl(ControlMethod::Method method) RELAY_SIGNAL(_eventHandler, SIGNAL(bandwidthUpdate(quint64, quint64))); RELAY_SIGNAL(_eventHandler, SIGNAL(circuitStatusChanged(Circuit))); RELAY_SIGNAL(_eventHandler, SIGNAL(streamStatusChanged(Stream))); + RELAY_SIGNAL(_eventHandler, + SIGNAL(streamBandwidthUpdate(StreamId, quint64, quint64))); RELAY_SIGNAL(_eventHandler, SIGNAL(newDescriptors(QStringList))); RELAY_SIGNAL(_eventHandler, SIGNAL(newConsensus())); RELAY_SIGNAL(_eventHandler, SIGNAL(logMessage(tc::Severity, QString))); diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index ec91679..3aa78d3 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -277,6 +277,14 @@ signals: */ void circuitStatusChanged(const Circuit &circuit); + /** Emitted when Tor sends a bandwidth usage update for a stream. + * bytesReceived is the number of bytes read on the stream over + * the previous second and bytesWritten is the number of bytes + * sent over the same interval. + */ + void streamBandwidthUpdate(const StreamId &streamId, + quint64 bytesReceived, quint64 bytesSent); + /** Emitted when Tor has mapped the address from to the address * to. expires indicates the time at which when the address * mapping will no longer be considered valid. diff --git a/src/torcontrol/TorEvents.cpp b/src/torcontrol/TorEvents.cpp index db337e5..8b7c401 100644 --- a/src/torcontrol/TorEvents.cpp +++ b/src/torcontrol/TorEvents.cpp @@ -41,6 +41,7 @@ TorEvents::TorEvents(QObject *parent) qRegisterMetaType<BootstrapStatus>("BootstrapStatus"); qRegisterMetaType<Circuit>("Circuit"); qRegisterMetaType<Stream>("Stream"); + qRegisterMetaType<StreamId>("StreamId"); qRegisterMetaType<QHostAddress>("QHostAddress"); qRegisterMetaType<QDateTime>("QDateTime"); @@ -66,6 +67,7 @@ TorEvents::toString(Event e) case ClientStatus: event = "STATUS_CLIENT"; break; case ServerStatus: event = "STATUS_SERVER"; break; case NewConsensus: event = "NEWCONSENSUS"; break; + case StreamBandwidth: event = "STREAM_BW"; break; default: event = "UNKNOWN"; break; } return event; @@ -104,6 +106,8 @@ TorEvents::toTorEvent(const QString &event) e = ServerStatus; } else if (event == "NEWCONSENSUS") { e = NewConsensus; + } else if (event == "STREAM_BW") { + e = StreamBandwidth; } else { e = Unknown; } @@ -131,6 +135,7 @@ TorEvents::handleEvent(const ControlReply &reply) case Bandwidth: handleBandwidthUpdate(line); break; case CircuitStatus: handleCircuitStatus(line); break; case StreamStatus: handleStreamStatus(line); break; + case StreamBandwidth:handleStreamBandwidthUpdate(line); break; case NewDescriptor: handleNewDescriptor(line); break; case NewConsensus: handleNewConsensus(line); break; case AddressMap: handleAddressMap(line); break; @@ -225,6 +230,27 @@ TorEvents::handleStreamStatus(const ReplyLine &line) } } +/** Handle a stream bandwidth update event. The format of this message is: + * + * "650" SP "STREAM_BW" SP StreamID SP BytesWritten SP BytesRead + * BytesWritten = 1*DIGIT + * BytesRead = 1*DIGIT + */ +void +TorEvents::handleStreamBandwidthUpdate(const ReplyLine &line) +{ + QStringList msg = line.getMessage().split(" "); + if (msg.size() >= 4) { + StreamId streamId = msg.at(1); + quint64 bytesSent = (quint64)msg.at(2).toULongLong(); + quint64 bytesReceived = (quint64)msg.at(3).toULongLong(); + + /* Post the event to each of the interested targets */ + if (Stream::isValidStreamId(streamId)) + emit streamBandwidthUpdate(streamId, bytesReceived, bytesSent); + } +} + /** Handle a log message event. The format of this message is: * The syntax is: * diff --git a/src/torcontrol/TorEvents.h b/src/torcontrol/TorEvents.h index 832034d..4642a7e 100644 --- a/src/torcontrol/TorEvents.h +++ b/src/torcontrol/TorEvents.h @@ -25,6 +25,7 @@ class Circuit; class Stream; +typedef QString StreamId; class BootstrapStatus; class ControlReply; class ReplyLine; @@ -41,25 +42,26 @@ class TorEvents : public QObject public: /** Asynchronous events sent from Tor to the controller */ enum Event { - Unknown = 0, - Bandwidth = (1u << 0), - LogDebug = (1u << 1), - LogInfo = (1u << 2), - LogNotice = (1u << 3), - LogWarn = (1u << 4), - LogError = (1u << 5), - CircuitStatus = (1u << 6), - StreamStatus = (1u << 7), - OrConnStatus = (1u << 8), - NewDescriptor = (1u << 9), - AddressMap = (1u << 10), - GeneralStatus = (1u << 11), - ClientStatus = (1u << 12), - ServerStatus = (1u << 13), - NewConsensus = (1u << 14), + Unknown = 0, + Bandwidth = (1u << 0), + LogDebug = (1u << 1), + LogInfo = (1u << 2), + LogNotice = (1u << 3), + LogWarn = (1u << 4), + LogError = (1u << 5), + CircuitStatus = (1u << 6), + StreamStatus = (1u << 7), + OrConnStatus = (1u << 8), + NewDescriptor = (1u << 9), + AddressMap = (1u << 10), + GeneralStatus = (1u << 11), + ClientStatus = (1u << 12), + ServerStatus = (1u << 13), + NewConsensus = (1u << 14), + StreamBandwidth = (1u << 15), }; static const Event EVENT_MIN = TorEvents::Bandwidth; - static const Event EVENT_MAX = TorEvents::NewConsensus; + static const Event EVENT_MAX = TorEvents::StreamBandwidth; Q_DECLARE_FLAGS(Events, Event); /** Default Constructor */ @@ -92,6 +94,14 @@ signals: */ void circuitStatusChanged(const Circuit &circuit); + /** Emitted when Tor sends a bandwidth usage update for a stream. + * bytesReceived is the number of bytes read on the stream over + * the previous second and bytesWritten is the number of bytes + * sent over the same interval. + */ + void streamBandwidthUpdate(const StreamId &streamId, + quint64 bytesReceived, quint64 bytesSent); + /** Emitted when Tor has mapped the address from to the address * to. expires indicates the time at which when the address * mapping will no longer be considered valid. @@ -227,6 +237,8 @@ private: void handleCircuitStatus(const ReplyLine &line); /** Handle a stream status event */ void handleStreamStatus(const ReplyLine &line); + /** Handle a stream bandwidth event */ + void handleStreamBandwidthUpdate(const ReplyLine &line); /** Handle a log message event */ void handleLogMessage(const ReplyLine &line); /** Handle an OR connection status event. */ diff --git a/src/vidalia/network/CircuitListWidget.cpp b/src/vidalia/network/CircuitListWidget.cpp index 4773d9b..a92ad9c 100644 --- a/src/vidalia/network/CircuitListWidget.cpp +++ b/src/vidalia/network/CircuitListWidget.cpp @@ -34,7 +34,7 @@ CircuitListWidget::CircuitListWidget(QWidget *parent) : QTreeWidget(parent) { /* Create and initialize columns */ - setHeaderLabels(QStringList() << tr("Connection") << tr("Status")); + setHeaderLabels(QStringList() << tr("Connection") << tr("Status") << tr("Traffic")); /* Find out when a circuit has been selected */ connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), @@ -52,13 +52,14 @@ CircuitListWidget::CircuitListWidget(QWidget *parent) void CircuitListWidget::retranslateUi() { - setHeaderLabels(QStringList() << tr("Connection") << tr("Status")); + setHeaderLabels(QStringList() << tr("Connection") << tr("Status") << tr("Traffic")); for (int i = 0; i < topLevelItemCount(); i++) { CircuitItem *circuitItem = dynamic_cast<CircuitItem *>(topLevelItem(i)); circuitItem->update(circuitItem->circuit()); foreach (StreamItem *streamItem, circuitItem->streams()) { streamItem->update(streamItem->stream()); + streamItem->setTraffic(streamItem->bytesReceived(), streamItem->bytesSent()); } } } @@ -197,6 +198,20 @@ CircuitListWidget::addStream(const Stream &stream) } } +/** Updates the traffic totals for a stream with the given delta values. */ +void +CircuitListWidget::onStreamBandwidthUpdate(const StreamId &streamId, + quint64 bytesReceived, + quint64 bytesSent) +{ + StreamItem *item = findStreamItem(streamId); + if (item) { + item->setTraffic( + item->bytesReceived() + bytesReceived, + item->bytesSent() + bytesSent); + } +} + /** Schedules the given circuit to be removed after the specified timeout. */ void CircuitListWidget::scheduleCircuitRemoval(CircuitItem *circuit, int delay) diff --git a/src/vidalia/network/CircuitListWidget.h b/src/vidalia/network/CircuitListWidget.h index 1405b17..7fb4d5e 100644 --- a/src/vidalia/network/CircuitListWidget.h +++ b/src/vidalia/network/CircuitListWidget.h @@ -34,7 +34,8 @@ public: /** Circuit list columns. */ enum Columns { ConnectionColumn = 0, /**< Column for either the circuit or stream */ - StatusColumn = 1 /**< Status of the connection. */ + StatusColumn = 1, /**< Status of the connection. */ + TrafficColumn = 2, /**< Amount of data received and sent by the stream. */ }; /** Default constructor */ @@ -66,6 +67,9 @@ signals: public slots: /** Clears all circuits and streams from the list. */ void clearCircuits(); + /** Updates the traffic totals for a stream with the given delta values. */ + void onStreamBandwidthUpdate(const StreamId &streamId, + quint64 bytesReceived, quint64 bytesSent); private slots: /** Removes the first circuit scheduled to be removed.*/ diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index 2747cd6..475a35e 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -103,6 +103,10 @@ NetViewer::NetViewer(QWidget *parent) connect(_torControl, SIGNAL(streamStatusChanged(Stream)), this, SLOT(addStream(Stream))); + _torControl->setEvent(TorEvents::StreamBandwidth); + connect(_torControl, SIGNAL(streamBandwidthUpdate(StreamId, quint64, quint64)), + ui.treeCircuitList, SLOT(onStreamBandwidthUpdate(StreamId, quint64, quint64))); + _torControl->setEvent(TorEvents::AddressMap); connect(_torControl, SIGNAL(addressMapped(QString, QString, QDateTime)), this, SLOT(addressMapped(QString, QString, QDateTime))); diff --git a/src/vidalia/network/NetViewer.ui b/src/vidalia/network/NetViewer.ui index 7994fb9..9d8dc87 100644 --- a/src/vidalia/network/NetViewer.ui +++ b/src/vidalia/network/NetViewer.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>740</width> - <height>786</height> + <height>752</height> </rect> </property> <property name="windowTitle"> @@ -224,7 +224,7 @@ <bool>false</bool> </property> <property name="columnCount"> - <number>2</number> + <number>3</number> </property> <column> <property name="text"> @@ -236,6 +236,11 @@ <string>Status</string> </property> </column> + <column> + <property name="text"> + <string>Traffic</string> + </property> + </column> </widget> </item> </layout> @@ -279,7 +284,7 @@ <bool>false</bool> </property> <property name="columnCount"> - <number>2</number> + <number>3</number> </property> <column> <property name="text"> @@ -291,6 +296,11 @@ <string>Status</string> </property> </column> + <column> + <property name="text"> + <string>Traffic</string> + </property> + </column> </widget> </item> </layout> @@ -334,7 +344,7 @@ <bool>false</bool> </property> <property name="columnCount"> - <number>2</number> + <number>3</number> </property> <column> <property name="text"> @@ -346,6 +356,11 @@ <string>Status</string> </property> </column> + <column> + <property name="text"> + <string>Traffic</string> + </property> + </column> </widget> </item> </layout> diff --git a/src/vidalia/network/StreamItem.cpp b/src/vidalia/network/StreamItem.cpp index 5083b81..6d77afe 100644 --- a/src/vidalia/network/StreamItem.cpp +++ b/src/vidalia/network/StreamItem.cpp @@ -19,6 +19,7 @@ /** Constructor */ StreamItem::StreamItem(const Stream &stream) + : _bytesReceived(0), _bytesSent(0) { /* Set the stream's displayed target information */ setText(CircuitListWidget::ConnectionColumn, stream.target()); @@ -37,3 +38,36 @@ StreamItem::update(const Stream &stream) setToolTip(CircuitListWidget::StatusColumn, stream.statusString()); } +/** Formats a count of bytes appropriately as bytes, kilobytes, + * megabytes, or gigabytes. */ +static +QString formatBytes(quint64 bytes) { + const int K = 1024, M = K * K, G = K * M; + double d = bytes; + /*if (bytes < 1 * K) return QString("%1 B").arg(bytes);*/ + if (bytes < 10 * K) return QString("%1 KB").arg(d / K, 0, 'f', 1); + if (bytes < 1 * M) return QString("%1 KB").arg(d / K, 0, 'f', 0); + if (bytes < 100 * M) return QString("%1 MB").arg(d / M, 0, 'f', 1); + if (bytes < 1 * G) return QString("%1 MB").arg(d / M, 0, 'f', 0); + return QString("%1 GB").arg(d / G, 0, 'f', 1); +} + +/** Updates the traffic totals of this stream item. */ +void +StreamItem::setTraffic(quint64 bytesReceived, quint64 bytesSent) +{ + _bytesReceived = bytesReceived; + _bytesSent = bytesSent; + + QString str; + if (bytesReceived | bytesSent) { + str = QString("%1 down / %2 up").arg( + formatBytes(bytesReceived), + formatBytes(bytesSent)); + } else { + str = QString(); + } + + setText(CircuitListWidget::TrafficColumn, str); + setToolTip(CircuitListWidget::TrafficColumn, str); +} diff --git a/src/vidalia/network/StreamItem.h b/src/vidalia/network/StreamItem.h index ea8d906..1521d03 100644 --- a/src/vidalia/network/StreamItem.h +++ b/src/vidalia/network/StreamItem.h @@ -33,8 +33,15 @@ public: /** Returns the ID of the stream associated with this tree item. */ StreamId id() const { return _stream.id(); } + /** Updates the traffic totals of this stream item. */ + void setTraffic(quint64 bytesReceived, quint64 bytesSent); + quint64 bytesReceived() const { return _bytesReceived; } + quint64 bytesSent() const { return _bytesSent; } + private: Stream _stream; + quint64 _bytesReceived; + quint64 _bytesSent; }; #endif

1 0

[vidalia/alpha] Update Vidalia status to CircuitEstablished for BootstrapDone
by chiiph＠torproject.org 30 Jun '12

30 Jun '12

commit 06b91c555cad4e2614fc6a45730aba6d82de6ac0 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jun 29 20:16:32 2012 -0300 Update Vidalia status to CircuitEstablished for BootstrapDone --- src/vidalia/MainWindow.cpp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 73e4d41..3ddfb35 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1327,6 +1327,7 @@ MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs) break; case BootstrapStatus::BootstrappingDone: description = tr("Connected to the Tor network!"); + updateTorStatus(CircuitEstablished); warn = false; /* probably false anyway */ break; default:

1 0

[vidalia/alpha] Move macdeployqt execution to dist-osx-libraries
by chiiph＠torproject.org 30 Jun '12

30 Jun '12

commit dec1f10a1563b2817d4378d6a56d87bf86189328 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jun 29 20:15:56 2012 -0300 Move macdeployqt execution to dist-osx-libraries --- pkg/osx/CMakeLists.txt | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt index c44a47c..6b61115 100644 --- a/pkg/osx/CMakeLists.txt +++ b/pkg/osx/CMakeLists.txt @@ -13,7 +13,10 @@ set(VIDALIA_APP_BUNDLE_ROOT ${Vidalia_BINARY_DIR}/src/vidalia/Vidalia.app) get_target_property(VIDALIA_EXECUTABLE Vidalia LOCATION) -add_custom_target(dist-osx-libraries DEPENDS Vidalia) +add_custom_target(dist-osx-libraries DEPENDS Vidalia + COMMAND ${QT_BINARY_DIR}/macdeployqt ${VIDALIA_APP_BUNDLE_ROOT} +) + if (QT_USE_FRAMEWORKS) vidalia_copy_plugins( TARGET dist-osx-libraries @@ -50,7 +53,6 @@ else(OSX_FAT_BINARY) endif(OSX_FAT_BINARY) add_custom_target(dist-osx - COMMAND ${QT_BINARY_DIR}/macdeployqt ${VIDALIA_APP_BUNDLE_ROOT} COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pkg-dmg --source ${VIDALIA_APP_BUNDLE_ROOT} --target ${Vidalia_BINARY_DIR}/vidalia-${VERSION}-${DMG_ARCH}.dmg

1 0

[vidalia/alpha] Automatically add bridge if it's in the lineEdit when pressing Ok
by chiiph＠torproject.org 29 Jun '12

29 Jun '12

commit 4f58c63de35c602506ae6b9a215bd33592c90e0f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jun 29 20:13:11 2012 -0300 Automatically add bridge if it's in the lineEdit when pressing Ok --- changes/bug5107 | 3 +++ src/vidalia/config/NetworkPage.cpp | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug5107 b/changes/bug5107 new file mode 100644 index 0000000..47ba055 --- /dev/null +++ b/changes/bug5107 @@ -0,0 +1,3 @@ + Bugfixes relative to Vidalia 0.2.x: + o Automatically add a bridge if it is in the lineEdit but the user haven't + pressed the plus button. Fixes bug 5107. diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index beeb075..ea132e6 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -254,6 +254,10 @@ NetworkPage::save(QString &errmsg) } _settings->setReachablePorts(reachablePorts); + if (!ui.lineBridge->text().trimmed().isEmpty()) + addBridge(); + + if (ui.chkUseBridges->isChecked()) { if (ui.listBridges->count() < 1) { errmsg = tr("You must specify one or more bridges.");

1 0

[orbot/master] additional notification icon cleanup
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 85963c44e8937bc641628b27b0b22f1d94bdad7a Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 29 12:04:11 2012 -0400 additional notification icon cleanup --- res/drawable/tornotification.png | Bin 978 -> 1080 bytes res/drawable/tornotificationoff.png | Bin 828 -> 0 bytes res/drawable/tornotificationon.png | Bin 1073 -> 1123 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/tornotification.png b/res/drawable/tornotification.png index ecb5cce..ff158f4 100644 Binary files a/res/drawable/tornotification.png and b/res/drawable/tornotification.png differ diff --git a/res/drawable/tornotificationoff.png b/res/drawable/tornotificationoff.png deleted file mode 100644 index fa5eb3e..0000000 Binary files a/res/drawable/tornotificationoff.png and /dev/null differ diff --git a/res/drawable/tornotificationon.png b/res/drawable/tornotificationon.png index 0b62f10..1f39075 100644 Binary files a/res/drawable/tornotificationon.png and b/res/drawable/tornotificationon.png differ

1 0

[orbot/master] made transproxy app list alphabetical
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 080fd5e249086713219351f80331f351150717a9 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 29 11:41:36 2012 -0400 made transproxy app list alphabetical --- .../torproject/android/settings/AppManager.java | 2 ++ .../torproject/android/settings/TorifiedApp.java | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index db641ae..0733030 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -5,6 +5,7 @@ package org.torproject.android.settings; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -266,6 +267,7 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC appIdx++; } + Collections.sort(apps); return apps; } diff --git a/src/org/torproject/android/settings/TorifiedApp.java b/src/org/torproject/android/settings/TorifiedApp.java index 8e53321..a786800 100644 --- a/src/org/torproject/android/settings/TorifiedApp.java +++ b/src/org/torproject/android/settings/TorifiedApp.java @@ -2,7 +2,7 @@ package org.torproject.android.settings; import android.graphics.drawable.Drawable; -public class TorifiedApp { +public class TorifiedApp implements Comparable { private boolean enabled; private int uid; @@ -115,4 +115,16 @@ public class TorifiedApp { public void setIcon(Drawable icon) { this.icon = icon; } + + @Override + public int compareTo(Object another) { + + return this.toString().compareTo(another.toString()); + } + + @Override + public String toString () + { + return getName(); + } }

1 0

[orbot/master] small cleanup to main layout and notify icons
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit ea7154f2c891300f0e465fd8d2da66372ae3bd2e Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 29 11:41:13 2012 -0400 small cleanup to main layout and notify icons --- res/drawable/tornotification.png | Bin 779 -> 978 bytes res/drawable/tornotificationon.png | Bin 826 -> 1073 bytes res/layout/layout_main.xml | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/drawable/tornotification.png b/res/drawable/tornotification.png index 068c3b9..ecb5cce 100644 Binary files a/res/drawable/tornotification.png and b/res/drawable/tornotification.png differ diff --git a/res/drawable/tornotificationon.png b/res/drawable/tornotificationon.png index 68e8a34..0b62f10 100644 Binary files a/res/drawable/tornotificationon.png and b/res/drawable/tornotificationon.png differ diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 36ba9a7..db167e3 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -16,8 +16,8 @@ <ImageView android:id="@+id/radioModeImage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="3px" - android:layout_marginRight="3px" + android:layout_marginTop="3dp" + android:layout_marginRight="3dp" android:gravity="right" android:layout_toRightOf="@+id/radioModeLabel" android:layout_alignParentRight="true" @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/powered_by" - android:layout_marginTop="8px" + android:layout_marginTop="8dp" android:layout_marginRight="0px" android:gravity="right" android:layout_toLeftOf="@+id/radioModeImage" @@ -45,6 +45,7 @@ android:layout_marginTop="40dp" android:layout_weight="1" android:src="@drawable/toroff" + android:contentDescription="activate button" android:layout_gravity="center_horizontal" /> <TextView android:id="@+id/lblStatus" @@ -55,7 +56,6 @@ android:layout_height="wrap_content" android:textColor="#ffffff" - android:layout_below="@id/imgStatus" /> </LinearLayout>

1 0

[orbot/master] re-added startService() call as some devices/OS need it
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 318beaabcd92f2e180428e45d9476be00c1aa4fb Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 29 12:04:26 2012 -0400 re-added startService() call as some devices/OS need it --- src/org/torproject/android/Orbot.java | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index e10f9af..1a09ac7 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -91,6 +91,9 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener imgStatus = (ImageView)findViewById(R.id.imgStatus); imgStatus.setOnLongClickListener(this); + + startService(new Intent(INTENT_TOR_SERVICE)); + } @@ -307,12 +310,9 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener protected void onResume() { super.onResume(); - setLocale(); - - bindService(); - // startService(new Intent(INTENT_TOR_SERVICE)); - +// setLocale(); + bindService(); if (getIntent() == null) return; @@ -393,19 +393,17 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener } } - } - - /* (non-Javadoc) - * @see android.app.Activity#onStart() - */ - protected void onStart() { - super.onStart(); - updateStatus (""); } + @Override + public void onConfigurationChanged(Configuration newConfig) { + // TODO Auto-generated method stub + super.onConfigurationChanged(newConfig); + } + /* (non-Javadoc) * @see android.app.Activity#onStop() */ @@ -462,7 +460,8 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener //then update the preferences in an async background task if (requestCode == 1 && resultCode == 1010 && mService != null) { - new ProcessSettingsAsyncTask().execute(mService); + new ProcessSettingsAsyncTask().execute(mService); + setLocale(); } }

1 0

[orbot/master] updated changelog
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 8d27d150398e2924f85ea65cd74ce8da80e5a375 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 29 12:04:38 2012 -0400 updated changelog --- CHANGELOG | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4bcb570..f01f6de 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,9 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at http - added docs folder and readme's - clarified english strings for hidden srv and proxying - moved Tor data directory to app_data from cache +- fixed notification persistence handling +- fixed relay/server mode option resolv.conf error +- fixed app list display 1.0.8 (includes 1.0.7.3 and 1.0.7.2) - new external/Makefile and git submodules

1 0

[stem/master] Handling version 1.1 of bridge extrainfo descriptors
by atagar＠torproject.org 29 Jun '12

29 Jun '12

commit c35c8a6cbb3659841f79159512c24a08a5e1d622 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 29 09:59:16 2012 -0700 Handling version 1.1 of bridge extrainfo descriptors Version 1.1 of the bridge extrainfo descriptors adds a new 'transport' field. I'm not entirely sure yet of its attributes, but recognizing the new descriptor version and parsing the field. I'm also expanding the tests a bit so unit tests cover bridge extrainfo descriptors, and parsing the metrics header line rather than just doing string matches. This is to address... https://trac.torproject.org/6257 --- stem/descriptor/__init__.py | 27 ++++++++++---- stem/descriptor/extrainfo_descriptor.py | 8 ++++- test/unit/descriptor/extrainfo_descriptor.py | 50 +++++++++++++++++++++++--- 3 files changed, 71 insertions(+), 14 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 929396c..21dad37 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -65,15 +65,26 @@ def parse_file(path, descriptor_file): # Metrics descriptor handling. These contain a single descriptor per file. first_line, desc = descriptor_file.readline().strip(), None + metrics_header_match = re.match("^@type (\S+) (\d+).(\d+)$", first_line) - if first_line == "@type server-descriptor 1.0": - desc = stem.descriptor.server_descriptor.RelayDescriptor(descriptor_file.read()) - elif first_line == "@type bridge-server-descriptor 1.0": - desc = stem.descriptor.server_descriptor.BridgeDescriptor(descriptor_file.read()) - elif first_line in ("@type extra-info 1.0"): - desc = stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor(descriptor_file.read()) - elif first_line in ("@type bridge-extra-info 1.0"): - desc = stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor(descriptor_file.read()) + if metrics_header_match: + # still doesn't necessarily mean that this is a descriptor, check if the + # header contents are recognized + + desc_type, major_version, minor_version = metrics_header_match.groups() + major_version, minor_version = int(major_version), int(minor_version) + + if desc_type == "server-descriptor" and major_version == 1 and minor_version == 0: + desc = stem.descriptor.server_descriptor.RelayDescriptor(descriptor_file.read()) + elif desc_type == "bridge-server-descriptor" and major_version == 1 and minor_version == 0: + desc = stem.descriptor.server_descriptor.BridgeDescriptor(descriptor_file.read()) + elif desc_type == "extra-info" and major_version == 1 and minor_version == 0: + desc = stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor(descriptor_file.read()) + elif desc_type == "bridge-extra-info" and major_version == 1 and minor_version in (0, 1): + # version 1.1 introduced a 'transport' field... + # https://trac.torproject.org/6257 + + desc = stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor(descriptor_file.read()) if desc: desc._set_path(path) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 04f061a..979c679 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -742,10 +742,13 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): """ Bridge extra-info descriptor (`specification <https://metrics.torproject.org/formats.html#bridgedesc>`_) + + :var str transport: transport method recognized by the bridge (ex. obfs3) """ def __init__(self, raw_contents, validate = True): self._digest = None + self.transport = None ExtraInfoDescriptor.__init__(self, raw_contents, validate) @@ -760,7 +763,10 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): value, _ = values[0] line = "%s %s" % (keyword, value) # original line - if keyword == "router-digest": + if keyword == "transport": + self.transport = value + del entries["transport"] + elif keyword == "router-digest": if validate and not stem.util.tor_tools.is_hex_digits(value, 40): raise ValueError("Router digest line had an invalid sha1 digest: %s" % line) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index 888180c..e9b06a0 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -4,7 +4,7 @@ Unit tests for stem.descriptor.extrainfo_descriptor. import datetime import unittest -from stem.descriptor.extrainfo_descriptor import RelayExtraInfoDescriptor, DirResponses, DirStats +from stem.descriptor.extrainfo_descriptor import RelayExtraInfoDescriptor, BridgeExtraInfoDescriptor, DirResponses, DirStats CRYPTO_BLOB = """ K5FSywk7qvw/boA4DQcqkls6Ize5vcBYfhQ8JnOeRQC9+uDxbnpm3qaYN9jZ8myj @@ -12,13 +12,19 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw 7LZqklu+gVvhMKREpchVqlAwXkWR44VENm24Hs+mT3M= """ -EXTRAINFO_DESCRIPTOR_ATTR = ( +RELAY_EXTRAINFO_ATTR = ( ("extra-info", "ninja B2289C3EAB83ECD6EB916A2F481A02E6B76A0A48"), ("published", "2012-05-05 17:03:50"), ("router-signature", "\n-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----" % CRYPTO_BLOB), ) -def _make_descriptor(attr = None, exclude = None): +BRIDGE_EXTRAINFO_ATTR = ( + ("extra-info", "ec2bridgereaac65a3 1EC248422B57D9C0BD751892FE787585407479A4"), + ("published", "2012-05-05 17:03:50"), + ("router-digest", "006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4"), +) + +def _make_descriptor(attr = None, exclude = None, is_bridge = False): """ Constructs a minimal extrainfo descriptor with the given attributes. @@ -31,21 +37,28 @@ def _make_descriptor(attr = None, exclude = None): descriptor_lines = [] if attr is None: attr = {} if exclude is None: exclude = [] + desc_attr = BRIDGE_EXTRAINFO_ATTR if is_bridge else RELAY_EXTRAINFO_ATTR attr = dict(attr) # shallow copy since we're destructive - for keyword, value in EXTRAINFO_DESCRIPTOR_ATTR: + for keyword, value in desc_attr: if keyword in exclude: continue elif keyword in attr: value = attr[keyword] del attr[keyword] # if this is the last entry then we should dump in any unused attributes - if keyword == "router-signature": + if not is_bridge and keyword == "router-signature": for attr_keyword, attr_value in attr.items(): descriptor_lines.append("%s %s" % (attr_keyword, attr_value)) descriptor_lines.append("%s %s" % (keyword, value)) + # bridges don't have a router-signature so simply append any extra attributes + # to the end + if is_bridge: + for attr_keyword, attr_value in attr.items(): + descriptor_lines.append("%s %s" % (attr_keyword, attr_value)) + return "\n".join(descriptor_lines) class TestExtraInfoDescriptor(unittest.TestCase): @@ -492,6 +505,33 @@ class TestExtraInfoDescriptor(unittest.TestCase): desc_text = _make_descriptor({keyword: entry}) self._expect_invalid_attr(desc_text, attr, {}) + def test_minimal_bridge_descriptor(self): + """ + Basic sanity check that we can parse a descriptor with minimal attributes. + """ + + desc_text = _make_descriptor(is_bridge = True) + desc = BridgeExtraInfoDescriptor(desc_text) + + self.assertEquals("ec2bridgereaac65a3", desc.nickname) + self.assertEquals("1EC248422B57D9C0BD751892FE787585407479A4", desc.fingerprint) + self.assertEquals("006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4", desc.digest()) + self.assertEquals([], desc.get_unrecognized_lines()) + + # check that we don't have crypto fields + self.assertRaises(AttributeError, getattr, desc, "signature") + + def test_transport_line(self): + """ + Basic exercise of the bridge descriptor's transport entry. + attributes. + """ + + desc_text = _make_descriptor({"transport": "obfs3"}, is_bridge = True) + desc = BridgeExtraInfoDescriptor(desc_text) + self.assertEquals("obfs3", desc.transport) + self.assertEquals([], desc.get_unrecognized_lines()) + def _expect_invalid_attr(self, desc_text, attr = None, expected_value = None): """ Asserts that construction will fail due to desc_text having a malformed

1 0