- tor-commits - lists.torproject.org

[metrics-tasks/master] [2649] Add *~ to .gitignore
by karsten＠torproject.org 31 May '11

31 May '11

commit a94f49f6b8e041b92e1f213f54237039f5dd18e2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 29 03:50:24 2011 -0700 [2649] Add *~ to .gitignore --- task-2649/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/task-2649/.gitignore b/task-2649/.gitignore index c77b69b..46ca2bd 100644 --- a/task-2649/.gitignore +++ b/task-2649/.gitignore @@ -1,2 +1,3 @@ dev/ out/ +*~

1 0

[metrics-tasks/master] [2714] Actually graph the HSDir set size
by karsten＠torproject.org 31 May '11

31 May '11

commit c0e88f471bebd314a84f822967506b418af8b030 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 29 04:22:55 2011 -0700 [2714] Actually graph the HSDir set size --- .../graph-hsdir-set-absolute-instability.gnuplot | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/task-2714/graph-hsdir-set-absolute-instability.gnuplot b/task-2714/graph-hsdir-set-absolute-instability.gnuplot index ee7f088..a475c1a 100644 --- a/task-2714/graph-hsdir-set-absolute-instability.gnuplot +++ b/task-2714/graph-hsdir-set-absolute-instability.gnuplot @@ -4,7 +4,7 @@ set timefmt "%Y-%m-%d-%H-%M-%S" set format x "%Y-%m-%d" set xrange ["2011-01-01-00-00-00":] -plot "out/hsdir-set-instability" using 1:(0):2 with lines title "HSDir set size",\ +plot "out/hsdir-set-instability" using 1:2 with lines title "HSDir set size",\ "out/hsdir-set-instability" using 1:(0):6 with filledcurves title "4 hr",\ "out/hsdir-set-instability" using 1:(0):5 with filledcurves title "3 hr",\ "out/hsdir-set-instability" using 1:(0):4 with filledcurves title "2 hr",\

1 0

[tor/maint-0.2.2] stop asserting at boot
by arma＠torproject.org 31 May '11

31 May '11

commit 56771f392e68eb2f78180daab0d8f17c9284ad11 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 30 23:50:37 2011 -0400 stop asserting at boot The patch for 3228 made us try to run init_keys() before we had loaded our state file, resulting in an assert inside init_keys. We had moved it too early in the function. Now it's later in the function, but still above the accounting calls. --- src/or/config.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f97e9b1..6635cac 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1180,18 +1180,6 @@ options_act(or_options_t *old_options) return -1; } - /* We want to reinit keys as needed before we do much of anything else: - keys are important, and other things can depend on them. */ - if (running_tor && - (transition_affects_workers || - (options->V3AuthoritativeDir && (!old_options || - !old_options->V3AuthoritativeDir)))) { - if (init_keys() < 0) { - log_warn(LD_BUG,"Error initializing keys; exiting"); - return -1; - } - } - if (consider_adding_dir_authorities(options, old_options) < 0) return -1; @@ -1237,6 +1225,17 @@ options_act(or_options_t *old_options) finish_daemon(options->DataDirectory); } + /* We want to reinit keys as needed before we do much of anything else: + keys are important, and other things can depend on them. */ + if (transition_affects_workers || + (options->V3AuthoritativeDir && (!old_options || + !old_options->V3AuthoritativeDir))) { + if (init_keys() < 0) { + log_warn(LD_BUG,"Error initializing keys; exiting"); + return -1; + } + } + /* Write our PID to the PID file. If we do not have write permissions we * will log a warning */ if (options->PidFile)

1 0

[tor/release-0.2.2] fold in some more changes entries
by arma＠torproject.org 31 May '11

31 May '11

commit 66732b764b7a787e48ad2b5ac972595145dfaf28 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 30 21:03:14 2011 -0400 fold in some more changes entries --- ChangeLog | 26 ++++++++++++++++++++++++++ changes/bug1297a | 16 ---------------- changes/bug3045 | 6 ------ changes/bug3216 | 4 ---- changes/bug3228 | 3 --- changes/bug3270 | 4 ---- changes/bug3289 | 5 ----- 7 files changed, 26 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42d4e14..12daf86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,23 @@ Changes in version 0.2.2.28-beta - 2011-05-3? consensus periodically. Fixes the most common case of triggering bug 1810; bugfix on 0.2.2.7-alpha. - Actually allow nameservers with IPv6 addresses. Fixes bug 2574. + - Don't try to build descriptors if "ORPort auto" is set and we + don't know our actual ORPort yet. Fix for bug 3216; bugfix on + 0.2.2.26-beta. + - Resolve a crash that occured when setting BridgeRelay to 1 with + accounting enabled. Fixes bug 3228; bugfix on 0.2.2.18-alpha. + - Apply circuit timeouts to opened hidden-service-related circuits + based on the correct start time. Previously, we would apply the + circuit build timeout based on time since the circuit's creation; + it was supposed to be applied based on time since the circuit + entered its current state. Bugfix on 0.0.6; fixes part of bug 1297. + - Use the same circuit timeout for client-side introduction + circuits as for other four-hop circuits, rather than the timeout + for single-hop directory-fetch circuits; the shorter timeout may + have been appropriate with the static circuit build timeout in + 0.2.1.x and earlier, but caused many hidden service access attempts + to fail with the adaptive CBT introduced in 0.2.2.2-alpha. Bugfix + on 0.2.2.2-alpha; fixes another part of bug 1297. o Major features: - Add an __OwningControllerProcess configuration option and a @@ -16,11 +33,20 @@ Changes in version 0.2.2.28-beta - 2011-05-3? - Remove a trailing asterisk from "exit-policy/default" in the output of the control port command "GETINFO info/names". Bugfix on 0.1.2.5-alpha. + - Use a wide type to hold sockets when built for 64-bit Windows builds. + Fixes bug 3270. + - Warn when the user configures two HiddenServiceDir lines that point + to the same directory. Bugfix on 0.0.6 (the version introducing + HiddenServiceDir); fixes bug 3289. o Minor features: - Relays now log the reason for publishing a new relay descriptor, so we have a better chance of hunting down instances of bug 1810. Resolves ticket 3252. + - Revise most log messages that refer to nodes by nickname to + instead use the "$key=nickname at address" format. This should be + more useful, especially since nicknames are less and less likely + to be unique. Resolves ticket 3045. o Removed options: - Remove undocumented option "-F" from tor-resolve: it hasn't done diff --git a/changes/bug1297a b/changes/bug1297a deleted file mode 100644 index 140b94e..0000000 --- a/changes/bug1297a +++ /dev/null @@ -1,16 +0,0 @@ - o Major bugfixes: - - Apply circuit timeouts to opened hidden-service-related circuits - based on the correct start time. Previously, we would apply the - circuit build timeout based on time since the circuit's - creation; it was supposed to be applied based on time since the - circuit entered its current state. Bugfix on 0.0.6; fixes part - of bug 1297. - - Use the same circuit timeout for client-side introduction - circuits as for other four-hop circuits. Previously, - client-side introduction circuits were closed after the same - timeout as single-hop directory-fetch circuits; this was - appropriate with the static circuit build timeout in 0.2.1.x and - earlier, but caused many hidden service access attempts to fail - with the adaptive CBT introduced in 0.2.2.2-alpha. Bugfix on - 0.2.2.2-alpha; fixes another part of bug 1297. - diff --git a/changes/bug3045 b/changes/bug3045 deleted file mode 100644 index 1cbcaba..0000000 --- a/changes/bug3045 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor features: - - Revise most log messages that refer to nodes by nickname to - instead use the "$key=nickname at address" format. This should be - more useful, especially since nicknames are less and less likely - to be unique. Fixes bug 3045. - diff --git a/changes/bug3216 b/changes/bug3216 deleted file mode 100644 index 599b5e1..0000000 --- a/changes/bug3216 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Don't try to build descriptors if "ORPort auto" is set and we - don't know our actual ORPort yet. Fix for bug 3216; bugfix on - 0.2.2.26-beta. diff --git a/changes/bug3228 b/changes/bug3228 deleted file mode 100644 index 4aca810..0000000 --- a/changes/bug3228 +++ /dev/null @@ -1,3 +0,0 @@ - o Major bugfixes: - - Resolve a crash that occured when setting BridgeRelay to 1 with - accounting enabled. Fixes bug 3228; bugfix on 0.2.2.18-alpha. diff --git a/changes/bug3270 b/changes/bug3270 deleted file mode 100644 index b37bb98..0000000 --- a/changes/bug3270 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes - - Use a wide type to hold sockets when built for 64-bit Windows builds. - Fixes bug 3270. - diff --git a/changes/bug3289 b/changes/bug3289 deleted file mode 100644 index c469796..0000000 --- a/changes/bug3289 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Warn when the user configures two HiddenServiceDir lines that point - to the same directory. Bugfix on 0.0.6 (the version introducing - HiddenServiceDir); fixes bug 3289. -

1 0

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

31 May '11

commit 7e67a240381c76b8d18dab862256b73c72d2711f Merge: da7c60d 3c0d944 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 15:18:59 2011 -0400 Merge branch 'bug3045' into maint-0.2.2 Conflicts: src/or/circuitbuild.c changes/bug3045 | 6 ++ src/or/circuitbuild.c | 43 +++++++++------ src/or/circuitlist.c | 6 ++- src/or/circuituse.c | 4 +- src/or/command.c | 4 +- src/or/connection_edge.c | 7 ++- src/or/directory.c | 9 ++-- src/or/dirserv.c | 45 +++++++++------- src/or/relay.c | 5 +- src/or/rendclient.c | 19 ++++--- src/or/rendservice.c | 31 ++++++----- src/or/rephist.c | 6 ++- src/or/router.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++ src/or/router.h | 22 ++++++++ src/or/routerlist.c | 36 +++++++------ src/or/routerparse.c | 5 +- 16 files changed, 291 insertions(+), 93 deletions(-) diff --cc src/or/circuitbuild.c index 9509b5a,469e180..2f70b67 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@@ -1753,10 -1753,9 +1753,9 @@@ circuit_handle_first_hop(origin_circuit if (!n_conn) { /* not currently connected in a useful way. */ - const char *name = strlen(firsthop->extend_info->nickname) ? - firsthop->extend_info->nickname : fmt_addr(&firsthop->extend_info->addr); - log_info(LD_CIRC, "Next router is %s: %s ", + log_info(LD_CIRC, "Next router is %s: %s", - safe_str_client(name), msg?msg:"???"); + safe_str_client(extend_info_describe(firsthop->extend_info)), + msg?msg:"???"); circ->_base.n_hop = extend_info_dup(firsthop->extend_info); if (should_launch) {

1 0

[tor/release-0.2.2] whitespace fixes
by arma＠torproject.org 31 May '11

31 May '11

commit 7f0fb8e6083128ff20b30d8cd29c220e9427d95e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 15:21:06 2011 -0400 whitespace fixes --- src/common/compat_libevent.h | 5 +---- src/common/util.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 1decc8d..89b2563 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -9,15 +9,12 @@ struct event; struct event_base; - #ifdef HAVE_EVENT2_EVENT_H #include <event2/util.h> -#else -#ifndef EVUTIL_SOCKET_DEFINED +#elif !defined(EVUTIL_SOCKET_DEFINED) #define EVUTIL_SOCKET_DEFINED #define evutil_socket_t int #endif -#endif void configure_libevent_logging(void); void suppress_libevent_log_msg(const char *msg); diff --git a/src/common/util.h b/src/common/util.h index ebbcf78..d657db6 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -276,7 +276,7 @@ typedef struct ratelim_t { char *rate_limit_log(ratelim_t *lim, time_t now); /* File helpers */ -ssize_t write_all(tor_socket_t fd, const char *buf, size_t count, int isSocket); +ssize_t write_all(tor_socket_t fd, const char *buf, size_t count,int isSocket); ssize_t read_all(tor_socket_t fd, char *buf, size_t count, int isSocket); /** Return values from file_status(); see that function's documentation

1 0

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

31 May '11

commit d35a555348dfccb19d7534af24d3c364372d515b Merge: f118dc8 ca53829 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 15:50:35 2011 -0400 Merge branch 'bug3289' into maint-0.2.2 changes/bug3289 | 5 +++++ src/or/rendservice.c | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-)

1 0

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

31 May '11

1 0

[tor/release-0.2.2] Warn when two hs use the same directory
by arma＠torproject.org 31 May '11

31 May '11

commit ca538290af507833c7cd5df7f663507c3540448d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun May 29 00:54:59 2011 +0200 Warn when two hs use the same directory This simple implementation has a few issues, but it should do for 0.2.2.x. We will want to revisit this later and make it smarter. --- changes/bug3289 | 5 +++++ src/or/rendservice.c | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/changes/bug3289 b/changes/bug3289 new file mode 100644 index 0000000..c469796 --- /dev/null +++ b/changes/bug3289 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Warn when the user configures two HiddenServiceDir lines that point + to the same directory. Bugfix on 0.0.6 (the version introducing + HiddenServiceDir); fixes bug 3289. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index edcf59d..a10e43f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -181,6 +181,31 @@ rend_add_service(rend_service_t *service) log_warn(LD_CONFIG, "Hidden service with no ports configured; ignoring."); rend_service_free(service); } else { + int dupe = 0; + /* XXX This duplicate check has two problems: + * + * a) It's O(n^2), but the same comment from the bottom of + * rend_config_services() should apply. + * + * b) We only compare directory paths as strings, so we can't + * detect two distinct paths that specify the same directory + * (which can arise from symlinks, case-insensitivity, bind + * mounts, etc.). + * + * It also can't detect that two separate Tor instances are trying + * to use the same HiddenServiceDir; for that, we would need a + * lock file. But this is enough to detect a simple mistake that + * at least one person has actually made. + */ + SMARTLIST_FOREACH(rend_service_list, rend_service_t*, ptr, + dupe = dupe || + !strcmp(ptr->directory, service->directory)); + if (dupe) { + log_warn(LD_REND, "Another hidden service is already configured for " + "directory %s, ignoring.", service->directory); + rend_service_free(service); + return; + } smartlist_add(rend_service_list, service); log_debug(LD_REND,"Configuring service with directory \"%s\"", service->directory);

1 0

[tor/release-0.2.2] minor cleanups while reviewing 3216
by arma＠torproject.org 31 May '11

31 May '11

commit f118dc80e0ef2eeb62ae52ed107af3384e2a1afd Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 30 15:31:06 2011 -0400 minor cleanups while reviewing 3216 --- src/or/config.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1179255..f97e9b1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -211,7 +211,7 @@ static config_var_t _option_vars[] = { V(ControlPortFileGroupReadable,BOOL, "0"), V(ControlPortWriteToFile, FILENAME, NULL), V(ControlSocket, LINELIST, NULL), - V(ControlSocketsGroupWritable, BOOL, "0"), + V(ControlSocketsGroupWritable, BOOL, "0"), V(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), V(CookieAuthFile, STRING, NULL), @@ -2064,6 +2064,7 @@ get_assigned_option(config_format_t *fmt, void *options, escape_val = 0; break; } + /* fall through */ case CONFIG_TYPE_INTERVAL: case CONFIG_TYPE_UINT: /* This means every or_options_t uint or bool element

1 0