March 2015 - tor-commits - lists.torproject.org

[tor/maint-0.2.6] Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit e3408248b9373e52114773555d73f71492e30129 Merge: 410ce4c 6830667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:12:54 2015 -0400 Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5 changes/bug13988 | 3 +++ src/or/rephist.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.6] GETINFO bw-event-cache to get information on recent BW events
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 62631904cb403ee9f27080a1cf096e8ddd8a3048 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 11:37:23 2015 -0500 GETINFO bw-event-cache to get information on recent BW events Closes 14128; useful to regain functionality lost because of 13988. --- changes/ticket14128 | 5 +++++ src/or/control.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/control.h | 1 + 3 files changed, 56 insertions(+) diff --git a/changes/ticket14128 b/changes/ticket14128 new file mode 100644 index 0000000..38b25fa --- /dev/null +++ b/changes/ticket14128 @@ -0,0 +1,5 @@ + o Minor features (controller): + - New "GETINFO bw-event-cache" to get information about recent bandwidth + events. Closes ticket 14128. Useful for controllers to get recent + bandwidth history after the fix for 13988. + diff --git a/src/or/control.c b/src/or/control.c index 9378f38..fbd648d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1424,6 +1424,8 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, (void) conn; if (!strcmp(question, "version")) { *answer = tor_strdup(get_version()); + } else if (!strcmp(question, "bw-event-cache")) { + *answer = get_bw_samples(); } else if (!strcmp(question, "config-file")) { *answer = tor_strdup(get_torrc_fname(0)); } else if (!strcmp(question, "config-defaults-file")) { @@ -2099,6 +2101,7 @@ typedef struct getinfo_item_t { * to answer them. */ static const getinfo_item_t getinfo_items[] = { ITEM("version", misc, "The current version of Tor."), + ITEM("bw-event-cache", misc, "Cached BW events for a short interval."), ITEM("config-file", misc, "Current location of the \"torrc\" file."), ITEM("config-defaults-file", misc, "Current location of the defaults file."), ITEM("config-text", misc, @@ -4133,11 +4136,29 @@ control_event_tb_empty(const char *bucket, uint32_t read_empty_time, return 0; } +/* about 5 minutes worth. */ +#define N_BW_EVENTS_TO_CACHE 300 +/* Index into cached_bw_events to next write. */ +static int next_measurement_idx = 0; +/* number of entries set in n_measurements */ +static int n_measurements = 0; +static struct cached_bw_event_s { + uint32_t n_read; + uint32_t n_written; +} cached_bw_events[N_BW_EVENTS_TO_CACHE]; + /** A second or more has elapsed: tell any interested control * connections how much bandwidth we used. */ int control_event_bandwidth_used(uint32_t n_read, uint32_t n_written) { + cached_bw_events[next_measurement_idx].n_read = n_read; + cached_bw_events[next_measurement_idx].n_written = n_written; + if (++next_measurement_idx == N_BW_EVENTS_TO_CACHE) + next_measurement_idx = 0; + if (n_measurements < N_BW_EVENTS_TO_CACHE) + ++n_measurements; + if (EVENT_IS_INTERESTING(EVENT_BANDWIDTH_USED)) { send_control_event(EVENT_BANDWIDTH_USED, ALL_FORMATS, "650 BW %lu %lu\r\n", @@ -4148,6 +4169,35 @@ control_event_bandwidth_used(uint32_t n_read, uint32_t n_written) return 0; } +STATIC char * +get_bw_samples(void) +{ + int i; + int idx = (next_measurement_idx + N_BW_EVENTS_TO_CACHE - n_measurements) + % N_BW_EVENTS_TO_CACHE; + tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); + + smartlist_t *elements = smartlist_new(); + + for (i = 0; i < n_measurements; ++i) { + tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); + const struct cached_bw_event_s *bwe = &cached_bw_events[idx]; + + smartlist_add_asprintf(elements, "%u,%u", + (unsigned)bwe->n_read, + (unsigned)bwe->n_written); + + idx = (idx + 1) % N_BW_EVENTS_TO_CACHE; + } + + char *result = smartlist_join_strings(elements, " ", 0, NULL); + + SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); + smartlist_free(elements); + + return result; +} + /** Called when we are sending a log message to the controllers: suspend * sending further log messages to the controllers until we're done. Used by * CONN_LOG_PROTECT. */ diff --git a/src/or/control.h b/src/or/control.h index 494f04b..8697262 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -201,6 +201,7 @@ void append_cell_stats_by_command(smartlist_t *event_parts, const uint64_t *number_to_include); void format_cell_stats(char **event_string, circuit_t *circ, cell_stats_t *cell_stats); +STATIC char *get_bw_samples(void); #endif #endif

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 448bd220928f337e60dd377e8a3bb814248f4a7a Merge: 6263190 ceb6dee Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:17:20 2015 -0400 Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5 changes/bug14261 | 5 +++++ src/or/directory.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 8450f6e9a04be27f828f27a916f6560518741ca8 Merge: fb0de57 448bd22 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:21:20 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/ticket14128 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/maint-0.2.5] Increase limit for status vote download size by a factor of 5.
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit ceb6dee4652567fd503e5ceb9345354efd935a1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 18 15:25:29 2015 -0500 Increase limit for status vote download size by a factor of 5. We've started to hit the limit here. We introduced the limit in 0.1.2.5-alpha. This fixes bug 14261, but we should have a smarter way to not actually do the behavior this permits. See #14267 for a ticket about fixing that. --- changes/bug14261 | 5 +++++ src/or/directory.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug14261 b/changes/bug14261 new file mode 100644 index 0000000..1260ccb --- /dev/null +++ b/changes/bug14261 @@ -0,0 +1,5 @@ + O Minor bugfixes (directory authority): + - Allow directory authorities to fetch more data from one + another if they find themselves missing lots of votes. + Previously, they had been bumping against the 10 MB queued + data limit. Fixes bug 14261. Bugfix on 0.1.2.5-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index 298271f..50863d0 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2183,12 +2183,15 @@ connection_dir_reached_eof(dir_connection_t *conn) */ #define MAX_DIRECTORY_OBJECT_SIZE (10*(1<<20)) +#define MAX_VOTE_DL_SIZE (MAX_DIRECTORY_OBJECT_SIZE * 5) + /** Read handler for directory connections. (That's connections <em>to</em> * directory servers and connections <em>at</em> directory servers.) */ int connection_dir_process_inbuf(dir_connection_t *conn) { + size_t max_size; tor_assert(conn); tor_assert(conn->base_.type == CONN_TYPE_DIR); @@ -2207,7 +2210,11 @@ connection_dir_process_inbuf(dir_connection_t *conn) return 0; } - if (connection_get_inbuf_len(TO_CONN(conn)) > MAX_DIRECTORY_OBJECT_SIZE) { + max_size = + (TO_CONN(conn)->purpose == DIR_PURPOSE_FETCH_STATUS_VOTE) ? + MAX_VOTE_DL_SIZE : MAX_DIRECTORY_OBJECT_SIZE; + + if (connection_get_inbuf_len(TO_CONN(conn)) > max_size) { log_warn(LD_HTTP, "Too much data received from directory connection: " "denial of service attempt, or you need to upgrade?"); connection_mark_for_close(TO_CONN(conn));

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 448bd220928f337e60dd377e8a3bb814248f4a7a Merge: 6263190 ceb6dee Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:17:20 2015 -0400 Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5 changes/bug14261 | 5 +++++ src/or/directory.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.5] Increase bandwidth usage report interval to 4 hours.
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 6830667d58815219476593901334b2e19554d8af Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 12:24:13 2014 -0500 Increase bandwidth usage report interval to 4 hours. --- changes/bug13988 | 3 +++ src/or/rephist.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug13988 b/changes/bug13988 new file mode 100644 index 0000000..e816335 --- /dev/null +++ b/changes/bug13988 @@ -0,0 +1,3 @@ + o Minor bugfixes (statistics): + - Increase period over which bandwidth observations are aggregated + from 15 minutes to 4 hours. Fixes bug 13988; bugfix on 0.0.8pre1. diff --git a/src/or/rephist.c b/src/or/rephist.c index 72de54c..cedc56a 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1131,9 +1131,7 @@ rep_hist_load_mtbf_data(time_t now) * totals? */ #define NUM_SECS_ROLLING_MEASURE 10 /** How large are the intervals for which we track and report bandwidth use? */ -/* XXXX Watch out! Before Tor 0.2.2.21-alpha, using any other value here would - * generate an unparseable state file. */ -#define NUM_SECS_BW_SUM_INTERVAL (15*60) +#define NUM_SECS_BW_SUM_INTERVAL (4*60*60) /** How far in the past do we remember and publish bandwidth use? */ #define NUM_SECS_BW_SUM_IS_VALID (24*60*60) /** How many bandwidth usage intervals do we remember? (derived) */

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit e3408248b9373e52114773555d73f71492e30129 Merge: 410ce4c 6830667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:12:54 2015 -0400 Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5 changes/bug13988 | 3 +++ src/or/rephist.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.5] GETINFO bw-event-cache to get information on recent BW events
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 62631904cb403ee9f27080a1cf096e8ddd8a3048 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 11:37:23 2015 -0500 GETINFO bw-event-cache to get information on recent BW events Closes 14128; useful to regain functionality lost because of 13988. --- changes/ticket14128 | 5 +++++ src/or/control.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/control.h | 1 + 3 files changed, 56 insertions(+) diff --git a/changes/ticket14128 b/changes/ticket14128 new file mode 100644 index 0000000..38b25fa --- /dev/null +++ b/changes/ticket14128 @@ -0,0 +1,5 @@ + o Minor features (controller): + - New "GETINFO bw-event-cache" to get information about recent bandwidth + events. Closes ticket 14128. Useful for controllers to get recent + bandwidth history after the fix for 13988. + diff --git a/src/or/control.c b/src/or/control.c index 9378f38..fbd648d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1424,6 +1424,8 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, (void) conn; if (!strcmp(question, "version")) { *answer = tor_strdup(get_version()); + } else if (!strcmp(question, "bw-event-cache")) { + *answer = get_bw_samples(); } else if (!strcmp(question, "config-file")) { *answer = tor_strdup(get_torrc_fname(0)); } else if (!strcmp(question, "config-defaults-file")) { @@ -2099,6 +2101,7 @@ typedef struct getinfo_item_t { * to answer them. */ static const getinfo_item_t getinfo_items[] = { ITEM("version", misc, "The current version of Tor."), + ITEM("bw-event-cache", misc, "Cached BW events for a short interval."), ITEM("config-file", misc, "Current location of the \"torrc\" file."), ITEM("config-defaults-file", misc, "Current location of the defaults file."), ITEM("config-text", misc, @@ -4133,11 +4136,29 @@ control_event_tb_empty(const char *bucket, uint32_t read_empty_time, return 0; } +/* about 5 minutes worth. */ +#define N_BW_EVENTS_TO_CACHE 300 +/* Index into cached_bw_events to next write. */ +static int next_measurement_idx = 0; +/* number of entries set in n_measurements */ +static int n_measurements = 0; +static struct cached_bw_event_s { + uint32_t n_read; + uint32_t n_written; +} cached_bw_events[N_BW_EVENTS_TO_CACHE]; + /** A second or more has elapsed: tell any interested control * connections how much bandwidth we used. */ int control_event_bandwidth_used(uint32_t n_read, uint32_t n_written) { + cached_bw_events[next_measurement_idx].n_read = n_read; + cached_bw_events[next_measurement_idx].n_written = n_written; + if (++next_measurement_idx == N_BW_EVENTS_TO_CACHE) + next_measurement_idx = 0; + if (n_measurements < N_BW_EVENTS_TO_CACHE) + ++n_measurements; + if (EVENT_IS_INTERESTING(EVENT_BANDWIDTH_USED)) { send_control_event(EVENT_BANDWIDTH_USED, ALL_FORMATS, "650 BW %lu %lu\r\n", @@ -4148,6 +4169,35 @@ control_event_bandwidth_used(uint32_t n_read, uint32_t n_written) return 0; } +STATIC char * +get_bw_samples(void) +{ + int i; + int idx = (next_measurement_idx + N_BW_EVENTS_TO_CACHE - n_measurements) + % N_BW_EVENTS_TO_CACHE; + tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); + + smartlist_t *elements = smartlist_new(); + + for (i = 0; i < n_measurements; ++i) { + tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); + const struct cached_bw_event_s *bwe = &cached_bw_events[idx]; + + smartlist_add_asprintf(elements, "%u,%u", + (unsigned)bwe->n_read, + (unsigned)bwe->n_written); + + idx = (idx + 1) % N_BW_EVENTS_TO_CACHE; + } + + char *result = smartlist_join_strings(elements, " ", 0, NULL); + + SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); + smartlist_free(elements); + + return result; +} + /** Called when we are sending a log message to the controllers: suspend * sending further log messages to the controllers until we're done. Used by * CONN_LOG_PROTECT. */ diff --git a/src/or/control.h b/src/or/control.h index 494f04b..8697262 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -201,6 +201,7 @@ void append_cell_stats_by_command(smartlist_t *event_parts, const uint64_t *number_to_include); void format_cell_stats(char **event_string, circuit_t *circ, cell_stats_t *cell_stats); +STATIC char *get_bw_samples(void); #endif #endif

1 0

[tor/maint-0.2.5] Add wait4 to the seccomp2 sandbox allowable syscall list
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit d5b2cbea106e020436d577e42672d281400558dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:18:10 2015 +0100 Add wait4 to the seccomp2 sandbox allowable syscall list fixes bug 15088. patch from sanic. --- changes/bug15088 | 4 ++++ src/common/sandbox.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug15088 b/changes/bug15088 new file mode 100644 index 0000000..95878bd --- /dev/null +++ b/changes/bug15088 @@ -0,0 +1,4 @@ + o Minor bugfixes (Linux seccomp2 sandbox): + - Upon receiving sighup, do not crash during attempts to call + wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from + "sanic". diff --git a/src/common/sandbox.c b/src/common/sandbox.c index dbbaa59..e43b64b 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -164,6 +164,7 @@ static int filter_nopar_gen[] = { #endif SCMP_SYS(stat), SCMP_SYS(uname), + SCMP_SYS(wait4), SCMP_SYS(write), SCMP_SYS(writev), SCMP_SYS(exit_group),

1 0