From 690db1331dcaed2ee4c8eb38cca53b97f25bd75d Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 30 Jun 2009 10:14:15 -0400 Subject: another minor patch to add to 0.2.1.x o Minor features: - If we're a relay and we change our IP address, be more verbose about the reason that made us change. Should help track down further bugs for relays on dynamic IP addresses. --- src/or/router.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 658c567db..93afe4fad 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1509,8 +1509,8 @@ log_addr_has_changed(int severity, uint32_t prev, uint32_t cur, addrbuf_prev, addrbuf_cur, source); else log_notice(LD_GENERAL, - "Guessed our IP address as %s.", - addrbuf_cur); + "Guessed our IP address as %s (source: %s).", + addrbuf_cur, source); } /** Check whether our own address as defined by the Address configuration @@ -1533,7 +1533,7 @@ check_descriptor_ipaddress_changed(time_t now) } if (prev != cur) { - log_addr_has_changed(LOG_INFO, prev, cur, "resolve"); + log_addr_has_changed(LOG_NOTICE, prev, cur, "resolve"); ip_address_changed(0); } } -- cgit v1.2.3 From 0cbc0c463bcd5f3a80fe9388f778d4b6e09e0815 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 26 Jun 2009 02:13:52 +0200 Subject: Update the year for the copyright statement in two more files --- LICENSE | 2 +- Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 197c92a97..bb1ebd4e4 100644 --- a/LICENSE +++ b/LICENSE @@ -14,7 +14,7 @@ Tor is distributed under this license: Copyright (c) 2001-2004, Roger Dingledine Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson -Copyright (c) 2007-2008, The Tor Project, Inc. +Copyright (c) 2007-2009, The Tor Project, Inc. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/Makefile.am b/Makefile.am index b6e559ef0..ec8b4f1a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # $Id$ # Copyright (c) 2001-2004, Roger Dingledine # Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson -# Copyright (c) 2007-2008, The Tor Project, Inc. +# Copyright (c) 2007-2009, The Tor Project, Inc. # See LICENSE for licensing information AUTOMAKE_OPTIONS = foreign -- cgit v1.2.3 From 3e6bb050dd46491ac044808782a489bdf0c23f6d Mon Sep 17 00:00:00 2001 From: Karsten Loesing Date: Tue, 30 Jun 2009 20:35:03 +0200 Subject: Make an attempt to fix bug 1024. The internal error "could not find intro key" occurs when we want to send an INTRODUCE1 cell over a recently finished introduction circuit and think we built the introduction circuit with a v2 hidden service descriptor, but cannot find the introduction key in our descriptor. My first guess how we can end up in this situation is that we are wrong in thinking that we built the introduction circuit based on a v2 hidden service descriptor. This patch checks if we have a v0 descriptor, too, and uses that instead. --- ChangeLog | 3 +++ src/or/rendclient.c | 20 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc0f3a2e3..55f0f2c95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,9 @@ Changes in version 0.2.1.17-?? - 2009-??-?? our quotas recently. Fixes bug 1013; bugfix on 0.2.1.8-alpha. - Do not cap bandwidths reported by directory authorities; they are already adjusted to reflect reality. + - When we can't find an intro key for a v2 hidden service descriptor, + fall back to the v0 hidden service descriptor and log a bug message. + Workaround for bug1024. o Major features: - Clients now use the bandwidth values in the consensus, rather than diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 5b18a519b..a5d7c1016 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -94,8 +94,24 @@ rend_client_send_introduction(origin_circuit_t *introcirc, } }); if (!intro_key) { - log_warn(LD_BUG, "Internal error: could not find intro key."); - goto err; + if (rend_cache_lookup_entry(introcirc->rend_data->onion_address, + 0, &entry) > 0) { + log_warn(LD_BUG, "We have both a v0 and a v2 rend desc for this " + "service. The v2 desc doesn't contain the introduction " + "point (and key) to send an INTRODUCE1/2 cell to this " + "introduction point. Assuming the introduction point " + "is for v0 rend clients and using the service key " + "from the v0 desc instead. (This is probably a bug, " + "because we shouldn't even have both a v0 and a v2 " + "descriptor for the same service.)"); + /* See flyspray task 1024. */ + intro_key = entry->parsed->pk; + } else { + log_warn(LD_BUG, "Internal error: could not find intro key; we " + "only have a v2 rend desc with %d intro points.", + smartlist_len(entry->parsed->intro_nodes)); + goto err; + } } } if (crypto_pk_get_digest(intro_key, payload)<0) { -- cgit v1.2.3 From 4e8d22846b4eed41525fb9e5f755b56515f0dd5a Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 2 Jul 2009 10:13:01 -0400 Subject: Revise 0.2.1.17-rc changelog. --- ChangeLog | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55f0f2c95..a3199c787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ -Changes in version 0.2.1.17-?? - 2009-??-?? +Changes in version 0.2.1.17-rc - 2009-07-02 + o Major features: + - Clients now use the bandwidth values in the consensus, rather than + the bandwidth values in each relay descriptor. This approach opens + the door to more accurate bandwidth estimates once the directory + authorities start doing active measurements. Implements more of + proposal 141. + o Major bugfixes: + - When Tor clients restart after 1-5 days, they discard all their + cached descriptors as too old, but they still use the cached + consensus document. This approach is good for robustness, but + bad for performance: since they don't know any bandwidths, they + end up choosing at random rather than weighting their choice by + speed. Fixed by the above feature of putting bandwidths in the + consensus. Bugfix on 0.2.0.x. - Directory authorities were neglecting to mark relays down in their internal histories if the relays fall off the routerlist without ever being found unreachable. So there were relays in the histories @@ -11,29 +25,22 @@ Changes in version 0.2.1.17-?? - 2009-??-?? o Minor bugfixes: - Serve the DirPortFrontPage page even when we have been approaching - our quotas recently. Fixes bug 1013; bugfix on 0.2.1.8-alpha. - - Do not cap bandwidths reported by directory authorities; they are - already adjusted to reflect reality. + our quotas recently. Fixes bug 1013; bugfix on 0.2.1.8-alpha. + - The control port would close the connection before flushing long + replies, such as the network consensus, if a QUIT command was issued + before the reply had completed. Now, the control port flushes all + pending replies before closing the connection. Also fixed a spurious + warning when a QUIT command is issued after a malformed or rejected + AUTHENTICATE command, but before the connection was closed. Patch + by Marcus Griep. Bugfix on 0.2.0.x; fixes bugs 1015 and 1016. - When we can't find an intro key for a v2 hidden service descriptor, fall back to the v0 hidden service descriptor and log a bug message. - Workaround for bug1024. - - o Major features: - - Clients now use the bandwidth values in the consensus, rather than - the bandwidth values in each relay descriptor. This approach opens - the door to more accurate bandwidth estimates once the directory - authorities start doing active measurements. Implements more of - proposal 141. + Workaround for bug 1024. - o Minor bugfixes (on 0.2.0.x): - - Control port would close the connection before flushing long - replies, such as the network consensus, if a QUIT command was - issued before the reply had completed. Now, the control port - flushes all pending replies before closing the connection. - Also fixed a condition where a QUIT command issued after a - malformed or rejected AUTHENTICATE command, but before the - connection was closed would result in a warning in the logger - for a doubly-closed connection. Fixes bugs 1015 and 1016. + o Minor features: + - If we're a relay and we change our IP address, be more verbose + about the reason that made us change. Should help track down + further bugs for relays on dynamic IP addresses. Changes in version 0.2.1.16-rc - 2009-06-20 -- cgit v1.2.3