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

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit a88f3e24eaf2180ac2f374df81b0261661774c5f Merge: 6770939 2ac66e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:29:32 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: src/test/test_addr.c changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-) diff --cc src/test/test_addr.c index f182bca,fec85a4..106f921 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -853,90 -844,40 +853,125 @@@ test_virtaddrmap(void *data } static void +test_addr_localname(void *arg) +{ + (void)arg; + tt_assert(tor_addr_hostname_is_local("localhost")); + tt_assert(tor_addr_hostname_is_local("LOCALHOST")); + tt_assert(tor_addr_hostname_is_local("LocalHost")); + tt_assert(tor_addr_hostname_is_local("local")); + tt_assert(tor_addr_hostname_is_local("LOCAL")); + tt_assert(tor_addr_hostname_is_local("here.now.local")); + tt_assert(tor_addr_hostname_is_local("here.now.LOCAL")); + + + tt_assert(!tor_addr_hostname_is_local(" localhost")); + tt_assert(!tor_addr_hostname_is_local("www.torproject.org")); + done: + ; +} + +static void +test_addr_dup_ip(void *arg) +{ + char *v = NULL; + (void)arg; +#define CHECK(ip, s) do { \ + v = tor_dup_ip(ip); \ + tt_str_op(v,==,(s)); \ + tor_free(v); \ + } while (0) + + CHECK(0xffffffff, "255.255.255.255"); + CHECK(0x00000000, "0.0.0.0"); + CHECK(0x7f000001, "127.0.0.1"); + CHECK(0x01020304, "1.2.3.4"); + +#undef CHECK + done: + tor_free(v); +} + +static void +test_addr_sockaddr_to_str(void *arg) +{ + char *v = NULL; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + struct sockaddr_storage ss; +#ifdef HAVE_SYS_UN_H + struct sockaddr_un sun; +#endif +#define CHECK(sa, s) do { \ + v = tor_sockaddr_to_str((const struct sockaddr*) &(sa)); \ + tt_str_op(v,==,(s)); \ + tor_free(v); \ + } while (0) + (void)arg; + + memset(&ss,0,sizeof(ss)); + ss.ss_family = AF_UNSPEC; + CHECK(ss, "unspec"); + + memset(&sin,0,sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = htonl(0x7f808001); + sin.sin_port = htons(1234); + CHECK(sin, "127.128.128.1:1234"); + +#ifdef HAVE_SYS_UN_H + memset(&sun,0,sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "/here/is/a/path", sizeof(sun.sun_path)); + CHECK(sun, "unix:/here/is/a/path"); +#endif + + memset(&sin6,0,sizeof(sin6)); + sin6.sin6_family = AF_INET6; + memcpy(sin6.sin6_addr.s6_addr, "\x20\x00\x00\x00\x00\x00\x00\x00" + "\x00\x1a\x2b\x3c\x4d\x5e\x00\x01", 16); + sin6.sin6_port = htons(1234); + CHECK(sin6, "[2000::1a:2b3c:4d5e:1]:1234"); + + done: + tor_free(v); +} + ++static void + test_addr_is_loopback(void *data) + { + static const struct loopback_item { + const char *name; + int is_loopback; + } loopback_items[] = { + { "::1", 1 }, + { "127.0.0.1", 1 }, + { "127.99.100.101", 1 }, + { "128.99.100.101", 0 }, + { "8.8.8.8", 0 }, + { "0.0.0.0", 0 }, + { "::2", 0 }, + { "::", 0 }, + { "::1.0.0.0", 0 }, + { NULL, 0 } + }; + + int i; + tor_addr_t addr; + (void)data; + + for (i=0; loopback_items[i].name; ++i) { + tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), >=, 0); + tt_int_op(tor_addr_is_loopback(&addr), ==, loopback_items[i].is_loopback); + } + + tor_addr_make_unspec(&addr); + tt_int_op(tor_addr_is_loopback(&addr), ==, 0); + + done: + ; + } + #define ADDR_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_addr_ ## name } @@@ -945,9 -886,7 +980,10 @@@ struct testcase_t addr_tests[] = ADDR_LEGACY(ip6_helpers), ADDR_LEGACY(parse), { "virtaddr", test_virtaddrmap, 0, NULL, NULL }, + { "localname", test_addr_localname, 0, NULL, NULL }, + { "dup_ip", test_addr_dup_ip, 0, NULL, NULL }, + { "sockaddr_to_str", test_addr_sockaddr_to_str, 0, NULL, NULL }, + { "is_loopback", test_addr_is_loopback, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/maint-0.2.4] Make sure that [::1] is recognized as a private address
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit b528aaef035213dee93663599dc46b1898ae3f8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 12:22:57 2013 -0500 Make sure that [::1] is recognized as a private address Fixes bug 8377; bugfix on 0.2.1.3-alpha. --- changes/bug8377 | 3 +++ src/common/address.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug8377 b/changes/bug8377 new file mode 100644 index 0000000..c9ad151 --- /dev/null +++ b/changes/bug8377 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Correctly recognize that [::1] is a loopback address. Fixes bug #8377; + bugfix on 0.2.1.3-alpha. diff --git a/src/common/address.c b/src/common/address.c index e88869f..df26f61 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -779,7 +779,8 @@ tor_addr_is_loopback(const tor_addr_t *addr) case AF_INET6: { /* ::1 */ uint32_t *a32 = tor_addr_to_in6_addr32(addr); - return (a32[0] == 0) && (a32[1] == 0) && (a32[2] == 0) && (a32[3] == 1); + return (a32[0] == 0) && (a32[1] == 0) && (a32[2] == 0) && + (ntohl(a32[3]) == 1); } case AF_INET: /* 127.0.0.1 */

1 0

[tor/maint-0.2.4] Add unit test for tor_addr_is_loopback
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 165b2c0123f0ffb1f9507aaa31cdd536b91bccdf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 12:40:41 2013 -0500 Add unit test for tor_addr_is_loopback --- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 9007a23..e3f3807 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -623,12 +623,48 @@ test_addr_ip6_helpers(void) ; } +static void +test_addr_is_loopback(void *data) +{ + static const struct loopback_item { + const char *name; + int is_loopback; + } loopback_items[] = { + { "::1", 1 }, + { "127.0.0.1", 1 }, + { "127.99.100.101", 1 }, + { "128.99.100.101", 0 }, + { "8.8.8.8", 0 }, + { "0.0.0.0", 0 }, + { "::2", 0 }, + { "::", 0 }, + { "::1.0.0.0", 0 }, + { NULL, 0 } + }; + + int i; + tor_addr_t addr; + (void)data; + + for (i=0; loopback_items[i].name; ++i) { + tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), >=, 0); + tt_int_op(tor_addr_is_loopback(&addr), ==, loopback_items[i].is_loopback); + } + + tor_addr_make_unspec(&addr); + tt_int_op(tor_addr_is_loopback(&addr), ==, 0); + + done: + ; +} + #define ADDR_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_addr_ ## name } struct testcase_t addr_tests[] = { ADDR_LEGACY(basic), ADDR_LEGACY(ip6_helpers), + { "is_loopback", test_addr_is_loopback, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8377' into maint-0.2.3
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit ebb95d0f781e21a694a8de386ed0b75984b247d4 Merge: c6ca199 165b2c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:27:50 2013 -0400 Merge remote-tracking branch 'public/bug8377' into maint-0.2.3 changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 2ac66e59f7b32bb7f975803c9d483848e755a08f Merge: 5959d1c ebb95d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:28:39 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/test/test_addr.c changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-) diff --cc src/test/test_addr.c index 890dfe4,e3f3807..fec85a4 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -723,134 -623,48 +723,170 @@@ test_addr_ip6_helpers(void ; } +/** Test tor_addr_port_parse(). */ +static void +test_addr_parse(void) +{ + int r; + tor_addr_t addr; + char buf[TOR_ADDR_BUF_LEN]; + uint16_t port = 0; + + /* Correct call. */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.1:1234", + &addr, &port); + test_assert(r == 0); + tor_addr_to_str(buf, &addr, sizeof(buf), 0); + test_streq(buf, "192.0.2.1"); + test_eq(port, 1234); + + /* Domain name. */ + r= tor_addr_port_parse(LOG_DEBUG, + "torproject.org:1234", + &addr, &port); + test_assert(r == -1); + + /* Only IP. */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.2", + &addr, &port); + test_assert(r == -1); + + /* Bad port. */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2.2:66666", + &addr, &port); + test_assert(r == -1); + + /* Only domain name */ + r= tor_addr_port_parse(LOG_DEBUG, + "torproject.org", + &addr, &port); + test_assert(r == -1); + + /* Bad IP address */ + r= tor_addr_port_parse(LOG_DEBUG, + "192.0.2:1234", + &addr, &port); + test_assert(r == -1); + + done: + ; +} + +static void +update_difference(int ipv6, uint8_t *d, + const tor_addr_t *a, const tor_addr_t *b) +{ + const int n_bytes = ipv6 ? 16 : 4; + uint8_t a_tmp[4], b_tmp[4]; + const uint8_t *ba, *bb; + int i; + + if (ipv6) { + ba = tor_addr_to_in6_addr8(a); + bb = tor_addr_to_in6_addr8(b); + } else { + set_uint32(a_tmp, tor_addr_to_ipv4n(a)); + set_uint32(b_tmp, tor_addr_to_ipv4n(b)); + ba = a_tmp; bb = b_tmp; + } + + for (i = 0; i < n_bytes; ++i) { + d[i] |= ba[i] ^ bb[i]; + } +} + +static void +test_virtaddrmap(void *data) +{ + /* Let's start with a bunch of random addresses. */ + int ipv6, bits, iter, b; + virtual_addr_conf_t cfg[2]; + uint8_t bytes[16]; + + (void)data; + + tor_addr_parse(&cfg[0].addr, "64.65.0.0"); + tor_addr_parse(&cfg[1].addr, "3491:c0c0::"); + + for (ipv6 = 0; ipv6 <= 1; ++ipv6) { + for (bits = 0; bits < 18; ++bits) { + tor_addr_t last_a; + cfg[ipv6].bits = bits; + memset(bytes, 0, sizeof(bytes)); + tor_addr_copy(&last_a, &cfg[ipv6].addr); + /* Generate 128 addresses with each addr/bits combination. */ + for (iter = 0; iter < 128; ++iter) { + tor_addr_t a; + + get_random_virtual_addr(&cfg[ipv6], &a); + //printf("%s\n", fmt_addr(&a)); + /* Make sure that the first b bits match the configured network */ + tt_int_op(0, ==, tor_addr_compare_masked(&a, &cfg[ipv6].addr, + bits, CMP_EXACT)); + + /* And track which bits have been different between pairs of + * addresses */ + update_difference(ipv6, bytes, &last_a, &a); + } + + /* Now make sure all but the first 'bits' bits of bytes are true */ + for (b = bits+1; b < (ipv6?128:32); ++b) { + tt_assert(1 & (bytes[b/8] >> (7-(b&7)))); + } + } + } + + done: + ; +} + + static void + test_addr_is_loopback(void *data) + { + static const struct loopback_item { + const char *name; + int is_loopback; + } loopback_items[] = { + { "::1", 1 }, + { "127.0.0.1", 1 }, + { "127.99.100.101", 1 }, + { "128.99.100.101", 0 }, + { "8.8.8.8", 0 }, + { "0.0.0.0", 0 }, + { "::2", 0 }, + { "::", 0 }, + { "::1.0.0.0", 0 }, + { NULL, 0 } + }; + + int i; + tor_addr_t addr; + (void)data; + + for (i=0; loopback_items[i].name; ++i) { + tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), >=, 0); + tt_int_op(tor_addr_is_loopback(&addr), ==, loopback_items[i].is_loopback); + } + + tor_addr_make_unspec(&addr); + tt_int_op(tor_addr_is_loopback(&addr), ==, 0); + + done: + ; + } + #define ADDR_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_addr_ ## name } struct testcase_t addr_tests[] = { ADDR_LEGACY(basic), ADDR_LEGACY(ip6_helpers), + ADDR_LEGACY(parse), + { "virtaddr", test_virtaddrmap, 0, NULL, NULL }, + { "is_loopback", test_addr_is_loopback, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/maint-0.2.3] Add unit test for tor_addr_is_loopback
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 165b2c0123f0ffb1f9507aaa31cdd536b91bccdf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 12:40:41 2013 -0500 Add unit test for tor_addr_is_loopback --- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 9007a23..e3f3807 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -623,12 +623,48 @@ test_addr_ip6_helpers(void) ; } +static void +test_addr_is_loopback(void *data) +{ + static const struct loopback_item { + const char *name; + int is_loopback; + } loopback_items[] = { + { "::1", 1 }, + { "127.0.0.1", 1 }, + { "127.99.100.101", 1 }, + { "128.99.100.101", 0 }, + { "8.8.8.8", 0 }, + { "0.0.0.0", 0 }, + { "::2", 0 }, + { "::", 0 }, + { "::1.0.0.0", 0 }, + { NULL, 0 } + }; + + int i; + tor_addr_t addr; + (void)data; + + for (i=0; loopback_items[i].name; ++i) { + tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), >=, 0); + tt_int_op(tor_addr_is_loopback(&addr), ==, loopback_items[i].is_loopback); + } + + tor_addr_make_unspec(&addr); + tt_int_op(tor_addr_is_loopback(&addr), ==, 0); + + done: + ; +} + #define ADDR_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_addr_ ## name } struct testcase_t addr_tests[] = { ADDR_LEGACY(basic), ADDR_LEGACY(ip6_helpers), + { "is_loopback", test_addr_is_loopback, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/maint-0.2.3] Make sure that [::1] is recognized as a private address
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit b528aaef035213dee93663599dc46b1898ae3f8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 1 12:22:57 2013 -0500 Make sure that [::1] is recognized as a private address Fixes bug 8377; bugfix on 0.2.1.3-alpha. --- changes/bug8377 | 3 +++ src/common/address.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug8377 b/changes/bug8377 new file mode 100644 index 0000000..c9ad151 --- /dev/null +++ b/changes/bug8377 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Correctly recognize that [::1] is a loopback address. Fixes bug #8377; + bugfix on 0.2.1.3-alpha. diff --git a/src/common/address.c b/src/common/address.c index e88869f..df26f61 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -779,7 +779,8 @@ tor_addr_is_loopback(const tor_addr_t *addr) case AF_INET6: { /* ::1 */ uint32_t *a32 = tor_addr_to_in6_addr32(addr); - return (a32[0] == 0) && (a32[1] == 0) && (a32[2] == 0) && (a32[3] == 1); + return (a32[0] == 0) && (a32[1] == 0) && (a32[2] == 0) && + (ntohl(a32[3]) == 1); } case AF_INET: /* 127.0.0.1 */

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'public/bug8377' into maint-0.2.3
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit ebb95d0f781e21a694a8de386ed0b75984b247d4 Merge: c6ca199 165b2c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:27:50 2013 -0400 Merge remote-tracking branch 'public/bug8377' into maint-0.2.3 changes/bug8377 | 3 +++ src/common/address.c | 3 ++- src/test/test_addr.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-)

1 0

[tor/master] Prefer measured bandwidths over advertised when computing things for votes on a dirauth
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit b5a164bde4f33fdd33c83a8425c6464c0f5ef60d Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Feb 27 19:43:50 2013 -0800 Prefer measured bandwidths over advertised when computing things for votes on a dirauth --- changes/bug8273 | 3 + src/or/dirserv.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 201 insertions(+), 8 deletions(-) diff --git a/changes/bug8273 b/changes/bug8273 new file mode 100644 index 0000000..257f57e --- /dev/null +++ b/changes/bug8273 @@ -0,0 +1,3 @@ + o Critical bugfixes: + - When dirserv.c computes flags and thresholds, use measured bandwidths + in preference to advertised ones. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index badacd6..1c78d2d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -85,6 +85,14 @@ static const signed_descriptor_t *get_signed_descriptor_by_fp( time_t publish_cutoff); static was_router_added_t dirserv_add_extrainfo(extrainfo_t *ei, const char **msg); +static void dirserv_cache_measured_bw(measured_bw_line_t *parsed_line, + time_t as_of); +static void dirserv_clear_measured_bw_cache(void); +static void dirserv_expire_measured_bw_cache(time_t now); +static int dirserv_get_measured_bw_cache_size(void); +static int dirserv_query_measured_bw_cache(char *node_id, long *bw_out, + time_t *as_of_out); +static uint32_t dirserv_get_bandwidth_for_router(routerinfo_t *ri); /************** Measured Bandwidth parsing code ******/ #define MAX_MEASUREMENT_AGE (3*24*60*60) /* 3 days */ @@ -1824,7 +1832,7 @@ dirserv_thinks_router_is_unreliable(time_t now, } } if (need_capacity) { - uint32_t bw = router_get_advertised_bandwidth(router); + uint32_t bw = dirserv_get_bandwidth_for_router(router); if (bw < fast_bandwidth) return 1; } @@ -1883,7 +1891,7 @@ router_counts_toward_thresholds(const node_t *node, time_t now, { return node->ri && router_is_active(node->ri, node, now) && !digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest) && - (router_get_advertised_bandwidth(node->ri) >= + (dirserv_get_bandwidth_for_router(node->ri) >= ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER); } @@ -1947,7 +1955,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, uptimes[n_active] = (uint32_t)real_uptime(ri, now); mtbfs[n_active] = rep_hist_get_stability(id, now); tks [n_active] = rep_hist_get_weighted_time_known(id, now); - bandwidths[n_active] = bw = router_get_advertised_bandwidth(ri); + bandwidths[n_active] = bw = dirserv_get_bandwidth_for_router(ri); total_bandwidth += bw; if (node->is_exit && !node->is_bad_exit) { total_exit_bandwidth += bw; @@ -2046,6 +2054,165 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, tor_free(wfus); } +/** Measured bandwidth cache entry */ +typedef struct mbw_cache_entry_s { + long mbw; + time_t as_of; +} mbw_cache_entry_t; + +/** Measured bandwidth cache - keys are identity_digests, values are + * mbw_cache_entry_t *. */ +static digestmap_t *mbw_cache = NULL; + +/** Store a measured bandwidth cache entry when reading the measured + * bandwidths file. */ +static void +dirserv_cache_measured_bw(measured_bw_line_t *parsed_line, time_t as_of) +{ + mbw_cache_entry_t *e = NULL; + + tor_assert(parsed_line); + + /* Allocate a cache if we need */ + if (!mbw_cache) mbw_cache = digestmap_new(); + + /* Check if we have an existing entry */ + e = digestmap_get(mbw_cache, parsed_line->node_id); + /* If we do, we can re-use it */ + if (e) { + /* Check that we really are newer, and update */ + if (as_of > e->as_of) { + e->mbw = parsed_line->bw; + e->as_of = as_of; + } + } else { + /* We'll have to insert a new entry */ + e = tor_malloc(sizeof(*e)); + e->mbw = parsed_line->bw; + e->as_of = as_of; + digestmap_set(mbw_cache, parsed_line->node_id, e); + } +} + +/** Clear and free the measured bandwidth cache */ +static void +dirserv_clear_measured_bw_cache(void) +{ + if (mbw_cache) { + /* Free the map and all entries */ + digestmap_free(mbw_cache, tor_free_); + mbw_cache = NULL; + } +} + +/** Scan the measured bandwidth cache and remove expired entries */ +static void +dirserv_expire_measured_bw_cache(time_t now) +{ + digestmap_iter_t *itr = NULL; + const char *k = NULL; + void *e_v = NULL; + mbw_cache_entry_t *e = NULL; + int rmv; + + if (mbw_cache) { + /* Start iterating */ + itr = digestmap_iter_init(mbw_cache); + while (!digestmap_iter_done(itr)) { + rmv = 0; + digestmap_iter_get(itr, &k, &e_v); + e = (mbw_cache_entry_t *)e_v; + if (e) { + /* Check for expiration and remove if so */ + if (now - e->as_of > MAX_MEASUREMENT_AGE) { + tor_free(e); + rmv = 1; + } + } else { + /* Weird; remove it and complain */ + log_warn(LD_BUG, "Saw NULL entry in measured bandwidth cache"); + rmv = 1; + } + + /* Advance, or remove and advance */ + if (rmv) { + itr = digestmap_iter_next_rmv(mbw_cache, itr); + } else { + itr = digestmap_iter_next(mbw_cache, itr); + } + } + + /* Check if we cleared the whole thing and free if so */ + if (digestmap_size(mbw_cache) == 0) { + digestmap_free(mbw_cache, tor_free_); + mbw_cache = 0; + } + } +} + +/** Get the current size of the measured bandwidth cache */ +static int +dirserv_get_measured_bw_cache_size(void) +{ + if (mbw_cache) return digestmap_size(mbw_cache); + else return 0; +} + +/** Query the cache by identity digest, return value indicates whether + * we found it. */ +static int +dirserv_query_measured_bw_cache(char *node_id, long *bw_out, + time_t *as_of_out) +{ + mbw_cache_entry_t *v = NULL; + int rv = 0; + + if (mbw_cache && node_id) { + v = digestmap_get(mbw_cache, node_id); + if (v) { + /* Found something */ + rv = 1; + if (bw_out) *bw_out = v->mbw; + if (as_of_out) *as_of_out = v->as_of; + } + } + + return rv; +} + +/** Get the best estimate of a router's bandwidth for dirauth purposes, + * preferring measured to advertised values if available. */ + +static uint32_t +dirserv_get_bandwidth_for_router(routerinfo_t *ri) +{ + uint32_t bw = 0; + /* + * Yeah, measured bandwidths in measured_bw_line_t are (implicitly + * signed) longs and the ones router_get_advertised_bandwidth() returns + * are uint32_t. + */ + long mbw = 0; + + if (ri) { + /* + * * First try to see if we have a measured bandwidth; don't bother with + * as_of_out here, on the theory that a stale measured bandwidth is still + * better to trust than an advertised one. + */ + if (dirserv_query_measured_bw_cache(ri->cache_info.identity_digest, + &mbw, NULL)) { + /* Got one! */ + bw = (uint32_t)mbw; + } else { + /* If not, fall back to advertised */ + bw = router_get_advertised_bandwidth(ri); + } + } + + return bw; +} + /** Give a statement of our current performance thresholds for inclusion * in a vote document. */ char * @@ -2327,8 +2494,8 @@ compare_routerinfo_by_ip_and_bw_(const void **a, const void **b) else if (!first_is_running && second_is_running) return 1; - bw_first = router_get_advertised_bandwidth(first); - bw_second = router_get_advertised_bandwidth(second); + bw_first = dirserv_get_bandwidth_for_router(first); + bw_second = dirserv_get_bandwidth_for_router(second); if (bw_first > bw_second) return -1; @@ -2468,7 +2635,7 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, int listbaddirs, int vote_on_hsdirs) { const or_options_t *options = get_options(); - uint32_t routerbw = router_get_advertised_bandwidth(ri); + uint32_t routerbw = dirserv_get_bandwidth_for_router(ri); memset(rs, 0, sizeof(routerstatus_t)); @@ -2670,8 +2837,9 @@ dirserv_read_measured_bandwidths(const char *from_file, char line[256]; FILE *fp = tor_fopen_cloexec(from_file, "r"); int applied_lines = 0; - time_t file_time; + time_t file_time, now; int ok; + if (fp == NULL) { log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s", from_file); @@ -2695,7 +2863,8 @@ dirserv_read_measured_bandwidths(const char *from_file, return -1; } - if ((time(NULL) - file_time) > MAX_MEASUREMENT_AGE) { + now = time(NULL); + if ((now - file_time) > MAX_MEASUREMENT_AGE) { log_warn(LD_DIRSERV, "Bandwidth measurement file stale. Age: %u", (unsigned)(time(NULL) - file_time)); fclose(fp); @@ -2709,12 +2878,17 @@ dirserv_read_measured_bandwidths(const char *from_file, measured_bw_line_t parsed_line; if (fgets(line, sizeof(line), fp) && strlen(line)) { if (measured_bw_line_parse(&parsed_line, line) != -1) { + /* Also cache the line for dirserv_get_bandwidth_for_router() */ + dirserv_cache_measured_bw(&parsed_line, file_time); if (measured_bw_line_apply(&parsed_line, routerstatuses) > 0) applied_lines++; } } } + /* Now would be a nice time to clean the cache, too */ + dirserv_expire_measured_bw_cache(now); + fclose(fp); log_info(LD_DIRSERV, "Bandwidth measurement file successfully read. " @@ -2778,6 +2952,14 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, if (!contact) contact = "(none)"; + /* + * Do this so dirserv_compute_performance_thresholds() and + * set_routerstatus_from_routerinfo() see up-to-date bandwidth info. + */ + if (options->V3BandwidthsFile) { + dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL); + } + /* precompute this part, since we need it to decide what "stable" * means. */ SMARTLIST_FOREACH(rl->routers, routerinfo_t *, ri, { @@ -2841,6 +3023,14 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, if (options->V3BandwidthsFile) { dirserv_read_measured_bandwidths(options->V3BandwidthsFile, routerstatuses); + } else { + /* + * No bandwidths file; clear the measured bandwidth cache in case we had + * one last time around. + */ + if (dirserv_get_measured_bw_cache_size() > 0) { + dirserv_clear_measured_bw_cache(); + } } v3_out = tor_malloc_zero(sizeof(networkstatus_t));

1 0

[tor/master] Call dirserv_clear_measured_bw_cache() from dirserv_free_all()
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 0efe96cae81a078301ba8806d821175c830627b9 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 5 13:11:43 2013 -0800 Call dirserv_clear_measured_bw_cache() from dirserv_free_all() --- src/or/dirserv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 1c78d2d..b3a5177 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -4098,5 +4098,7 @@ dirserv_free_all(void) cached_v2_networkstatus = NULL; strmap_free(cached_consensuses, free_cached_dir_); cached_consensuses = NULL; + + dirserv_clear_measured_bw_cache(); }

1 0