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

[tor/master] Merge remote-tracking branch 'public/bug12509_025'
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit a034863b45455a2def6d957d54bec2530db4a1a6 Merge: fcc78e5 8ef6cdc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 14:15:08 2015 -0500 Merge remote-tracking branch 'public/bug12509_025' changes/bug12509 | 4 ++++ src/or/addressmap.c | 2 ++ src/or/config.c | 9 --------- src/or/or.h | 5 +++-- 4 files changed, 9 insertions(+), 11 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/feature11791'
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit cf2ac8e2556849fdcace74adf36da876f86af30a Merge: 6f7a8f8 734ba5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 13:52:54 2015 -0500 Merge remote-tracking branch 'public/feature11791' changes/bug11791 | 4 ++++ src/common/torgzip.c | 50 ++++++++++++++++++++++++++++++++++++----------- src/common/torgzip.h | 12 +++++++++++- src/or/config.c | 1 + src/or/directory.c | 33 ++++++++++++++++++++++++++----- src/or/dirserv.c | 2 +- src/or/or.h | 2 ++ src/or/relay.c | 24 ++++++++++++++++++++--- src/or/relay.h | 2 ++ src/test/test_buffers.c | 4 ++-- src/test/test_util.c | 2 +- 11 files changed, 112 insertions(+), 24 deletions(-)

1 0

[tor/master] Use smaller zlib objects when under memory pressure
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 734ba5cb0a0b6cc5376f8889305835224d814252 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 17 11:43:50 2014 -0500 Use smaller zlib objects when under memory pressure We add a compression level argument to tor_zlib_new, and use it to determine how much memory to allocate for the zlib object. We use the existing level by default, but shift to smaller levels for small requests when we have been over 3/4 of our memory usage in the past half-hour. Closes ticket 11791. --- changes/bug11791 | 4 ++++ src/common/torgzip.c | 50 ++++++++++++++++++++++++++++++++++++----------- src/common/torgzip.h | 12 +++++++++++- src/or/config.c | 1 + src/or/directory.c | 33 ++++++++++++++++++++++++++----- src/or/dirserv.c | 2 +- src/or/or.h | 2 ++ src/or/relay.c | 24 ++++++++++++++++++++--- src/or/relay.h | 2 ++ src/test/test_buffers.c | 4 ++-- src/test/test_util.c | 2 +- 11 files changed, 112 insertions(+), 24 deletions(-) diff --git a/changes/bug11791 b/changes/bug11791 new file mode 100644 index 0000000..51a9327 --- /dev/null +++ b/changes/bug11791 @@ -0,0 +1,4 @@ + o Minor features (directory, memory usage): + - When we have recently been under memory pressure (over 3/4 of + MaxMemInQueues is allocated), then allocate smaller zlib objects for + small requests. Closes ticket 11791. diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 4480e4b..05a450e 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -92,10 +92,27 @@ tor_zlib_get_header_version_str(void) /** Return the 'bits' value to tell zlib to use method.*/ static INLINE int -method_bits(compress_method_t method) +method_bits(compress_method_t method, zlib_compression_level_t level) { /* Bits+16 means "use gzip" in zlib >= 1.2 */ - return method == GZIP_METHOD ? 15+16 : 15; + const int flag = method == GZIP_METHOD ? 16 : 0; + switch (level) { + default: + case HIGH_COMPRESSION: return flag + 15; + case MEDIUM_COMPRESSION: return flag + 13; + case LOW_COMPRESSION: return flag + 11; + } +} + +static INLINE int +get_memlevel(zlib_compression_level_t level) +{ + switch (level) { + default: + case HIGH_COMPRESSION: return 8; + case MEDIUM_COMPRESSION: return 7; + case LOW_COMPRESSION: return 6; + } } /** @{ */ @@ -162,8 +179,9 @@ tor_gzip_compress(char **out, size_t *out_len, stream->avail_in = (unsigned int)in_len; if (deflateInit2(stream, Z_BEST_COMPRESSION, Z_DEFLATED, - method_bits(method), - 8, Z_DEFAULT_STRATEGY) != Z_OK) { + method_bits(method, HIGH_COMPRESSION), + get_memlevel(HIGH_COMPRESSION), + Z_DEFAULT_STRATEGY) != Z_OK) { log_warn(LD_GENERAL, "Error from deflateInit2: %s", stream->msg?stream->msg:"<no message>"); goto err; @@ -289,7 +307,7 @@ tor_gzip_uncompress(char **out, size_t *out_len, stream->avail_in = (unsigned int)in_len; if (inflateInit2(stream, - method_bits(method)) != Z_OK) { + method_bits(method, HIGH_COMPRESSION)) != Z_OK) { log_warn(LD_GENERAL, "Error from inflateInit2: %s", stream->msg?stream->msg:"<no message>"); goto err; @@ -315,7 +333,8 @@ tor_gzip_uncompress(char **out, size_t *out_len, log_warn(LD_BUG, "Error freeing gzip structures"); goto err; } - if (inflateInit2(stream, method_bits(method)) != Z_OK) { + if (inflateInit2(stream, + method_bits(method,HIGH_COMPRESSION)) != Z_OK) { log_warn(LD_GENERAL, "Error from second inflateInit2: %s", stream->msg?stream->msg:"<no message>"); goto err; @@ -426,10 +445,11 @@ struct tor_zlib_state_t { * compress, it's for compression; otherwise it's for * decompression. */ tor_zlib_state_t * -tor_zlib_new(int compress, compress_method_t method) +tor_zlib_new(int compress, compress_method_t method, + zlib_compression_level_t compression_level) { tor_zlib_state_t *out; - int bits; + int bits, memlevel; if (method == GZIP_METHOD && !is_gzip_supported()) { /* Old zlib version don't support gzip in inflateInit2 */ @@ -437,21 +457,29 @@ tor_zlib_new(int compress, compress_method_t method) return NULL; } + if (! compress) { + /* use this setting for decompression, since we might have the + * max number of window bits */ + compression_level = HIGH_COMPRESSION; + } + out = tor_malloc_zero(sizeof(tor_zlib_state_t)); out->stream.zalloc = Z_NULL; out->stream.zfree = Z_NULL; out->stream.opaque = NULL; out->compress = compress; - bits = method_bits(method); + bits = method_bits(method, compression_level); + memlevel = get_memlevel(compression_level); if (compress) { if (deflateInit2(&out->stream, Z_BEST_COMPRESSION, Z_DEFLATED, - bits, 8, Z_DEFAULT_STRATEGY) != Z_OK) + bits, memlevel, + Z_DEFAULT_STRATEGY) != Z_OK) goto err; } else { if (inflateInit2(&out->stream, bits) != Z_OK) goto err; } - out->allocation = tor_zlib_state_size_precalc(!compress, bits, 8); + out->allocation = tor_zlib_state_size_precalc(!compress, bits, memlevel); total_zlib_allocation += out->allocation; diff --git a/src/common/torgzip.h b/src/common/torgzip.h index 1378d55..eaba271 100644 --- a/src/common/torgzip.h +++ b/src/common/torgzip.h @@ -19,6 +19,15 @@ typedef enum { NO_METHOD=0, GZIP_METHOD=1, ZLIB_METHOD=2, UNKNOWN_METHOD=3 } compress_method_t; +/** + * Enumeration to define tradeoffs between memory usage and compression level. + * HIGH_COMPRESSION saves the most bandwidth; LOW_COMPRESSION saves the most + * memory. + **/ +typedef enum { + HIGH_COMPRESSION, MEDIUM_COMPRESSION, LOW_COMPRESSION +} zlib_compression_level_t; + int tor_gzip_compress(char **out, size_t *out_len, const char *in, size_t in_len, @@ -47,7 +56,8 @@ typedef enum { } tor_zlib_output_t; /** Internal state for an incremental zlib compression/decompression. */ typedef struct tor_zlib_state_t tor_zlib_state_t; -tor_zlib_state_t *tor_zlib_new(int compress, compress_method_t method); +tor_zlib_state_t *tor_zlib_new(int compress, compress_method_t method, + zlib_compression_level_t level); tor_zlib_output_t tor_zlib_process(tor_zlib_state_t *state, char **out, size_t *out_len, diff --git a/src/or/config.c b/src/or/config.c index 4b8c683..d33829a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2828,6 +2828,7 @@ options_validate(or_options_t *old_options, or_options_t *options, options->MaxMemInQueues = compute_real_max_mem_in_queues(options->MaxMemInQueues_raw, server_mode(options)); + options->MaxMemInQueues_low_threshold = (options->MaxMemInQueues / 4) * 3; options->AllowInvalid_ = 0; diff --git a/src/or/directory.c b/src/or/directory.c index e1f5964..0ab3e6a 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -20,6 +20,7 @@ #include "networkstatus.h" #include "nodelist.h" #include "policies.h" +#include "relay.h" #include "rendclient.h" #include "rendcommon.h" #include "rephist.h" @@ -2521,6 +2522,24 @@ client_likes_consensus(networkstatus_t *v, const char *want_url) return (have >= need_at_least); } +/** Return the compression level we should use for sending a compressed + * response of size n_bytes. */ +static zlib_compression_level_t +choose_compression_level(ssize_t n_bytes) +{ + if (! have_been_under_memory_pressure()) { + return HIGH_COMPRESSION; /* we have plenty of RAM. */ + } else if (n_bytes < 0) { + return HIGH_COMPRESSION; /* unknown; might be big. */ + } else if (n_bytes < 1024) { + return LOW_COMPRESSION; + } else if (n_bytes < 2048) { + return MEDIUM_COMPRESSION; + } else { + return HIGH_COMPRESSION; + } +} + /** Helper function: called when a dirserver gets a complete HTTP GET * request. Look for a request for a directory or for a rendezvous * service descriptor. On finding one, write a response into @@ -2703,7 +2722,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, smartlist_len(dir_fps) == 1 ? lifetime : 0); conn->fingerprint_stack = dir_fps; if (! compressed) - conn->zlib_state = tor_zlib_new(0, ZLIB_METHOD); + conn->zlib_state = tor_zlib_new(0, ZLIB_METHOD, HIGH_COMPRESSION); /* Prime the connection with some data. */ conn->dir_spool_src = DIR_SPOOL_NETWORKSTATUS; @@ -2791,7 +2810,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, if (smartlist_len(items)) { if (compressed) { - conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD); + conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD, + choose_compression_level(estimated_len)); SMARTLIST_FOREACH(items, const char *, c, connection_write_to_buf_zlib(c, strlen(c), conn, 0)); connection_write_to_buf_zlib("", 0, conn, 1); @@ -2840,7 +2860,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, conn->fingerprint_stack = fps; if (compressed) - conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD); + conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD, + choose_compression_level(dlen)); connection_dirserv_flushed_some(conn); goto done; @@ -2908,7 +2929,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } write_http_response_header(conn, -1, compressed, cache_lifetime); if (compressed) - conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD); + conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD, + choose_compression_level(dlen)); /* Prime the connection with some data. */ connection_dirserv_flushed_some(conn); } @@ -2983,7 +3005,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, write_http_response_header(conn, compressed?-1:len, compressed, 60*60); if (compressed) { - conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD); + conn->zlib_state = tor_zlib_new(1, ZLIB_METHOD, + choose_compression_level(len)); SMARTLIST_FOREACH(certs, authority_cert_t *, c, connection_write_to_buf_zlib(c->cache_info.signed_descriptor_body, c->cache_info.signed_descriptor_len, diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d31bb72..635d691 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3182,7 +3182,7 @@ connection_dirserv_add_networkstatus_bytes_to_outbuf(dir_connection_t *conn) if (uncompressing && ! conn->zlib_state && conn->fingerprint_stack && smartlist_len(conn->fingerprint_stack)) { - conn->zlib_state = tor_zlib_new(0, ZLIB_METHOD); + conn->zlib_state = tor_zlib_new(0, ZLIB_METHOD, HIGH_COMPRESSION); } } if (r) return r; diff --git a/src/or/or.h b/src/or/or.h index 5ebe7bf..a9371f5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3514,6 +3514,8 @@ typedef struct { uint64_t MaxMemInQueues_raw; uint64_t MaxMemInQueues;/**< If we have more memory than this allocated * for queues and buffers, run the OOM handler */ + /** Above this value, consider ourselves low on RAM. */ + uint64_t MaxMemInQueues_low_threshold; /** @name port booleans * diff --git a/src/or/relay.c b/src/or/relay.c index 05c7b3c..a899fc0 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2432,6 +2432,12 @@ cell_queues_get_total_allocation(void) return total_cells_allocated * packed_cell_mem_cost(); } +/** How long after we've been low on memory should we try to conserve it? */ +#define MEMORY_PRESSURE_INTERVAL (30*60) + +/** The time at which we were last low on memory. */ +static time_t last_time_under_memory_pressure = 0; + /** Check whether we've got too much space used for cells. If so, * call the OOM handler and return 1. Otherwise, return 0. */ STATIC int @@ -2440,13 +2446,25 @@ cell_queues_check_size(void) size_t alloc = cell_queues_get_total_allocation(); alloc += buf_get_total_allocation(); alloc += tor_zlib_get_total_allocation(); - if (alloc >= get_options()->MaxMemInQueues) { - circuits_handle_oom(alloc); - return 1; + if (alloc >= get_options()->MaxMemInQueues_low_threshold) { + last_time_under_memory_pressure = approx_time(); + if (alloc >= get_options()->MaxMemInQueues) { + circuits_handle_oom(alloc); + return 1; + } } return 0; } +/** Return true if we've been under memory pressure in the last + * MEMORY_PRESSURE_INTERVAL seconds. */ +int +have_been_under_memory_pressure(void) +{ + return last_time_under_memory_pressure + MEMORY_PRESSURE_INTERVAL + < approx_time(); +} + /** * Update the number of cells available on the circuit's n_chan or p_chan's * circuit mux. diff --git a/src/or/relay.h b/src/or/relay.h index 73c3991..3bc6683 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -50,6 +50,8 @@ void clean_cell_pool(void); void dump_cell_pool_usage(int severity); size_t packed_cell_mem_cost(void); +int have_been_under_memory_pressure(void); + /* For channeltls.c */ void packed_cell_free(packed_cell_t *cell); diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index cb29ab0..e24aa8e 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -611,7 +611,7 @@ test_buffers_zlib_impl(int finalize_with_nil) int done; buf = buf_new_with_capacity(128); /* will round up */ - zlib_state = tor_zlib_new(1, ZLIB_METHOD); + zlib_state = tor_zlib_new(1, ZLIB_METHOD, HIGH_COMPRESSION); msg = tor_malloc(512); crypto_rand(msg, 512); @@ -688,7 +688,7 @@ test_buffers_zlib_fin_at_chunk_end(void *arg) tt_uint_op(buf->head->datalen, OP_EQ, headerjunk); tt_uint_op(buf_datalen(buf), OP_EQ, headerjunk); /* Write an empty string, with finalization on. */ - zlib_state = tor_zlib_new(1, ZLIB_METHOD); + zlib_state = tor_zlib_new(1, ZLIB_METHOD, HIGH_COMPRESSION); tt_int_op(write_to_buf_zlib(buf, zlib_state, "", 0, 1), OP_EQ, 0); in_len = buf_datalen(buf); diff --git a/src/test/test_util.c b/src/test/test_util.c index b952bb2..3fbe465 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1820,7 +1820,7 @@ test_util_gzip(void *arg) tor_free(buf1); tor_free(buf2); tor_free(buf3); - state = tor_zlib_new(1, ZLIB_METHOD); + state = tor_zlib_new(1, ZLIB_METHOD, HIGH_COMPRESSION); tt_assert(state); cp1 = buf1 = tor_malloc(1024); len1 = 1024;

1 0

[tor/master] Use package-config output for -lsystemd correctly
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit fcc78e5f8a3249eadfea31db1aca6884b31c1873 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 14:05:35 2015 -0500 Use package-config output for -lsystemd correctly In systemd 209, they deprecated -lsystemd-daemon in favor of -lsystemd. So we'd better actually look at the pkg-config output, or we'll get warnings on newer distributions. For some as-yet-unknown-to-me reason, setting CFLAGS so early makes it so -O2 -g doesn't get added to it later. So, adding it myself later. Perhaps a better fix here can be found. Fixes 14072; bugfix on 0.2.6.2-alpha. Based on a patch from h.venev --- changes/bug14072 | 3 +++ configure.ac | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug14072 b/changes/bug14072 new file mode 100644 index 0000000..c810616 --- /dev/null +++ b/changes/bug14072 @@ -0,0 +1,3 @@ + o Minor bugfixes (build): + - Avoid warnings when building with systemd 209 or later. + Fixes bug 14072; bugfix on 0.2.6.2-alpha. Patch from "h.venev". diff --git a/configure.ac b/configure.ac index ea8d6b6..2c92a6c 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,8 @@ fi if test x$have_systemd = xyes; then AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd]) - TOR_SYSTEMD_LIBS="-lsystemd-daemon" + CFLAGS="${CFLAGS} ${SYSTEMD_CFLAGS}" + TOR_SYSTEMD_LIBS="${SYSTEMD_LIBS}" fi AC_SUBST(TOR_SYSTEMD_LIBS) @@ -1542,10 +1543,9 @@ fi if test "$GCC" = yes; then # Disable GCC's strict aliasing checks. They are an hours-to-debug # accident waiting to happen. - CFLAGS="$CFLAGS -Wall -fno-strict-aliasing" + CFLAGS="$CFLAGS -Wall -fno-strict-aliasing -g -O2" else - # Autoconf sets -g -O2 by default. Override optimization level - # for non-gcc compilers + # Override optimization level for non-gcc compilers CFLAGS="$CFLAGS -O" enable_gcc_warnings=no enable_gcc_warnings_advisory=no

1 0

[tor/master] Minor documentation fixes
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit f5f80790d2abc1e418158827b1c8e398611d573a Author: Tom van der Woerdt <info(a)tvdw.eu> Date: Tue Jan 6 19:39:52 2015 +0100 Minor documentation fixes --- src/or/addressmap.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/or/addressmap.c b/src/or/addressmap.c index e28b5e3..33f11cb 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -94,7 +94,7 @@ addressmap_ent_free(void *_ent) tor_free(ent); } -/** Free storage held by a virtaddress_entry_t* entry in ent. */ +/** Free storage held by a virtaddress_entry_t* entry in _ent. */ static void addressmap_virtaddress_ent_free(void *_ent) { @@ -108,7 +108,8 @@ addressmap_virtaddress_ent_free(void *_ent) tor_free(ent); } -/** Free storage held by a virtaddress_entry_t* entry in ent. */ +/** Remove address (which must map to ent) from the + * virtual address map. */ static void addressmap_virtaddress_remove(const char *address, addressmap_entry_t *ent) { @@ -131,7 +132,7 @@ addressmap_virtaddress_remove(const char *address, addressmap_entry_t *ent) } /** Remove ent (which must be mapped to by address) from the - * client address maps. */ + * client address maps, and then free it. */ static void addressmap_ent_remove(const char *address, addressmap_entry_t *ent) { @@ -496,7 +497,7 @@ addressmap_have_mapping(const char *address, int update_expiry) * equal to address, or any address ending with a period followed by * address. If wildcard_addr and wildcard_new_addr are * both true, the mapping will rewrite addresses that end with - * ".address" into ones that end with ".new_address." + * ".address" into ones that end with ".new_address". * * If new_address is NULL, or new_address is equal to * address and wildcard_addr is equal to @@ -839,8 +840,8 @@ get_random_virtual_addr(const virtual_addr_conf_t *conf, tor_addr_t *addr_out) } /** Return a newly allocated string holding an address of type - * (one of RESOLVED_TYPE_{IPV4|HOSTNAME}) that has not yet been mapped, - * and that is very unlikely to be the address of any real host. + * (one of RESOLVED_TYPE_{IPV4|IPV6|HOSTNAME}) that has not yet been + * mapped, and that is very unlikely to be the address of any real host. * * May return NULL if we have run out of virtual addresses. */

1 0

[tor/master] Whitespace fix
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 5d322e6ef6b43c587f7f9324a4d28b8446b07add Author: Tom van der Woerdt <info(a)tvdw.eu> Date: Tue Jan 6 19:41:29 2015 +0100 Whitespace fix --- src/or/addressmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/addressmap.c b/src/or/addressmap.c index ece69ea..4b3583b 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -539,9 +539,9 @@ addressmap_register(const char *address, char *new_address, time_t expires, if (expires > 1) { log_info(LD_APP,"Temporary addressmap ('%s' to '%s') not performed, " "since it's already mapped to '%s'", - safe_str_client(address), - safe_str_client(new_address), - safe_str_client(ent->new_address)); + safe_str_client(address), + safe_str_client(new_address), + safe_str_client(ent->new_address)); tor_free(new_address); return; }

1 0

[tor/master] Minor IPv6-related memory leak fixes
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 4385211caf6ad4cf34c0a3aaaba42d81048fddf6 Author: Tom van der Woerdt <info(a)tvdw.eu> Date: Tue Jan 6 19:40:23 2015 +0100 Minor IPv6-related memory leak fixes --- src/or/addressmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 33f11cb..ece69ea 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -104,6 +104,7 @@ addressmap_virtaddress_ent_free(void *_ent) ent = _ent; tor_free(ent->ipv4_address); + tor_free(ent->ipv6_address); tor_free(ent->hostname_address); tor_free(ent); } @@ -121,9 +122,11 @@ addressmap_virtaddress_remove(const char *address, addressmap_entry_t *ent) if (ve) { if (!strcmp(address, ve->ipv4_address)) tor_free(ve->ipv4_address); + if (!strcmp(address, ve->ipv6_address)) + tor_free(ve->ipv6_address); if (!strcmp(address, ve->hostname_address)) tor_free(ve->hostname_address); - if (!ve->ipv4_address && !ve->hostname_address) { + if (!ve->ipv4_address && !ve->ipv6_address && !ve->hostname_address) { tor_free(ve); strmap_remove(virtaddress_reversemap, ent->new_address); }

1 0

[tor/master] Merge remote-tracking branch 'tvdw/from-the-archive'
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 082bfd3b55792a1b56dabf06dcb486bbc1417b8e Merge: f4221a8 5d322e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 13:44:13 2015 -0500 Merge remote-tracking branch 'tvdw/from-the-archive' src/or/addressmap.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)

1 0

[tor/master] changes file for 4385211caf6ad4cf34c0a3a
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 6f7a8f84d906a0a9d5fd88e49d352bb748a36b09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 13:45:57 2015 -0500 changes file for 4385211caf6ad4cf34c0a3a --- changes/bug14123 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug14123 b/changes/bug14123 new file mode 100644 index 0000000..1220a04 --- /dev/null +++ b/changes/bug14123 @@ -0,0 +1,4 @@ + o Minor bugfixes (small memory leaks): + - Avoid leaking memory when using IPv6 virtual address mappings. + Fixes bug 14123; bugfix on 0.2.4.7-alpha. Patch by Tom van der + Woerdt. \ No newline at end of file

1 0

[torspec/master] Add proposal 239
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit 8f3e6ce19054546a387bfce94f5c614de2d6c69f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 6 13:33:12 2015 -0500 Add proposal 239 --- proposals/000-index.txt | 2 + proposals/239-consensus-hash-chaining.txt | 99 +++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 8a13bf8..9af0405 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -159,6 +159,7 @@ Proposals by number: 236 The move to a single guard node [OPEN] 237 All relays are directory servers [OPEN] 238 Better hidden service stats from Tor relays [DRAFT] +239 Consensus Hash Chaining [DRAFT] Proposals by status: @@ -182,6 +183,7 @@ Proposals by status: 231 Migrating authority RSA1024 identity keys [for 0.2.?] 235 Stop assigning (and eventually supporting) the Named flag [for 0.2.5] 238 Better hidden service stats from Tor relays + 239 Consensus Hash Chaining NEEDS-REVISION: 131 Help users to verify they are using Tor 190 Bridge Client Authorization Based on a Shared Secret diff --git a/proposals/239-consensus-hash-chaining.txt b/proposals/239-consensus-hash-chaining.txt new file mode 100644 index 0000000..6cb16f1 --- /dev/null +++ b/proposals/239-consensus-hash-chaining.txt @@ -0,0 +1,99 @@ +Filename: 239-consensus-hash-chaining.txt +Title: Consensus Hash Chaining +Author: Nick Mathewson, Andrea Shepard +Created: 06-Jan-2015 +Status: Draft + +1. Introduction and overview + + To avoid some categories of attacks against directory authorities + and their keys, it would be handy to have an explicit hash chain in + consensuses. + +2. Directory authority operation + + We add the following field to votes and consensuses: + + previous-consensus ISOTIME [SP HashName "=" Base16]* NL + + where HashName is any keyword. + + This field may occur any number of times. + + The date in a previous-consensus line in a vote is the valid-after + date of the consensus the line refers to. The hash should be + computed over the signed portion of the consensus document. A + directory authority should include a previous-consensus line for a + consensus using all hashes it supports for all consensuses it knows + which are still valid, together with the two most recently expired + ones. + + When this proposal is implemented, a new consensus method should be + allocated for adding previous-consensus lines to the consensus. + + A previous-consensus line is included in the consensus if and only + if a line with that date was listed by more than half of the + authorities whose votes are under consideration. A hash is included + in that line if the hash was listed by more than half of the + authorities whose votes are under consideration. Hashes are sorted + lexically with a line by hashname; dates are sorted in temporal + order. + + If, when computing a consensus, the authorities find that any + previous-consensus line is *incompatible* with another, they must + issue a loud warning. Two lines are incompatible if they have the + same ISOTIME, but different values for the the same HashName. + + The hash "sha256" is mandatory. + +3. Client and cache operation + + All parties receiving consensus documents should validate + previous-consensus lines, and complain loudly if a hash fails to + match. + + When a party receives a consensus document, it SHOULD check all + previous-consensus lines against any previous consensuses it has + retained, and if a hash fails to match it SHOULD warn loudly in the + log mentioning the specific hashes and valid-after times in + question, and store both the new consensus containing the + mismatching hashes and the old consensus being checked for later + analysis. An option SHOULD be provided to disable operation as a + client or as a hidden service if this occurs. + + All relying parties SHOULD by default retain all valid consensuses + they download plus two; but see "Security considerations" below. + + If a hash is not mismatched, the relying party may nonetheless be + unable to validate the chain: either because there is a gap in the + chain itself, or because the relying party does not have any of the + consensuses that the latest consensus mentions. If this happens, + the relying party should log a warning stating the specific cause, + the hashes and valid-after time of both the consensus containing the + unverifiable previous-consensus line and the hashes and valid-after + time of the line for each such line, and retain a copy of the + consensus document in question. A relying party MAY provide an + option to disable operation as a client or hidden service in this + event, but due to the risk that breaks in the chain may occur + accidentally, such an option SHOULD be disabled by default if + provided. + + If a relying party starts up and finds only very old consensuses + such that no previous-consensus lines can be verified, it should log + a notice of the gap along the lines of "consensus (date, hash) is + quite new. Can't chain back to old consensus (date, hash)". If it + has no old consensuses at all, it should log an info-level message + of the form "we got consensus (date, hash). We haven't got any + older consensuses, so we won't do any hash chain verification" + +4. Security Considerations: + + * Retaining consensus documents on clients might leak information + about when the client was active if a disk is later stolen or the + client compromised. This should be documented somewhere and an + option to disable (but thereby also disable verifying + previous-consensus hashes) should be provided. + + * Clients MAY offer the option to retain previous consensuses in + memory only to allow for validation without the potential disk + leak.

1 0