tor-commits April 2011

tor-commits@lists.torproject.org

18 participants
883 discussions

[tor/release-0.2.2] Merge remote-tracking branch 'public/bug2332' into maint-0.2.2
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit b75d1daf40c0d104b8224df337949753a5e65e74 Merge: bb6d45a 6a829a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 13:10:54 2011 -0400 Merge remote-tracking branch 'public/bug2332' into maint-0.2.2 src/or/dnsserv.c | 2 +- src/or/eventdns.c | 4 ++-- src/or/eventdns.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --cc src/or/dnsserv.c index f7a8d35,63ecbd2..243b730 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@@ -280,9 -280,8 +280,9 @@@ dnsserv_resolved(edge_connection_t *con conn->socks_request->command == SOCKS_COMMAND_RESOLVE) { evdns_server_request_add_a_reply(req, name, - 1, (char*)answer, ttl); + 1, answer, ttl); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && + answer_len < 256 && conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) { char *ans = tor_strndup(answer, answer_len); evdns_server_request_add_ptr_reply(req, NULL,

1 0

[tor/release-0.2.2] Downgrade notice to info when downloading a cert.
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit bb6d45af1fc738b9f71e798cde6c7564172b6e04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 12:46:07 2011 -0400 Downgrade notice to info when downloading a cert. --- changes/bug2899 | 4 ++++ src/or/routerlist.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug2899 b/changes/bug2899 new file mode 100644 index 0000000..6af86d0 --- /dev/null +++ b/changes/bug2899 @@ -0,0 +1,4 @@ + - Minor bugfixes: + o Downgrade "no current certificates known for authority" message from + Notice to Info. Bugfix on 0.2.0.10-alpha; fixes bug 2899. + diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 4deff53..c02654f 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -531,8 +531,8 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) if (!found && download_status_is_ready(&cl->dl_status, now,MAX_CERT_DL_FAILURES) && !digestmap_get(pending, ds->v3_identity_digest)) { - log_notice(LD_DIR, "No current certificate known for authority %s; " - "launching request.", ds->nickname); + log_info(LD_DIR, "No current certificate known for authority %s; " + "launching request.", ds->nickname); smartlist_add(missing_digests, ds->v3_identity_digest); } } SMARTLIST_FOREACH_END(ds);

1 0

[tor/release-0.2.2] fix some comments before they create conflicts
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 9d673dcd206289bceb8f5ff527e63336ef0a50b9 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Apr 26 11:28:49 2011 -0400 fix some comments before they create conflicts --- src/or/rephist.c | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 524cd1d..5703e3e 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -992,10 +992,10 @@ find_next_with(smartlist_t *sl, int i, const char *prefix) return -1; } -/** How many bad times has parse_possibly_bad_iso_time parsed? */ +/** How many bad times has parse_possibly_bad_iso_time() parsed? */ static int n_bogus_times = 0; /** Parse the ISO-formatted time in s into *time_out, but - * rounds any pre-1970 date to Jan 1, 1970. */ + * round any pre-1970 date to Jan 1, 1970. */ static int parse_possibly_bad_iso_time(const char *s, time_t *time_out) { @@ -1288,7 +1288,7 @@ commit_max(bw_array_t *b) b->total_in_period = 0; } -/** Shift the current observation time of 'b' forward by one second. */ +/** Shift the current observation time of b forward by one second. */ static INLINE void advance_obs(bw_array_t *b) { @@ -1318,16 +1318,16 @@ advance_obs(bw_array_t *b) static INLINE void add_obs(bw_array_t *b, time_t when, uint64_t n) { - /* Don't record data in the past. */ - if (when<b->cur_obs_time) - return; + if (when < b->cur_obs_time) + return; /* Don't record data in the past. */ + /* If we're currently adding observations for an earlier second than * 'when', advance b->cur_obs_time and b->cur_obs_idx by an - * appropriate number of seconds, and do all the other housekeeping */ - while (when>b->cur_obs_time) { + * appropriate number of seconds, and do all the other housekeeping. */ + while (when > b->cur_obs_time) { /* Doing this one second at a time is potentially inefficient, if we start with a state file that is very old. Fortunately, it doesn't seem to - show up in profiles, so we can just ignore it for now. */ + show up in profiles, so we can just ignore it for now. */ advance_obs(b); } @@ -1375,7 +1375,7 @@ bw_arrays_init(void) dir_write_array = bw_array_new(); } -/** We read num_bytes more bytes in second when. +/** Remember that we read num_bytes bytes in second when. * * Add num_bytes to the current running total for when. * @@ -1396,7 +1396,7 @@ rep_hist_note_bytes_written(size_t num_bytes, time_t when) add_obs(write_array, when, num_bytes); } -/** We wrote num_bytes more bytes in second when. +/** Remember that we wrote num_bytes bytes in second when. * (like rep_hist_note_bytes_written() above) */ void @@ -1406,8 +1406,8 @@ rep_hist_note_bytes_read(size_t num_bytes, time_t when) add_obs(read_array, when, num_bytes); } -/** We wrote num_bytes more directory bytes in second when. - * (like rep_hist_note_bytes_written() above) +/** Remember that we wrote num_bytes directory bytes in second + * when. (like rep_hist_note_bytes_written() above) */ void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when) @@ -1415,8 +1415,8 @@ rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when) add_obs(dir_write_array, when, num_bytes); } -/** We read num_bytes more directory bytes in second when. - * (like rep_hist_note_bytes_written() above) +/** Remember that we read num_bytes directory bytes in second + * when. (like rep_hist_note_bytes_written() above) */ void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when) @@ -1511,7 +1511,8 @@ rep_hist_fill_bandwidth_history(char *buf, size_t len, const bw_array_t *b) } /** Allocate and return lines for representing this server's bandwidth - * history in its descriptor. + * history in its descriptor. We publish these lines in our extra-info + * descriptor. */ char * rep_hist_get_bandwidth_lines(void) @@ -1559,7 +1560,7 @@ rep_hist_get_bandwidth_lines(void) } /** Write a single bw_array_t into the Values, Ends, Interval, and Maximum - * entries of an or_state_t. */ + * entries of an or_state_t. Done before writing out a new state file. */ static void rep_hist_update_bwhist_state_section(or_state_t *state, const bw_array_t *b, @@ -1619,7 +1620,8 @@ rep_hist_update_bwhist_state_section(or_state_t *state, smartlist_add(*s_maxima, cp); } -/** Update state with the newest bandwidth history. */ +/** Update state with the newest bandwidth history. Done before + * writing out a new state file. */ void rep_hist_update_state(or_state_t *state) { @@ -1643,7 +1645,7 @@ rep_hist_update_state(or_state_t *state) } /** Load a single bw_array_t from its Values, Ends, Maxima, and Interval - * entries in an or_state_t. */ + * entries in an or_state_t. Done while reading the state file. */ static int rep_hist_load_bwhist_state_section(bw_array_t *b, const smartlist_t *s_values, @@ -1718,7 +1720,7 @@ rep_hist_load_bwhist_state_section(bw_array_t *b, return retval; } -/** Set bandwidth history from our saved state. */ +/** Set bandwidth history from the state file we just loaded. */ int rep_hist_load_state(or_state_t *state, char **err) { @@ -1766,7 +1768,7 @@ static smartlist_t *predicted_ports_times=NULL; static void add_predicted_port(time_t now, uint16_t port) { - /* XXXX we could just use uintptr_t here, I think. */ + /* XXXX we could just use uintptr_t here, I think. -NM */ uint16_t *tmp_port = tor_malloc(sizeof(uint16_t)); time_t *tmp_time = tor_malloc(sizeof(time_t)); *tmp_port = port;

1 0

[tor/release-0.2.2] Fix more of bug 2704
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 6fde2b46d2cc2345ec955b1ed9674a777e5e8716 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 15:33:08 2011 +0200 Fix more of bug 2704 The last entry of the *Maxima values in the state file was inflated by a factor of NUM_SECS_ROLLING_MEASURE (currently 10). This could lead to a wrong maximum value propagating through the state file history. --- changes/bug2704 | 5 +++++ src/or/rephist.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug2704 b/changes/bug2704 new file mode 100644 index 0000000..821b38b --- /dev/null +++ b/changes/bug2704 @@ -0,0 +1,5 @@ + o Major bugfixes: + - When writing our maximum bw for the current interval to the state + file, don't wrongly inflate that value by a factor of 10 anymore. + Fixes more of bug 2704. + diff --git a/src/or/rephist.c b/src/or/rephist.c index fb091d5..9146fce 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1614,7 +1614,8 @@ rep_hist_update_bwhist_state_section(or_state_t *state, } tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->total_in_period & ~0x3ff)); smartlist_add(*s_values, cp); - tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->max_total & ~0x3ff)); + maxval = b->max_total / NUM_SECS_ROLLING_MEASURE; + tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(maxval & ~0x3ff)); smartlist_add(*s_maxima, cp); }

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'sebastian/bug2704' into maint-0.2.2
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit f083347adf40164aac3b77d118ec372c89178d5a Merge: 4c789ec 6fde2b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 11:07:48 2011 -0400 Merge remote-tracking branch 'sebastian/bug2704' into maint-0.2.2 changes/bug2704 | 5 +++++ src/or/rephist.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Fix compilation in last patch
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 1cff525973c9e3934a4e1661b721b8a13d20ff72 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 11:14:46 2011 -0400 Fix compilation in last patch --- src/or/rephist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 9146fce..524cd1d 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1570,6 +1570,7 @@ rep_hist_update_bwhist_state_section(or_state_t *state, { char *cp; int i,j; + uint64_t maxval; if (*s_values) { SMARTLIST_FOREACH(*s_values, char *, val, tor_free(val)); @@ -1603,7 +1604,6 @@ rep_hist_update_bwhist_state_section(or_state_t *state, /* Set i to first position in circular array */ i = (b->num_maxes_set <= b->next_max_idx) ? 0 : b->next_max_idx; for (j=0; j < b->num_maxes_set; ++j,++i) { - uint64_t maxval; if (i >= NUM_TOTALS) i = 0; tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->totals[i] & ~0x3ff));

1 0

[tor/release-0.2.2] Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit f3b58dfa53d87656f558a97bc28a333bdea06017 Merge: a0514ba 91aa6f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 25 19:03:15 2011 -0400 Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2 changes/bug2971 | 6 ++++++ src/or/config.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Don't leak the local hostname in relay nicknames
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 4c789ec08c8d52c3aab3ab775a86fe2350d584b5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 05:07:37 2011 +0200 Don't leak the local hostname in relay nicknames Fixes bug 2979, reported by tagnaq. --- changes/bug2979 | 9 ++++++++ src/or/config.c | 55 ------------------------------------------------------ src/or/dirserv.h | 2 +- 3 files changed, 10 insertions(+), 56 deletions(-) diff --git a/changes/bug2979 b/changes/bug2979 new file mode 100644 index 0000000..fe1f45f --- /dev/null +++ b/changes/bug2979 @@ -0,0 +1,9 @@ + o Minor bugfixes: + - If the Nickname configuration option wasn't given, Tor used to pick + a nickname based on the local hostname as the nickname for a relay. + Because nicknames are not very important in today's Tor and the + "Unnamed" nickname has been implemented, this is now problematic + behaviour: It leaks information about the hostname without being + useful at all. Bugfix on tor-0.1.2.2-alpha, which introduced the + Unnamed nickname. Fixes bug 2979, reported by tagnaq. + diff --git a/src/or/config.c b/src/or/config.c index 3770301..9675c73 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2500,54 +2500,6 @@ is_local_addr(const tor_addr_t *addr) return 0; } -/** Called when we don't have a nickname set. Try to guess a good nickname - * based on the hostname, and return it in a newly allocated string. If we - * can't, return NULL and let the caller warn if it wants to. */ -static char * -get_default_nickname(void) -{ - static const char * const bad_default_nicknames[] = { - "localhost", - NULL, - }; - char localhostname[256]; - char *cp, *out, *outp; - int i; - - if (gethostname(localhostname, sizeof(localhostname)) < 0) - return NULL; - - /* Put it in lowercase; stop at the first dot. */ - if ((cp = strchr(localhostname, '.'))) - *cp = '\0'; - tor_strlower(localhostname); - - /* Strip invalid characters. */ - cp = localhostname; - out = outp = tor_malloc(strlen(localhostname) + 1); - while (*cp) { - if (strchr(LEGAL_NICKNAME_CHARACTERS, *cp)) - *outp++ = *cp++; - else - cp++; - } - *outp = '\0'; - - /* Enforce length. */ - if (strlen(out) > MAX_NICKNAME_LEN) - out[MAX_NICKNAME_LEN]='\0'; - - /* Check for dumb names. */ - for (i = 0; bad_default_nicknames[i]; ++i) { - if (!strcmp(out, bad_default_nicknames[i])) { - tor_free(out); - return NULL; - } - } - - return out; -} - /** Release storage held by options. */ static void config_free(config_format_t *fmt, void *options) @@ -2976,14 +2928,7 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->Nickname == NULL) { if (server_mode(options)) { - if (!(options->Nickname = get_default_nickname())) { - log_notice(LD_CONFIG, "Couldn't pick a nickname based on " - "our hostname; using %s instead.", UNNAMED_ROUTER_NICKNAME); options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME); - } else { - log_notice(LD_CONFIG, "Choosing default nickname '%s'", - options->Nickname); - } } } else { if (!is_legal_nickname(options->Nickname)) { diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 569abfc..a8a7060 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -52,7 +52,7 @@ MAX_V_LINE_LEN \ ) -#define UNNAMED_ROUTER_NICKNAME "Unnamed" +#define UNNAMED_ROUTER_NICKNAME "Unnamed" int connection_dirserv_flushed_some(dir_connection_t *conn);

1 0

[tor/release-0.2.2] Make SIGNAL DUMP work on FreeBSD
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 5114e3e44235ea39447eea37213c65413cdb1a2c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 14 20:04:39 2011 -0700 Make SIGNAL DUMP work on FreeBSD While doing so, get rid of the now unnecessary function control_signal_act(). Fixes bug 2917, reported by Robert Ransom. Bugfix on commit 9b4aa8d2abbce71398e58188209a1b1d04885b96. This patch is loosely based on a patch by Robert (Changelog entry). --- changes/bug2917 | 4 ++++ src/or/control.c | 3 ++- src/or/main.c | 43 +------------------------------------------ src/or/main.h | 2 +- src/or/or.h | 2 +- 5 files changed, 9 insertions(+), 45 deletions(-) diff --git a/changes/bug2917 b/changes/bug2917 new file mode 100644 index 0000000..6b1e643 --- /dev/null +++ b/changes/bug2917 @@ -0,0 +1,4 @@ + o Minor bugfixes + - Make the SIGNAL DUMP control-port command work on FreeBSD. Fixes + bug 2917. Bugfix on 0.1.1.1-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 8f3af0b..bb1c330 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1222,7 +1222,8 @@ handle_control_signal(control_connection_t *conn, uint32_t len, /* Flush the "done" first if the signal might make us shut down. */ if (sig == SIGTERM || sig == SIGINT) connection_handle_write(TO_CONN(conn), 1); - control_signal_act(sig); + signal_callback(0,0,(void*)(uintptr_t)sig); + return 0; } diff --git a/src/or/main.c b/src/or/main.c index 83d1e1e..5e4d88c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -64,7 +64,6 @@ static void dumpmemusage(int severity); static void dumpstats(int severity); /* log stats */ static void conn_read_callback(int fd, short event, void *_conn); static void conn_write_callback(int fd, short event, void *_conn); -static void signal_callback(int fd, short events, void *arg); static void second_elapsed_callback(periodic_timer_t *timer, void *args); static int conn_close_if_marked(int i); static void connection_start_reading_from_linked_conn(connection_t *conn); @@ -1577,49 +1576,9 @@ do_main_loop(void) } } -/** Used to implement the SIGNAL control command: if we accept - * the_signal as a remote pseudo-signal, act on it. */ -/* We don't re-use catch() here because: - * 1. We handle a different set of signals than those allowed in catch. - * 2. Platforms without signal() are unlikely to define SIGfoo. - * 3. The control spec is defined to use fixed numeric signal values - * which just happen to match the Unix values. - */ -void -control_signal_act(int the_signal) -{ - switch (the_signal) - { - case 1: - signal_callback(0,0,(void*)(uintptr_t)SIGHUP); - break; - case 2: - signal_callback(0,0,(void*)(uintptr_t)SIGINT); - break; - case 10: - signal_callback(0,0,(void*)(uintptr_t)SIGUSR1); - break; - case 12: - signal_callback(0,0,(void*)(uintptr_t)SIGUSR2); - break; - case 15: - signal_callback(0,0,(void*)(uintptr_t)SIGTERM); - break; - case SIGNEWNYM: - signal_callback(0,0,(void*)(uintptr_t)SIGNEWNYM); - break; - case SIGCLEARDNSCACHE: - signal_callback(0,0,(void*)(uintptr_t)SIGCLEARDNSCACHE); - break; - default: - log_warn(LD_BUG, "Unrecognized signal number %d.", the_signal); - break; - } -} - /** Libevent callback: invoked when we get a signal. */ -static void +void signal_callback(int fd, short events, void *arg) { uintptr_t sig = (uintptr_t)arg; diff --git a/src/or/main.h b/src/or/main.h index ed0fb97..626bf1c 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -46,8 +46,8 @@ void directory_info_has_arrived(time_t now, int from_cache); void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); -void control_signal_act(int the_signal); void handle_signals(int is_parent); +void signal_callback(int fd, short events, void *arg); int try_locking(or_options_t *options, int err_if_locked); int have_lockfile(void); diff --git a/src/or/or.h b/src/or/or.h index 1688a08..06e6d7f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -91,7 +91,7 @@ #include "compat_libevent.h" #include "ht.h" -/* These signals are defined to help control_signal_act work. +/* These signals are defined to help handle_control_signal work. */ #ifndef SIGHUP #define SIGHUP 1

1 0

[tor/release-0.2.2] Make the Log configuration option expand ~
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 91aa6f08bcf0acbdfa038aaffe73e327ddd87c67 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 22 16:06:52 2011 +0200 Make the Log configuration option expand ~ --- changes/bug2971 | 6 ++++++ src/or/config.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/changes/bug2971 b/changes/bug2971 new file mode 100644 index 0000000..8b71ce0 --- /dev/null +++ b/changes/bug2971 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Be more consistent in our treatment of file system paths. ~ should + get expanded to the user's home directory in the Log config option. + Bugfix on 0.2.0.1-alpha, which introduced the feature for the -f and + --DataDirectory options. + diff --git a/src/or/config.c b/src/or/config.c index 5000f5d..3770301 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4382,11 +4382,13 @@ options_init_logs(or_options_t *options, int validate_only) if (smartlist_len(elts) == 2 && !strcasecmp(smartlist_get(elts,0), "file")) { if (!validate_only) { - if (add_file_log(severity, smartlist_get(elts, 1)) < 0) { + char *fname = expand_filename(smartlist_get(elts, 1)); + if (add_file_log(severity, fname) < 0) { log_warn(LD_CONFIG, "Couldn't open file for 'Log %s': %s", opt->value, strerror(errno)); ok = 0; } + tor_free(fname); } goto cleanup; }

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
89
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2011