- tor-commits - lists.torproject.org

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 20 May '11

20 May '11

commit 16bfb4d6c74e2077e5bdca7156ef281b61ed050d Merge: e3b8457 b8ffb00 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 20 03:03:01 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug3252 | 4 ++++ src/or/config.c | 2 +- src/or/connection.c | 2 +- src/or/dns.c | 9 ++++++--- src/or/main.c | 2 +- src/or/router.c | 21 ++++++++++++++------- src/or/router.h | 2 +- 7 files changed, 28 insertions(+), 14 deletions(-)

1 0

[tor/maint-0.2.2] log the reason for publishing a new relay descriptor
by arma＠torproject.org 20 May '11

20 May '11

commit b8ffb00cf1ddf4ff1b64335f8677d600a948fffc Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 19 23:36:20 2011 -0400 log the reason for publishing a new relay descriptor now we have a better chance of hunting down the root cause of bug 1810. --- changes/bug3252 | 4 ++++ src/or/config.c | 2 +- src/or/dns.c | 9 ++++++--- src/or/main.c | 2 +- src/or/router.c | 21 ++++++++++++++------- src/or/router.h | 2 +- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/changes/bug3252 b/changes/bug3252 new file mode 100644 index 0000000..f85f633 --- /dev/null +++ b/changes/bug3252 @@ -0,0 +1,4 @@ + o Minor features: + - Relays now log the reason for publishing a new relay descriptor, + so we have a better chance of hunting down the root cause of bug + 1810. Resolves ticket 3252. diff --git a/src/or/config.c b/src/or/config.c index 8b59d50..68a6b29 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1459,7 +1459,7 @@ options_act(or_options_t *old_options) */ if (!old_options || options_transition_affects_descriptor(old_options, options)) - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("config change"); /* We may need to reschedule some directory stuff if our status changed. */ if (old_options) { diff --git a/src/or/dns.c b/src/or/dns.c index 61c8f32..9b6b98a 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1295,14 +1295,17 @@ configure_nameservers(int force) nameservers_configured = 1; if (nameserver_config_failed) { nameserver_config_failed = 0; - mark_my_descriptor_dirty(); + /* XXX the three calls to republish the descriptor might be producing + * descriptors that are only cosmetically different, especially on + * non-exit relays! -RD */ + mark_my_descriptor_dirty("dns resolvers back"); } return 0; err: nameservers_configured = 0; if (! nameserver_config_failed) { nameserver_config_failed = 1; - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("dns resolvers failed"); } return -1; } @@ -1522,7 +1525,7 @@ add_wildcarded_test_address(const char *address) "broken.", address, n); if (!dns_is_completely_invalid) { dns_is_completely_invalid = 1; - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("dns hijacking confirmed"); } if (!dns_wildcarded_test_address_notice_given) control_event_server_status(LOG_WARN, "DNS_USELESS"); diff --git a/src/or/main.c b/src/or/main.c index 2c95024..d1ceeec 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1381,7 +1381,7 @@ ip_address_changed(int at_interface) reset_bandwidth_test(); stats_n_seconds_working = 0; router_reset_reachability(); - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("IP address changed"); } } diff --git a/src/or/router.c b/src/or/router.c index 616a290..49a986d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -87,7 +87,7 @@ set_onion_key(crypto_pk_env_t *k) onionkey = k; onionkey_set_at = time(NULL); tor_mutex_release(key_lock); - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("set onion key"); } /** Return the current onion key. Requires that the onion key has been @@ -274,7 +274,7 @@ rotate_onion_key(void) now = time(NULL); state->LastRotatedOnionKey = onionkey_set_at = now; tor_mutex_release(key_lock); - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("rotated onion key"); or_state_mark_dirty(state, get_options()->AvoidDiskWrites ? now+3600 : 0); goto done; error: @@ -908,7 +908,7 @@ router_orport_found_reachable(void) get_options()->_PublishServerDescriptor != NO_AUTHORITY ? " Publishing server descriptor." : ""); can_reach_or_port = 1; - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("ORPort found reachable"); control_event_server_status(LOG_NOTICE, "REACHABILITY_SUCCEEDED ORADDRESS=%s:%d", me->address, me->or_port); @@ -925,7 +925,7 @@ router_dirport_found_reachable(void) "from the outside. Excellent."); can_reach_dir_port = 1; if (decide_to_advertise_dirport(get_options(), me->dir_port)) - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("DirPort found reachable"); control_event_server_status(LOG_NOTICE, "REACHABILITY_SUCCEEDED DIRADDRESS=%s:%d", me->address, me->dir_port); @@ -1232,6 +1232,10 @@ router_upload_dir_desc_to_dirservers(int force) return; if (!force && !desc_needs_upload) return; + + log_info(LD_OR, "Uploading relay descriptor to directory authorities%s", + force ? " (forced)" : ""); + desc_needs_upload = 0; desc_len = ri->cache_info.signed_descriptor_len; @@ -1423,6 +1427,8 @@ router_rebuild_descriptor(int force) return -1; } + log_info(LD_OR, "Rebuilding relay descriptor%s", force ? " (forced)" : ""); + ri = tor_malloc_zero(sizeof(routerinfo_t)); ri->cache_info.routerlist_index = -1; ri->address = tor_dup_ip(addr); @@ -1597,14 +1603,15 @@ void mark_my_descriptor_dirty_if_older_than(time_t when) { if (desc_clean_since < when) - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("time for new descriptor"); } /** Call when the current descriptor is out of date. */ void -mark_my_descriptor_dirty(void) +mark_my_descriptor_dirty(const char *reason) { desc_clean_since = 0; + log_info(LD_OR, "Decided to publish new relay descriptor: %s", reason); } /** How frequently will we republish our descriptor because of large (factor @@ -1629,7 +1636,7 @@ check_descriptor_bandwidth_changed(time_t now) if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now) { log_info(LD_GENERAL, "Measured bandwidth has changed; rebuilding descriptor."); - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("bandwidth has changed"); last_changed = now; } } diff --git a/src/or/router.h b/src/or/router.h index 1bf1a51..95c0a34 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -62,7 +62,7 @@ int should_refuse_unknown_exits(or_options_t *options); void router_upload_dir_desc_to_dirservers(int force); void mark_my_descriptor_dirty_if_older_than(time_t when); -void mark_my_descriptor_dirty(void); +void mark_my_descriptor_dirty(const char *reason); void check_descriptor_bandwidth_changed(time_t now); void check_descriptor_ipaddress_changed(time_t now); void router_new_address_suggestion(const char *suggestion,

1 0

[tor/maint-0.2.2] Fix a compile warning on OSX 10.6
by arma＠torproject.org 20 May '11

20 May '11

commit c13fb7feb1ee9d97a0ccbdae880b90a73efcc07c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 20 05:52:36 2011 +0200 Fix a compile warning on OSX 10.6 --- src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index bcdde67..7241458 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3233,7 +3233,7 @@ alloc_http_authenticator(const char *authenticator) tor_free(base64_authenticator); /* free and set to null */ } else { int i = 0, j = 0; - int len = strlen(base64_authenticator); + ssize_t len = strlen(base64_authenticator); /* remove all newline occurrences within the string */ for (i=0; i < len; ++i) {

1 0

[vidalia/alpha] Fix connection problem
by chiiph＠torproject.org 20 May '11

20 May '11

commit 3d3f6312246e5e1d182df6e5f1603b0d527459b3 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Fri May 20 00:03:38 2011 -0300 Fix connection problem _actionStart and _actionStop have been removed and let _actionStartStopTor handle everything --- src/vidalia/MainWindow.cpp | 26 +++++++++++++++----------- src/vidalia/MainWindow.h | 2 -- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index f5907fe..c2cb8e8 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -102,6 +102,11 @@ MainWindow::MainWindow() createGUI(); createConnections(); + + /* Start with Tor initially stopped */ + _status = Unset; + _isVidaliaRunningTor = false; + updateTorStatus(Stopped); } /** Destructor */ @@ -132,8 +137,6 @@ void MainWindow::createActions() { _actionShowControlPanel = new QAction(QIcon(IMG_CONTROL_PANEL), tr("Control Panel"), this); - _actionStartTor = new QAction(QIcon(IMG_START_TOR_16), tr("Start"), this); - _actionStopTor = new QAction(QIcon(IMG_STOP_TOR_16), tr("Stop"), this); _actionRestartTor = new QAction(tr("Restart"), this); _actionReloadConfig = new QAction(tr("Reload Tor's config"), this); _actionNewIdentity = new QAction(QIcon(IMG_IDENTITY), tr("New Identity"), this); @@ -156,8 +159,7 @@ MainWindow::createMenuBar() menu->clear(); QMenu *torMenu = menu->addMenu(tr("Tor")); - torMenu->addAction(_actionStartTor); - torMenu->addAction(_actionStopTor); + torMenu->addAction(_actionStartStopTor); torMenu->addAction(_actionRestartTor); #if !defined(Q_WS_WIN) torMenu->addAction(_actionReloadConfig); @@ -278,8 +280,6 @@ MainWindow::retranslateUi() updateTorStatus(_status); _actionShowControlPanel->setText(tr("Control Panel")); - _actionStartTor->setText(tr("Start")); - _actionStopTor->setText(tr("Stop")); _actionRestartTor->setText(tr("Restart")); _actionReloadConfig->setText(tr("Reload Tor's config")); _actionConfigure->setText(tr("Settings")); @@ -313,10 +313,9 @@ void MainWindow::createConnections() { connect(_actionExit, SIGNAL(triggered()), this, SLOT(close())); - connect(_actionStartTor, SIGNAL(triggered()), this, SLOT(start())); + connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start())); connect(_actionRestartTor, SIGNAL(triggered()), this, SLOT(restart())); connect(_actionReloadConfig, SIGNAL(triggered()), this, SLOT(sighup())); - connect(_actionStopTor, SIGNAL(triggered()), this, SLOT(stop())); connect(_actionShowControlPanel, SIGNAL(triggered()), this, SLOT(show())); connect(_actionNewIdentity, SIGNAL(triggered()), this, SLOT(newIdentity())); @@ -1307,10 +1306,12 @@ MainWindow::updateTorStatus(TorStatus status) actionText = tr("Start Tor"); trayIconFile = IMG_TOR_STOPPED; statusIconFile = IMG_TOR_STOPPED_48; + _actionRestartTor->setEnabled(false); + _actionReloadConfig->setEnabled(false); + _actionStartStopTor->setEnabled(true); _actionStartStopTor->setEnabled(true); _actionStartStopTor->setIcon(QIcon(IMG_START_TOR_16)); _actionStartStopTor->setText(actionText); - _actionStartTor->setEnabled(true); /* XXX: This might need to be smarter if we ever start connecting other * slots to these triggered() and clicked() signals. */ @@ -1318,8 +1319,8 @@ MainWindow::updateTorStatus(TorStatus status) connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start())); setStartupProgressVisible(false); } else if (status == Stopping) { - _actionStopTor->setEnabled(false); _actionRestartTor->setEnabled(false); + _actionReloadConfig->setEnabled(false); if (_delayedShutdownStarted) { statusText = tr("Your relay is shutting down.\n" "Click 'Stop' again to stop your relay now."); @@ -1332,6 +1333,8 @@ MainWindow::updateTorStatus(TorStatus status) // ui.btnStartStopTor->setStatusTip(tr("Stop Tor Now")); } else if (status == Started) { actionText = tr("Stop Tor"); + _actionRestartTor->setEnabled(true); + _actionReloadConfig->setEnabled(true); _actionStartStopTor->setEnabled(true); _actionStartStopTor->setIcon(QIcon(IMG_STOP_TOR_16)); _actionStartStopTor->setText(actionText); @@ -1345,7 +1348,8 @@ MainWindow::updateTorStatus(TorStatus status) trayIconFile = IMG_TOR_STARTING; statusIconFile = IMG_TOR_STARTING_48; _actionStartStopTor->setEnabled(false); - _actionStartTor->setEnabled(false); + _actionRestartTor->setEnabled(false); + _actionReloadConfig->setEnabled(false); setStartupProgressVisible(true); setStartupProgress(STARTUP_PROGRESS_STARTING, statusText); } else if (status == CircuitEstablished) { diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index a008a08..7d386d5 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -285,8 +285,6 @@ private: /** Defines the actions for the tray menu */ QAction *_actionShowControlPanel; QAction *_actionStartStopTor; - QAction *_actionStartTor; - QAction *_actionStopTor; QAction *_actionRestartTor; QAction *_actionReloadConfig; QAction *_actionNewIdentity;

1 0

[vidalia/alpha] Finally add myself to the credits
by chiiph＠torproject.org 20 May '11

20 May '11

commit 6b71e8823b9bfe3a282e656bb0abcc49ae14e719 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 17 11:57:59 2011 -0300 Finally add myself to the credits --- src/vidalia/res/credits.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/vidalia/res/credits.html b/src/vidalia/res/credits.html index c73c1cc..28d2bd0 100644 --- a/src/vidalia/res/credits.html +++ b/src/vidalia/res/credits.html @@ -4,6 +4,7 @@ <ul> <li>Matt Edman</li> <li>Justin Hipple (<i>retired</i>)</li> + <li>Tomás Touceda</li> </ul> <h3>Contributors</h3>

1 0

[vidalia/alpha] Bump alpha version to 0.3.1-git
by chiiph＠torproject.org 20 May '11

20 May '11

commit 7f0a6e3ac65d43cf938d2f4e9d64d898231ed255 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 17 11:56:29 2011 -0300 Bump alpha version to 0.3.1-git --- CMakeLists.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af75563..dfd8f3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ set(VER_MAJOR "0") set(VER_MINOR "3") -set(VER_PATCH "0") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") +set(VER_PATCH "1") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

[vidalia/alpha] Hide Vidalia when activating the tray icon
by chiiph＠torproject.org 20 May '11

20 May '11

commit a651bb471a947843f00782839f78f15b1af1c3d6 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Wed May 18 02:24:35 2011 -0300 Hide Vidalia when activating the tray icon --- src/vidalia/MainWindow.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index c373d01..195af30 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -269,7 +269,7 @@ void MainWindow::trayIconActivated(QSystemTrayIcon::ActivationReason reason) { if (reason == QSystemTrayIcon::DoubleClick) - setVisible(true); + setVisible(!isVisible()); } void

1 0

[vidalia/alpha] Fix issue when restarting without being started
by chiiph＠torproject.org 20 May '11

20 May '11

commit 20eff7c2c0158b29e01a4d7fc6a54eb6093326de Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Wed May 18 02:25:37 2011 -0300 Fix issue when restarting without being started --- src/vidalia/MainWindow.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 195af30..cf3e532 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1403,7 +1403,7 @@ MainWindow::toString(TorStatus status) void MainWindow::restart() { - if(_torControl->stop()) { + if(stop()) { start(); } }

1 0

[vidalia/alpha] Fix typo
by chiiph＠torproject.org 20 May '11

20 May '11

commit 22b0b6c0546cca1e794ec50e9f3725240c1d091d Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Wed May 18 02:34:01 2011 -0300 Fix typo --- src/vidalia/MainWindow.cpp | 4 ++-- src/vidalia/MainWindow.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index cf3e532..674958e 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -322,7 +322,7 @@ MainWindow::createConnections() connect(_actionMessageLog, SIGNAL(triggered()), this, SLOT(showMessageLogTab())); connect(_actionConfigure, SIGNAL(triggered()), this, SLOT(showConfigDialog())); - connect(_actionBandwidthGraph, SIGNAL(triggered()), this, SLOT(showBandwithTab())); + connect(_actionBandwidthGraph, SIGNAL(triggered()), this, SLOT(showBandwidthTab())); connect(_actionAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog())); connect(_actionVidaliaHelp, SIGNAL(triggered()), this, SLOT(showHelpDialog())); connect(_actionStatus, SIGNAL(triggered()), this, SLOT(showStatusTab())); @@ -1585,7 +1585,7 @@ MainWindow::showMessageLogTab() } void -MainWindow::showBandwithTab() +MainWindow::showBandwidthTab() { addTab(_graph); } diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index a01f167..a008a08 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -126,7 +126,7 @@ private slots: /** Displays the General Tor Status tab */ void showStatusTab(); /** Displays the Bandwidth graph tab */ - void showBandwithTab(); + void showBandwidthTab(); /** Displays the Network map tab */ void showNetViewerTab(); /** Creates and displays Vidalia's About dialog. */

1 0

[vidalia/alpha] Show when opening tabs while not visible
by chiiph＠torproject.org 20 May '11

20 May '11

commit 08b76816ad4f59a2346843273ac2baf9c8d86d5b Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Wed May 18 02:37:31 2011 -0300 Show when opening tabs while not visible --- src/vidalia/MainWindow.cpp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 674958e..f5907fe 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1550,6 +1550,8 @@ MainWindow::addTab(VidaliaTab *tab) _tabMap << tab->getTitle(); connect(tab, SIGNAL(helpRequested(QString)), this, SLOT(showHelpDialog(QString))); + if(!isVisible()) + setVisible(true); } void

1 0