tor-commits February 2015

tor-commits@lists.torproject.org

15 participants
2121 discussions

[tor/master] Scrub from logs the name of the RP we picked.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit d9968dd0ab146b0d8db348c267c45241fa73bd67 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 22 19:14:50 2014 +0100 Scrub from logs the name of the RP we picked. --- src/or/circuitbuild.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5de6f3c..38be827 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1841,7 +1841,8 @@ choose_good_exit_server(uint8_t purpose, { /* Pick a new RP */ const node_t *rendezvous_node = pick_rendezvous_node(flags); - log_info(LD_REND, "Picked new RP: %s", node_describe(rendezvous_node)); + log_info(LD_REND, "Picked new RP: %s", + safe_str_client(node_describe(rendezvous_node))); return rendezvous_node; } }

1 0

[tor/master] Merge branch 'bug12844'
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit caf28519d9a4f7f0a5fa36a0cd94fe9c0ee292dc Merge: 0c81dfa 0899f51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 11 15:06:04 2015 -0500 Merge branch 'bug12844' Conflicts: src/or/circuituse.c src/test/include.am src/test/test_entrynodes.c changes/feature12844 | 5 +++ doc/tor.1.txt | 16 ++++++++ src/or/circuitbuild.c | 87 ++++++++++++++++++++++++++++++++++++++++++-- src/or/circuitbuild.h | 3 ++ src/or/circuituse.c | 12 +++++- src/or/config.c | 13 ++++++- src/or/or.h | 3 ++ src/or/routerlist.c | 2 +- src/or/routerlist.h | 4 ++ src/test/include.am | 5 ++- src/test/test_entrynodes.c | 68 +++------------------------------- src/test/test_hs.c | 80 ++++++++++++++++++++++++++++++++++++++++ src/test/testhelper.c | 67 ++++++++++++++++++++++++++++++++++ src/test/testhelper.h | 10 +++++ 14 files changed, 305 insertions(+), 70 deletions(-) diff --cc src/or/circuituse.c index 612b536,6304a4d..c463b0a --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -1676,14 -1646,11 +1676,15 @@@ circuit_launch_by_extend_info(uint8_t p { origin_circuit_t *circ; int onehop_tunnel = (flags & CIRCLAUNCH_ONEHOP_TUNNEL) != 0; + int have_path = have_enough_path_info(! (flags & CIRCLAUNCH_IS_INTERNAL) ); + int need_specific_rp = 0; - if (!onehop_tunnel && !router_have_minimum_dir_info()) { - log_debug(LD_CIRC,"Haven't fetched enough directory info yet; canceling " - "circuit launch."); + if (!onehop_tunnel && (!router_have_minimum_dir_info() || !have_path)) { + log_debug(LD_CIRC,"Haven't %s yet; canceling " + "circuit launch.", + !router_have_minimum_dir_info() ? + "fetched enough directory info" : + "received a consensus with exits"); return NULL; } diff --cc src/or/config.c index de0baa4,999b134..ad4fd45 --- a/src/or/config.c +++ b/src/or/config.c @@@ -78,8 -63,10 +78,9 @@@ static config_abbrev_t option_abbrevs_[ PLURAL(AuthDirBadExitCC), PLURAL(AuthDirInvalidCC), PLURAL(AuthDirRejectCC), - PLURAL(ExitNode), PLURAL(EntryNode), PLURAL(ExcludeNode), + PLURAL(Tor2webRendezvousPoint), PLURAL(FirewallPort), PLURAL(LongLivedPort), PLURAL(HiddenServiceNode), @@@ -400,10 -401,14 +401,11 @@@ static config_var_t option_vars_[] = OBSOLETE("StrictEntryNodes"), OBSOLETE("StrictExitNodes"), V(StrictNodes, BOOL, "0"), - V(Support022HiddenServices, AUTOBOOL, "auto"), - OBSOLETE("SysLog"), + OBSOLETE("Support022HiddenServices"), V(TestSocks, BOOL, "0"), - OBSOLETE("TestVia"), V(TokenBucketRefillInterval, MSEC_INTERVAL, "100 msec"), V(Tor2webMode, BOOL, "0"), + V(Tor2webRendezvousPoints, ROUTERSET, NULL), V(TLSECGroup, STRING, NULL), V(TrackHostExits, CSV, NULL), V(TrackHostExitsExpire, INTERVAL, "30 minutes"), diff --cc src/test/include.am index 595be0b,28f3a83..71041b1 --- a/src/test/include.am +++ b/src/test/include.am @@@ -54,24 -39,17 +54,25 @@@ src_test_test_SOURCES = src/test/test_relaycell.c \ src/test/test_replay.c \ src/test/test_routerkeys.c \ + src/test/test_routerlist.c \ + src/test/test_routerset.c \ + src/test/test_scheduler.c \ src/test/test_socks.c \ - src/test/test_util.c \ - src/test/test_config.c \ - src/test/test_hs.c \ - src/test/test_nodelist.c \ - src/test/test_policy.c \ src/test/test_status.c \ - src/test/test_routerset.c \ + src/test/test_threads.c \ + src/test/test_util.c \ + src/test/testing_common.c \ + src/test/testhelper.c \ src/ext/tinytest.c +src_test_test_slow_SOURCES = \ + src/test/test_slow.c \ + src/test/test_crypto_slow.c \ + src/test/test_util_slow.c \ + src/test/testing_common.c \ + src/ext/tinytest.c + + src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS) @@@ -117,13 -74,11 +118,15 @@@ src_test_test_workqueue_LDADD = src/or/ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ noinst_HEADERS+= \ + src/test/fakechans.h \ src/test/test.h \ + src/test/testhelper.h \ + src/test/test_descriptors.inc \ + src/test/example_extrainfo.inc \ + src/test/failing_routerdescs.inc \ - src/test/ed25519_vectors.inc ++ src/test/ed25519_vectors.inc \ + src/test/test_descriptors.inc -if CURVE25519_ENABLED noinst_PROGRAMS+= src/test/test-ntor-cl src_test_test_ntor_cl_SOURCES = src/test/test_ntor_cl.c src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ diff --cc src/test/test_entrynodes.c index 19071a1,1298159..5f2051c --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@@ -197,7 -141,7 +141,7 @@@ populate_live_entry_guards_test_helper( /* Walk the nodelist and add all nodes as entry guards. */ our_nodelist = nodelist_get_list(); - tt_int_op(smartlist_len(our_nodelist), OP_EQ, NUMBER_OF_DESCRIPTORS); - tt_int_op(smartlist_len(our_nodelist), ==, HELPER_NUMBER_OF_DESCRIPTORS); ++ tt_int_op(smartlist_len(our_nodelist), OP_EQ, HELPER_NUMBER_OF_DESCRIPTORS); SMARTLIST_FOREACH_BEGIN(our_nodelist, const node_t *, node) { const node_t *node_tmp; @@@ -206,10 -150,10 +150,10 @@@ } SMARTLIST_FOREACH_END(node); /* Make sure the nodes were added as entry guards. */ - tt_int_op(smartlist_len(all_entry_guards), OP_EQ, NUMBER_OF_DESCRIPTORS); - tt_int_op(smartlist_len(all_entry_guards), ==, HELPER_NUMBER_OF_DESCRIPTORS); ++ tt_int_op(smartlist_len(all_entry_guards), OP_EQ, HELPER_NUMBER_OF_DESCRIPTORS); /* Ensure that all the possible entry guards are enough to satisfy us. */ - tt_int_op(smartlist_len(all_entry_guards), >=, num_needed); + tt_int_op(smartlist_len(all_entry_guards), OP_GE, num_needed); /* Walk the entry guard list for some sanity checking */ SMARTLIST_FOREACH_BEGIN(all_entry_guards, const entry_guard_t *, entry) { @@@ -647,7 -590,7 +591,7 @@@ test_entry_is_live(void *arg /* Walk the nodelist and add all nodes as entry guards. */ our_nodelist = nodelist_get_list(); - tt_int_op(smartlist_len(our_nodelist), OP_EQ, NUMBER_OF_DESCRIPTORS); - tt_int_op(smartlist_len(our_nodelist), ==, HELPER_NUMBER_OF_DESCRIPTORS); ++ tt_int_op(smartlist_len(our_nodelist), OP_EQ, HELPER_NUMBER_OF_DESCRIPTORS); SMARTLIST_FOREACH_BEGIN(our_nodelist, const node_t *, node) { const node_t *node_tmp; @@@ -659,7 -602,7 +603,7 @@@ } SMARTLIST_FOREACH_END(node); /* Make sure the nodes were added as entry guards. */ - tt_int_op(smartlist_len(all_entry_guards), OP_EQ, NUMBER_OF_DESCRIPTORS); - tt_int_op(smartlist_len(all_entry_guards), ==, HELPER_NUMBER_OF_DESCRIPTORS); ++ tt_int_op(smartlist_len(all_entry_guards), OP_EQ, HELPER_NUMBER_OF_DESCRIPTORS); /* Now get a random test entry that we will use for this unit test. */ which_node = 3; /* (chosen by fair dice roll) */

1 0

[tor/master] Write some unittests for Tor2webRendezvousPoints.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit bc80b0a50c1fe9c3d127d54507cb87e4d80c1890 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 15 15:51:49 2014 +0300 Write some unittests for Tor2webRendezvousPoints. --- src/test/test_hs.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 99ef7dd..1513793 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -7,9 +7,15 @@ **/ #define CONTROL_PRIVATE +#define CIRCUITBUILD_PRIVATE + #include "or.h" #include "test.h" #include "control.h" +#include "testhelper.h" +#include "config.h" +#include "routerset.h" +#include "circuitbuild.h" /* mock ID digest and longname for node that's in nodelist */ #define HSDIR_EXIST_ID "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA" \ @@ -121,9 +127,83 @@ test_hs_desc_event(void *arg) tor_free(received_msg); } +/* Make sure we always pick the right RP, given a well formatted + * Tor2webRendezvousPoints value. */ +static void +test_pick_tor2web_rendezvous_node(void *arg) +{ + or_options_t *options = get_options_mutable(); + const node_t *chosen_rp = NULL; + router_crn_flags_t flags = CRN_NEED_DESC; + int retval, i; + const char *tor2web_rendezvous_str = "test003r"; + + (void) arg; + + /* Setup fake routerlist. */ + helper_setup_fake_routerlist(); + + /* Parse Tor2webRendezvousPoints as a routerset. */ + options->Tor2webRendezvousPoints = routerset_new(); + retval = routerset_parse(options->Tor2webRendezvousPoints, + tor2web_rendezvous_str, + "test_tor2web_rp"); + tt_int_op(retval, >=, 0); + + /* Pick rendezvous point. Make sure the correct one is + picked. Repeat many times to make sure it works properly. */ + for (i = 0; i < 50 ; i++) { + chosen_rp = pick_tor2web_rendezvous_node(flags, options); + tt_assert(chosen_rp); + tt_str_op(chosen_rp->ri->nickname, ==, tor2web_rendezvous_str); + } + + done: + routerset_free(options->Tor2webRendezvousPoints); +} + +/* Make sure we never pick an RP if Tor2webRendezvousPoints doesn't + * correspond to an actual node. */ +static void +test_pick_bad_tor2web_rendezvous_node(void *arg) +{ + or_options_t *options = get_options_mutable(); + const node_t *chosen_rp = NULL; + router_crn_flags_t flags = CRN_NEED_DESC; + int retval, i; + const char *tor2web_rendezvous_str = "dummy"; + + (void) arg; + + /* Setup fake routerlist. */ + helper_setup_fake_routerlist(); + + /* Parse Tor2webRendezvousPoints as a routerset. */ + options->Tor2webRendezvousPoints = routerset_new(); + retval = routerset_parse(options->Tor2webRendezvousPoints, + tor2web_rendezvous_str, + "test_tor2web_rp"); + tt_int_op(retval, >=, 0); + + /* Pick rendezvous point. Since Tor2webRendezvousPoints was set to a + dummy value, we shouldn't find any eligible RPs. */ + for (i = 0; i < 50 ; i++) { + chosen_rp = pick_tor2web_rendezvous_node(flags, options); + tt_assert(!chosen_rp); + } + + done: + routerset_free(options->Tor2webRendezvousPoints); +} + struct testcase_t hs_tests[] = { { "hs_desc_event", test_hs_desc_event, TT_FORK, NULL, NULL }, + { "pick_tor2web_rendezvous_node", test_pick_tor2web_rendezvous_node, TT_FORK, + NULL, NULL }, + { "pick_bad_tor2web_rendezvous_node", + test_pick_bad_tor2web_rendezvous_node, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Additional paranoia: do not even build tor2web stuff if not using.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit 0899f51bc6abf535c6c55b81b98b959235b0f7c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 11 14:54:16 2015 -0500 Additional paranoia: do not even build tor2web stuff if not using. (That is, don't build it unless we're building for tor2web, or we are building for tests.) --- src/or/circuitbuild.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 38be827..7662ef2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1735,6 +1735,7 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) return NULL; } +#if defined(ENABLE_TOR2WEB_MODE) || defined(TOR_UNIT_TESTS) /* The config option Tor2webRendezvousPoints has been set and we need * to pick an RP out of that set. Make sure that the RP we choose is * alive, and return it. Return NULL if no usable RP could be found in @@ -1786,6 +1787,7 @@ pick_tor2web_rendezvous_node(router_crn_flags_t flags, return rp_node; } +#endif /* Pick a Rendezvous Point for our HS circuits according to flags. */ static const node_t * @@ -1796,6 +1798,7 @@ pick_rendezvous_node(router_crn_flags_t flags) if (options->AllowInvalid_ & ALLOW_INVALID_RENDEZVOUS) flags |= CRN_ALLOW_INVALID; +#ifdef ENABLE_TOR2WEB_MODE /* The user wants us to pick specific RPs. */ if (options->Tor2webRendezvousPoints) { const node_t *tor2web_rp = pick_tor2web_rendezvous_node(flags, options); @@ -1804,6 +1807,7 @@ pick_rendezvous_node(router_crn_flags_t flags) } /* Else, if no tor2web RP was found, fall back to choosing a random node */ } +#endif return router_choose_random_node(NULL, options->ExcludeNodes, flags); }

1 0

[tor/master] Move some useful unittest functions to a testhelper.c file.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit 532ab7e13cac4c9ba1cdb1e6e008b0e5cb2afff4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 15 15:50:38 2014 +0300 Move some useful unittest functions to a testhelper.c file. This commit only moves code. --- src/test/test_entrynodes.c | 55 ------------------------------------- src/test/testhelper.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 55 deletions(-) diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index fab82c3..0f7fcb0 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -37,61 +37,6 @@ get_or_state_replacement(void) return dummy_state; } -/* NOP replacement for router_descriptor_is_older_than() */ -static int -router_descriptor_is_older_than_replacement(const routerinfo_t *router, - int seconds) -{ - (void) router; - (void) seconds; - return 0; -} - -/* Number of descriptors contained in test_descriptors.txt. */ -#define NUMBER_OF_DESCRIPTORS 8 - -/** Parse a file containing router descriptors and load them to our - routerlist. This function is used to setup an artificial network - so that we can conduct entry guard tests. */ -static void -setup_fake_routerlist(void) -{ - int retval; - routerlist_t *our_routerlist = NULL; - smartlist_t *our_nodelist = NULL; - - /* Read the file that contains our test descriptors. */ - - /* We need to mock this function otherwise the descriptors will not - accepted as they are too old. */ - MOCK(router_descriptor_is_older_than, - router_descriptor_is_older_than_replacement); - - /* Load all the test descriptors to the routerlist. */ - retval = router_load_routers_from_string(TEST_DESCRIPTORS, - NULL, SAVED_IN_JOURNAL, - NULL, 0, NULL); - tt_int_op(retval, ==, NUMBER_OF_DESCRIPTORS); - - /* Sanity checking of routerlist and nodelist. */ - our_routerlist = router_get_routerlist(); - tt_int_op(smartlist_len(our_routerlist->routers), ==, NUMBER_OF_DESCRIPTORS); - routerlist_assert_ok(our_routerlist); - - our_nodelist = nodelist_get_list(); - tt_int_op(smartlist_len(our_nodelist), ==, NUMBER_OF_DESCRIPTORS); - - /* Mark all routers as non-guards but up and running! */ - SMARTLIST_FOREACH_BEGIN(our_nodelist, node_t *, node) { - node->is_running = 1; - node->is_valid = 1; - node->is_possible_guard = 0; - } SMARTLIST_FOREACH_END(node); - - done: - UNMOCK(router_descriptor_is_older_than); -} - /* Unittest cleanup function: Cleanup the fake network. */ static int fake_network_cleanup(const struct testcase_t *testcase, void *ptr) diff --git a/src/test/testhelper.c b/src/test/testhelper.c new file mode 100644 index 0000000..4e23f0c --- /dev/null +++ b/src/test/testhelper.c @@ -0,0 +1,65 @@ +/* Copyright (c) 2014, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define ROUTERLIST_PRIVATE + +#include "or.h" +#include "routerlist.h" +#include "testhelper.h" +#include "nodelist.h" + +#include "test.h" + +#include "test_descriptors.inc" + +/* NOP replacement for router_descriptor_is_older_than() */ +static int +router_descriptor_is_older_than_replacement(const routerinfo_t *router, + int seconds) +{ + (void) router; + (void) seconds; + return 0; +} + +/** Parse a file containing router descriptors and load them to our + routerlist. This function is used to setup an artificial network + so that we can conduct entry guard tests. */ +static void +setup_fake_routerlist(void) +{ + int retval; + routerlist_t *our_routerlist = NULL; + smartlist_t *our_nodelist = NULL; + + /* Read the file that contains our test descriptors. */ + + /* We need to mock this function otherwise the descriptors will not + accepted as they are too old. */ + MOCK(router_descriptor_is_older_than, + router_descriptor_is_older_than_replacement); + + /* Load all the test descriptors to the routerlist. */ + retval = router_load_routers_from_string(TEST_DESCRIPTORS, + NULL, SAVED_IN_JOURNAL, + NULL, 0, NULL); + tt_int_op(retval, ==, NUMBER_OF_DESCRIPTORS); + + /* Sanity checking of routerlist and nodelist. */ + our_routerlist = router_get_routerlist(); + tt_int_op(smartlist_len(our_routerlist->routers), ==, NUMBER_OF_DESCRIPTORS); + routerlist_assert_ok(our_routerlist); + + our_nodelist = nodelist_get_list(); + tt_int_op(smartlist_len(our_nodelist), ==, NUMBER_OF_DESCRIPTORS); + + /* Mark all routers as non-guards but up and running! */ + SMARTLIST_FOREACH_BEGIN(our_nodelist, node_t *, node) { + node->is_running = 1; + node->is_valid = 1; + node->is_possible_guard = 0; + } SMARTLIST_FOREACH_END(node); + + done: + UNMOCK(router_descriptor_is_older_than); +}

1 0

[tor/master] Fix up testhelper to be used by the entryguard unittests.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit a72b92676e936e4936073e10a2452a12982e7ab4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 15 15:51:20 2014 +0300 Fix up testhelper to be used by the entryguard unittests. --- src/test/include.am | 2 ++ src/test/test_entrynodes.c | 12 ++++++------ src/test/testhelper.c | 14 ++++++++------ src/test/testhelper.h | 10 ++++++++++ 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index 77c92f1..28f3a83 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -47,6 +47,7 @@ src_test_test_SOURCES = \ src/test/test_policy.c \ src/test/test_status.c \ src/test/test_routerset.c \ + src/test/testhelper.c \ src/ext/tinytest.c src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) @@ -74,6 +75,7 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \ noinst_HEADERS+= \ src/test/test.h \ + src/test/testhelper.h \ src/test/test_descriptors.inc if CURVE25519_ENABLED diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 0f7fcb0..1298159 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -18,7 +18,7 @@ #include "statefile.h" #include "config.h" -#include "test_descriptors.inc" +#include "testhelper.h" /* TODO: * choose_random_entry() test with state set. @@ -64,7 +64,7 @@ fake_network_setup(const struct testcase_t *testcase) get_or_state_replacement); /* Setup fake routerlist. */ - setup_fake_routerlist(); + helper_setup_fake_routerlist(); /* Return anything but NULL (it's interpreted as test fail) */ return dummy_state; @@ -141,7 +141,7 @@ populate_live_entry_guards_test_helper(int num_needed) /* Walk the nodelist and add all nodes as entry guards. */ our_nodelist = nodelist_get_list(); - tt_int_op(smartlist_len(our_nodelist), ==, NUMBER_OF_DESCRIPTORS); + tt_int_op(smartlist_len(our_nodelist), ==, HELPER_NUMBER_OF_DESCRIPTORS); SMARTLIST_FOREACH_BEGIN(our_nodelist, const node_t *, node) { const node_t *node_tmp; @@ -150,7 +150,7 @@ populate_live_entry_guards_test_helper(int num_needed) } SMARTLIST_FOREACH_END(node); /* Make sure the nodes were added as entry guards. */ - tt_int_op(smartlist_len(all_entry_guards), ==, NUMBER_OF_DESCRIPTORS); + tt_int_op(smartlist_len(all_entry_guards), ==, HELPER_NUMBER_OF_DESCRIPTORS); /* Ensure that all the possible entry guards are enough to satisfy us. */ tt_int_op(smartlist_len(all_entry_guards), >=, num_needed); @@ -590,7 +590,7 @@ test_entry_is_live(void *arg) /* Walk the nodelist and add all nodes as entry guards. */ our_nodelist = nodelist_get_list(); - tt_int_op(smartlist_len(our_nodelist), ==, NUMBER_OF_DESCRIPTORS); + tt_int_op(smartlist_len(our_nodelist), ==, HELPER_NUMBER_OF_DESCRIPTORS); SMARTLIST_FOREACH_BEGIN(our_nodelist, const node_t *, node) { const node_t *node_tmp; @@ -602,7 +602,7 @@ test_entry_is_live(void *arg) } SMARTLIST_FOREACH_END(node); /* Make sure the nodes were added as entry guards. */ - tt_int_op(smartlist_len(all_entry_guards), ==, NUMBER_OF_DESCRIPTORS); + tt_int_op(smartlist_len(all_entry_guards), ==, HELPER_NUMBER_OF_DESCRIPTORS); /* Now get a random test entry that we will use for this unit test. */ which_node = 3; /* (chosen by fair dice roll) */ diff --git a/src/test/testhelper.c b/src/test/testhelper.c index 4e23f0c..8bbc192 100644 --- a/src/test/testhelper.c +++ b/src/test/testhelper.c @@ -24,9 +24,9 @@ router_descriptor_is_older_than_replacement(const routerinfo_t *router, /** Parse a file containing router descriptors and load them to our routerlist. This function is used to setup an artificial network - so that we can conduct entry guard tests. */ -static void -setup_fake_routerlist(void) + so that we can conduct tests on it. */ +void +helper_setup_fake_routerlist(void) { int retval; routerlist_t *our_routerlist = NULL; @@ -43,15 +43,16 @@ setup_fake_routerlist(void) retval = router_load_routers_from_string(TEST_DESCRIPTORS, NULL, SAVED_IN_JOURNAL, NULL, 0, NULL); - tt_int_op(retval, ==, NUMBER_OF_DESCRIPTORS); + tt_int_op(retval, ==, HELPER_NUMBER_OF_DESCRIPTORS); /* Sanity checking of routerlist and nodelist. */ our_routerlist = router_get_routerlist(); - tt_int_op(smartlist_len(our_routerlist->routers), ==, NUMBER_OF_DESCRIPTORS); + tt_int_op(smartlist_len(our_routerlist->routers), ==, + HELPER_NUMBER_OF_DESCRIPTORS); routerlist_assert_ok(our_routerlist); our_nodelist = nodelist_get_list(); - tt_int_op(smartlist_len(our_nodelist), ==, NUMBER_OF_DESCRIPTORS); + tt_int_op(smartlist_len(our_nodelist), ==, HELPER_NUMBER_OF_DESCRIPTORS); /* Mark all routers as non-guards but up and running! */ SMARTLIST_FOREACH_BEGIN(our_nodelist, node_t *, node) { @@ -63,3 +64,4 @@ setup_fake_routerlist(void) done: UNMOCK(router_descriptor_is_older_than); } + diff --git a/src/test/testhelper.h b/src/test/testhelper.h new file mode 100644 index 0000000..6b1bde6 --- /dev/null +++ b/src/test/testhelper.h @@ -0,0 +1,10 @@ +#ifndef TOR_TEST_HELPER_H +#define TOR_TEST_HELPER_H + +/* Number of descriptors contained in test_descriptors.txt. */ +#define HELPER_NUMBER_OF_DESCRIPTORS 8 + +void helper_setup_fake_routerlist(void); + +#endif +

1 0

[tor/master] Add changes file for Tor2webRendezvousPoints.
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit a77e44d8c07d0fd7f1dc0d3d482616de5b9d8679 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 15 16:07:32 2014 +0300 Add changes file for Tor2webRendezvousPoints. --- changes/feature12844 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/feature12844 b/changes/feature12844 new file mode 100644 index 0000000..7b72766 --- /dev/null +++ b/changes/feature12844 @@ -0,0 +1,5 @@ + o Minor features: + - Introduce the config option Tor2webRendezvousPoints, which + allows clients in Tor2webMode to select a specific Rendezvous + Point to be used in HS circuits. This might allow better + performance for Tor2Web nodes. Implements ticket #12844.

1 0

[webwml/master] Update bandwidth requirements
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit 35be4c37b22e95ee879e9ed0509c9ed0bb02a63b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:45:56 2015 +0100 Update bandwidth requirements --- docs/en/faq.wml | 2 +- docs/en/tor-doc-relay.wml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index c946740..3883def 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -2295,7 +2295,7 @@ too. BandwidthRate is the maximum long-term bandwidth allowed (bytes per second). For example, you might want to choose "BandwidthRate 10 MBytes" for 10 megabytes per second (a fast connection), or "BandwidthRate 500 - KBytes" for 500 kilobytes per second (a pretty good cable connection). + KBytes" for 500 kilobytes per second (a decent cable connection). The minimum BandwidthRate setting is 20 kilobytes per second. </li> <li> diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml index 7d48782..e2053bf 100644 --- a/docs/en/tor-doc-relay.wml +++ b/docs/en/tor-doc-relay.wml @@ -18,12 +18,12 @@ The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 250 kilobytes/s each way, please help out Tor by configuring your - Tor to be a relay too. + at least 2 megabits/s for both upload and download, please help out + Tor by configuring your Tor to be a relay too. You can run a Tor relay on pretty much any operating system. Tor relays - work best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and + work best on Linux, OS X Lion or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later.

1 0

[webwml/master] underscore means default. ouch
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit 7cd8071c909d5b365f19a2042c39abef90050d02 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:16:03 2015 +0100 underscore means default. ouch --- docs/en/debian.wml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 9869735..95c93ea 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -11,7 +11,7 @@ // the terms of the GNU GPLv2, http://www.gnu.org/licenses/gpl-2.0.html. var sources = {}; var software = { -'tor': { 'stable': { 'squeeze': [ 'squeeze' ], +'tor': { '_stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -30,7 +30,7 @@ var software = { 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, }, -'tor (from source)': { 'stable': { 'squeeze': [ 'squeeze' ], +'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -89,16 +89,19 @@ function update() { if (package != pkg.prev) { while (ver.firstChild) ver.removeChild(ver.firstChild); + var selected; for (version in software[package]) { option = document.createElement('option'); if (version[0] == '_') { version = version.slice(1); + selected = version; } option.appendChild(document.createTextNode(version)); option.value = version = version.replace(/ $.*$/,''); //alert(version); ver.appendChild(option); } + ver.value = version = selected || version; pkg.prev = package } try {

1 0

[webwml/master] reorder stable and experimental on debian selector
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit d6e25bbf368eadfac24c74c6e78972819a821cab Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:08:54 2015 +0100 reorder stable and experimental on debian selector --- docs/en/debian.wml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 5503438..9869735 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -11,7 +11,7 @@ // the terms of the GNU GPLv2, http://www.gnu.org/licenses/gpl-2.0.html. var sources = {}; var software = { -'tor': { 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], +'tor': { 'stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -20,7 +20,7 @@ var software = { 'saucy': [ 'saucy'], 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, - 'stable': { 'squeeze': [ 'squeeze' ], + 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -30,7 +30,7 @@ var software = { 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, }, -'tor (from source)': { 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], +'tor (from source)': { 'stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -39,7 +39,7 @@ var software = { 'saucy': [ 'saucy'], 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, - 'stable': { 'squeeze': [ 'squeeze' ], + 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -89,19 +89,16 @@ function update() { if (package != pkg.prev) { while (ver.firstChild) ver.removeChild(ver.firstChild); - var selected; for (version in software[package]) { option = document.createElement('option'); if (version[0] == '_') { version = version.slice(1); - selected = version; } option.appendChild(document.createTextNode(version)); option.value = version = version.replace(/ $.*$/,''); //alert(version); ver.appendChild(option); } - ver.value = version = selected || version; pkg.prev = package } try {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2015