- tor-commits - lists.torproject.org

[tor/release-0.2.8] Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 7babf33239eb1e349826753a9d0405cb59150cce Merge: 40827da 39c057d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 13:02:02 2016 -0400 Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8 changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc src/common/memarea.c index cfba80b,6c7e4c7..0a3fd00 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@@ -21,12 -21,10 +21,12 @@@ * value. */ #define MEMAREA_ALIGN SIZEOF_VOID_P +/** A value which, when masked out of a pointer, produces a maximally aligned + * pointer. */ #if MEMAREA_ALIGN == 4 - #define MEMAREA_ALIGN_MASK 3lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 - #define MEMAREA_ALIGN_MASK 7lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif

1 0

[tor/maint-0.2.8] memarea: Don't assume that sizeof(ulong) >= sizeof(void*).
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 39c057d45a67f9aa80bc05df85ec8deafdb6f46a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 11:10:14 2016 -0400 memarea: Don't assume that sizeof(ulong) >= sizeof(void*). Fixes bug 18716; bugfix on 0.2.1.1-alpha where memarea.c was introduced. Found by wbenny. --- changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug18716 b/changes/bug18716 new file mode 100644 index 0000000..b15a343 --- /dev/null +++ b/changes/bug18716 @@ -0,0 +1,4 @@ + o Minor bugfixes (assert, portability): + - Fix an assertion failure in memarea.c on systems where "long" is + shorter than the size of a pointer. + Fixes bug 18716; bugfix on 0.2.1.1-alpha diff --git a/src/common/memarea.c b/src/common/memarea.c index 6841ba5..6c7e4c7 100644 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@ -22,9 +22,9 @@ #define MEMAREA_ALIGN SIZEOF_VOID_P #if MEMAREA_ALIGN == 4 -#define MEMAREA_ALIGN_MASK 3lu +#define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 -#define MEMAREA_ALIGN_MASK 7lu +#define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif

1 0

[tor/maint-0.2.8] Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 7babf33239eb1e349826753a9d0405cb59150cce Merge: 40827da 39c057d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 13:02:02 2016 -0400 Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8 changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc src/common/memarea.c index cfba80b,6c7e4c7..0a3fd00 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@@ -21,12 -21,10 +21,12 @@@ * value. */ #define MEMAREA_ALIGN SIZEOF_VOID_P +/** A value which, when masked out of a pointer, produces a maximally aligned + * pointer. */ #if MEMAREA_ALIGN == 4 - #define MEMAREA_ALIGN_MASK 3lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 - #define MEMAREA_ALIGN_MASK 7lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif

1 0

[tor/master] Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 7babf33239eb1e349826753a9d0405cb59150cce Merge: 40827da 39c057d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 12 13:02:02 2016 -0400 Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8 changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc src/common/memarea.c index cfba80b,6c7e4c7..0a3fd00 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@@ -21,12 -21,10 +21,12 @@@ * value. */ #define MEMAREA_ALIGN SIZEOF_VOID_P +/** A value which, when masked out of a pointer, produces a maximally aligned + * pointer. */ #if MEMAREA_ALIGN == 4 - #define MEMAREA_ALIGN_MASK 3lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 - #define MEMAREA_ALIGN_MASK 7lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif

1 0

[tor/master] Turn TestingClientBootstrap* into non-testing options
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 40827da3bfafb3191433d4151d48f79c511dcd42 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Apr 5 14:43:20 2016 -0400 Turn TestingClientBootstrap* into non-testing options This changes simply renames them by removing "Testing" in front of them and they do not require TestingTorNetwork to be enabled anymore. Fixes #18481 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug18481 | 5 +++ doc/tor.1.txt | 100 +++++++++++++++++++++++------------------------- src/or/config.c | 60 +++++++++++++---------------- src/or/directory.c | 6 +-- src/or/networkstatus.c | 6 +-- src/or/or.h | 12 +++--- src/test/test_options.c | 6 +-- 7 files changed, 94 insertions(+), 101 deletions(-) diff --git a/changes/bug18481 b/changes/bug18481 new file mode 100644 index 0000000..7fd9e1e --- /dev/null +++ b/changes/bug18481 @@ -0,0 +1,5 @@ + o Minor bugfixes (client): + - Turn all TestingClientBootstrap* into non-testing torrc options. This + changes simply renames them by removing "Testing" in front of them and + they do not require TestingTorNetwork to be enabled anymore. Fixes + #18481; bugfix on tor-0.2.8.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ac21806..262a36e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1558,6 +1558,45 @@ The following options are useful only for clients (that is, if Tor will use a default value chosen by the directory authorities. (Default: -1.) +[[ClientBootstrapConsensusAuthorityDownloadSchedule]] **ClientBootstrapConsensusAuthorityDownloadSchedule** __N__,__N__,__...__:: + Schedule for when clients should download consensuses from authorities + if they are bootstrapping (that is, they don't have a usable, reasonably + live consensus). Only used by clients fetching from a list of fallback + directory mirrors. This schedule is advanced by (potentially concurrent) + connection attempts, unlike other schedules, which are advanced by + connection failures. (Default: 10, 11, 3600, 10800, 25200, 54000, + 111600, 262800) + +[[ClientBootstrapConsensusFallbackDownloadSchedule]] **ClientBootstrapConsensusFallbackDownloadSchedule** __N__,__N__,__...__:: + Schedule for when clients should download consensuses from fallback + directory mirrors if they are bootstrapping (that is, they don't have a + usable, reasonably live consensus). Only used by clients fetching from a + list of fallback directory mirrors. This schedule is advanced by + (potentially concurrent) connection attempts, unlike other schedules, + which are advanced by connection failures. (Default: 0, 1, 4, 11, 3600, + 10800, 25200, 54000, 111600, 262800) + +[[ClientBootstrapConsensusAuthorityOnlyDownloadSchedule]] **ClientBootstrapConsensusAuthorityOnlyDownloadSchedule** __N__,__N__,__...__:: + Schedule for when clients should download consensuses from authorities + if they are bootstrapping (that is, they don't have a usable, reasonably + live consensus). Only used by clients which don't have or won't fetch + from a list of fallback directory mirrors. This schedule is advanced by + (potentially concurrent) connection attempts, unlike other schedules, + which are advanced by connection failures. (Default: 0, 3, 7, 3600, + 10800, 25200, 54000, 111600, 262800) + +[[ClientBootstrapConsensusMaxDownloadTries]] **ClientBootstrapConsensusMaxDownloadTries** __NUM__:: + Try this many times to download a consensus while bootstrapping using + fallback directory mirrors before giving up. (Default: 7) + +[[ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries]] **ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries** __NUM__:: + Try this many times to download a consensus while bootstrapping using + authorities before giving up. (Default: 4) + +[[ClientBootstrapConsensusMaxInProgressTries]] **ClientBootstrapConsensusMaxInProgressTries** __NUM__:: + Try this many simultaneous connections to download a consensus before + waiting for one to complete, timeout, or error out. (Default: 4) + SERVER OPTIONS -------------- @@ -2347,6 +2386,14 @@ The following options are used for running a testing Tor network. AssumeReachable 1 AuthDirMaxServersPerAddr 0 AuthDirMaxServersPerAuthAddr 0 + ClientBootstrapConsensusAuthorityDownloadSchedule 0, 2, + 4 (for 40 seconds), 8, 16, 32, 60 + ClientBootstrapConsensusFallbackDownloadSchedule 0, 1, + 4 (for 40 seconds), 8, 16, 32, 60 + ClientBootstrapConsensusAuthorityOnlyDownloadSchedule 0, 1, + 4 (for 40 seconds), 8, 16, 32, 60 + ClientBootstrapConsensusMaxDownloadTries 80 + ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 80 ClientDNSRejectInternalAddresses 0 ClientRejectInternalAddresses 0 CountPrivateBandwidth 1 @@ -2365,18 +2412,10 @@ The following options are used for running a testing Tor network. TestingClientDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 TestingServerConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 TestingClientConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 - TestingClientBootstrapConsensusAuthorityDownloadSchedule 0, 2, - 4 (for 40 seconds), 8, 16, 32, 60 - TestingClientBootstrapConsensusFallbackDownloadSchedule 0, 1, - 4 (for 40 seconds), 8, 16, 32, 60 - TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule 0, 1, - 4 (for 40 seconds), 8, 16, 32, 60 TestingBridgeDownloadSchedule 60, 30, 30, 60 TestingClientMaxIntervalWithoutRequest 5 seconds TestingDirConnectionMaxStall 30 seconds TestingConsensusMaxDownloadTries 80 - TestingClientBootstrapConsensusMaxDownloadTries 80 - TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 80 TestingDescriptorMaxDownloadTries 80 TestingMicrodescMaxDownloadTries 80 TestingCertMaxDownloadTries 80 @@ -2437,36 +2476,6 @@ The following options are used for running a testing Tor network. requires that **TestingTorNetwork** is set. (Default: 0, 0, 60, 300, 600, 1800, 3600, 3600, 3600, 10800, 21600, 43200) -[[TestingClientBootstrapConsensusAuthorityDownloadSchedule]] **TestingClientBootstrapConsensusAuthorityDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download consensuses from authorities if - they are bootstrapping (that is, they don't have a usable, reasonably live - consensus). Only used by clients fetching from a list of fallback - directory mirrors. This schedule is advanced by (potentially concurrent) - connection attempts, unlike other schedules, which are advanced by - connection failures. Changing this schedule requires that - **TestingTorNetwork** is set. (Default: 10, 11, 3600, 10800, 25200, 54000, - 111600, 262800) - -[[TestingClientBootstrapConsensusFallbackDownloadSchedule]] **TestingClientBootstrapConsensusFallbackDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download consensuses from fallback - directory mirrors if they are bootstrapping (that is, they don't have a - usable, reasonably live consensus). Only used by clients fetching from a - list of fallback directory mirrors. This schedule is advanced by - (potentially concurrent) connection attempts, unlike other schedules, which - are advanced by connection failures. Changing this schedule requires that - **TestingTorNetwork** is set. (Default: 0, 1, 4, 11, 3600, 10800, 25200, - 54000, 111600, 262800) - -[[TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule]] **TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download consensuses from authorities if - they are bootstrapping (that is, they don't have a usable, reasonably live - consensus). Only used by clients which don't have or won't fetch from a - list of fallback directory mirrors. This schedule is advanced by - (potentially concurrent) connection attempts, unlike other schedules, - which are advanced by connection failures. Changing this schedule requires - that **TestingTorNetwork** is set. (Default: 0, 3, 7, 3600, 10800, 25200, - 54000, 111600, 262800) - [[TestingBridgeDownloadSchedule]] **TestingBridgeDownloadSchedule** __N__,__N__,__...__:: Schedule for when clients should download bridge descriptors. Changing this requires that **TestingTorNetwork** is set. (Default: 3600, 900, 900, 3600) @@ -2486,21 +2495,6 @@ The following options are used for running a testing Tor network. Try this many times to download a consensus before giving up. Changing this requires that **TestingTorNetwork** is set. (Default: 8) -[[TestingClientBootstrapConsensusMaxDownloadTries]] **TestingClientBootstrapConsensusMaxDownloadTries** __NUM__:: - Try this many times to download a consensus while bootstrapping using - fallback directory mirrors before giving up. Changing this requires that - **TestingTorNetwork** is set. (Default: 7) - -[[TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries]] **TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries** __NUM__:: - Try this many times to download a consensus while bootstrapping using - authorities before giving up. Changing this requires that - **TestingTorNetwork** is set. (Default: 4) - -[[TestingClientBootstrapConsensusMaxInProgressTries]] **TestingClientBootstrapConsensusMaxInProgressTries** __NUM__:: - Try this many simultaneous connections to download a consensus before - waiting for one to complete, timeout, or error out. Changing this - requires that **TestingTorNetwork** is set. (Default: 4) - [[TestingDescriptorMaxDownloadTries]] **TestingDescriptorMaxDownloadTries** __NUM__:: Try this often to download a server descriptor before giving up. Changing this requires that **TestingTorNetwork** is set. (Default: 8) diff --git a/src/or/config.c b/src/or/config.c index ed436f9..5d938d1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -480,7 +480,7 @@ static config_var_t option_vars_[] = { V(TestingClientConsensusDownloadSchedule, CSV_INTERVAL, "0, 0, 60, " "300, 600, 1800, 3600, 3600, 3600, " "10800, 21600, 43200"), - /* With the TestingClientBootstrapConsensus*Download* below: + /* With the ClientBootstrapConsensus*Download* below: * Clients with only authorities will try: * - 3 authorities over 10 seconds, then wait 60 minutes. * Clients with authorities and fallbacks will try: @@ -493,27 +493,27 @@ static config_var_t option_vars_[] = { * * When clients have authorities and fallbacks available, they use these * schedules: (we stagger the times to avoid thundering herds) */ - V(TestingClientBootstrapConsensusAuthorityDownloadSchedule, CSV_INTERVAL, + V(ClientBootstrapConsensusAuthorityDownloadSchedule, CSV_INTERVAL, "10, 11, 3600, 10800, 25200, 54000, 111600, 262800" /* 3 days + 1 hour */), - V(TestingClientBootstrapConsensusFallbackDownloadSchedule, CSV_INTERVAL, + V(ClientBootstrapConsensusFallbackDownloadSchedule, CSV_INTERVAL, "0, 1, 4, 11, 3600, 10800, 25200, 54000, 111600, 262800"), /* When clients only have authorities available, they use this schedule: */ - V(TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule, CSV_INTERVAL, + V(ClientBootstrapConsensusAuthorityOnlyDownloadSchedule, CSV_INTERVAL, "0, 3, 7, 3600, 10800, 25200, 54000, 111600, 262800"), /* We don't want to overwhelm slow networks (or mirrors whose replies are * blocked), but we also don't want to fail if only some mirrors are * blackholed. Clients will try 3 directories simultaneously. * (Relays never use simultaneous connections.) */ - V(TestingClientBootstrapConsensusMaxInProgressTries, UINT, "3"), + V(ClientBootstrapConsensusMaxInProgressTries, UINT, "3"), V(TestingBridgeDownloadSchedule, CSV_INTERVAL, "3600, 900, 900, 3600"), V(TestingClientMaxIntervalWithoutRequest, INTERVAL, "10 minutes"), V(TestingDirConnectionMaxStall, INTERVAL, "5 minutes"), V(TestingConsensusMaxDownloadTries, UINT, "8"), /* Since we try connections rapidly and simultaneously, we can afford * to give up earlier. (This protects against overloading directories.) */ - V(TestingClientBootstrapConsensusMaxDownloadTries, UINT, "7"), + V(ClientBootstrapConsensusMaxDownloadTries, UINT, "7"), /* We want to give up much earlier if we're only using authorities. */ - V(TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries, UINT, "4"), + V(ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries, UINT, "4"), V(TestingDescriptorMaxDownloadTries, UINT, "8"), V(TestingMicrodescMaxDownloadTries, UINT, "8"), V(TestingCertMaxDownloadTries, UINT, "8"), @@ -537,6 +537,14 @@ static const config_var_t testing_tor_network_defaults[] = { V(AssumeReachable, BOOL, "1"), V(AuthDirMaxServersPerAddr, UINT, "0"), V(AuthDirMaxServersPerAuthAddr,UINT, "0"), + V(ClientBootstrapConsensusAuthorityDownloadSchedule, CSV_INTERVAL, + "0, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"), + V(ClientBootstrapConsensusFallbackDownloadSchedule, CSV_INTERVAL, + "0, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"), + V(ClientBootstrapConsensusAuthorityOnlyDownloadSchedule, CSV_INTERVAL, + "0, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"), + V(ClientBootstrapConsensusMaxDownloadTries, UINT, "80"), + V(ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries, UINT, "80"), V(ClientDNSRejectInternalAddresses, BOOL,"0"), V(ClientRejectInternalAddresses, BOOL, "0"), V(CountPrivateBandwidth, BOOL, "1"), @@ -560,18 +568,10 @@ static const config_var_t testing_tor_network_defaults[] = { "15, 20, 30, 60"), V(TestingClientConsensusDownloadSchedule, CSV_INTERVAL, "0, 0, 5, 10, " "15, 20, 30, 60"), - V(TestingClientBootstrapConsensusAuthorityDownloadSchedule, CSV_INTERVAL, - "0, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"), - V(TestingClientBootstrapConsensusFallbackDownloadSchedule, CSV_INTERVAL, - "0, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"), - V(TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule, CSV_INTERVAL, - "0, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"), V(TestingBridgeDownloadSchedule, CSV_INTERVAL, "60, 30, 30, 60"), V(TestingClientMaxIntervalWithoutRequest, INTERVAL, "5 seconds"), V(TestingDirConnectionMaxStall, INTERVAL, "30 seconds"), V(TestingConsensusMaxDownloadTries, UINT, "80"), - V(TestingClientBootstrapConsensusMaxDownloadTries, UINT, "80"), - V(TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries, UINT, "80"), V(TestingDescriptorMaxDownloadTries, UINT, "80"), V(TestingMicrodescMaxDownloadTries, UINT, "80"), V(TestingCertMaxDownloadTries, UINT, "80"), @@ -3863,16 +3863,10 @@ options_validate(or_options_t *old_options, or_options_t *options, CHECK_DEFAULT(TestingClientDownloadSchedule); CHECK_DEFAULT(TestingServerConsensusDownloadSchedule); CHECK_DEFAULT(TestingClientConsensusDownloadSchedule); - CHECK_DEFAULT(TestingClientBootstrapConsensusAuthorityDownloadSchedule); - CHECK_DEFAULT(TestingClientBootstrapConsensusFallbackDownloadSchedule); - CHECK_DEFAULT(TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule); CHECK_DEFAULT(TestingBridgeDownloadSchedule); CHECK_DEFAULT(TestingClientMaxIntervalWithoutRequest); CHECK_DEFAULT(TestingDirConnectionMaxStall); CHECK_DEFAULT(TestingConsensusMaxDownloadTries); - CHECK_DEFAULT(TestingClientBootstrapConsensusMaxDownloadTries); - CHECK_DEFAULT(TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries); - CHECK_DEFAULT(TestingClientBootstrapConsensusMaxInProgressTries); CHECK_DEFAULT(TestingDescriptorMaxDownloadTries); CHECK_DEFAULT(TestingMicrodescMaxDownloadTries); CHECK_DEFAULT(TestingCertMaxDownloadTries); @@ -3952,33 +3946,33 @@ options_validate(or_options_t *old_options, or_options_t *options, COMPLAIN("TestingConsensusMaxDownloadTries is insanely high."); } - if (options->TestingClientBootstrapConsensusMaxDownloadTries < 2) { - REJECT("TestingClientBootstrapConsensusMaxDownloadTries must be greater " + if (options->ClientBootstrapConsensusMaxDownloadTries < 2) { + REJECT("ClientBootstrapConsensusMaxDownloadTries must be greater " "than 2." ); - } else if (options->TestingClientBootstrapConsensusMaxDownloadTries > 800) { - COMPLAIN("TestingClientBootstrapConsensusMaxDownloadTries is insanely " + } else if (options->ClientBootstrapConsensusMaxDownloadTries > 800) { + COMPLAIN("ClientBootstrapConsensusMaxDownloadTries is insanely " "high."); } - if (options->TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries + if (options->ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries < 2) { - REJECT("TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries must " + REJECT("ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries must " "be greater than 2." ); } else if ( - options->TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries + options->ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries > 800) { - COMPLAIN("TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries is " + COMPLAIN("ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries is " "insanely high."); } - if (options->TestingClientBootstrapConsensusMaxInProgressTries < 1) { - REJECT("TestingClientBootstrapConsensusMaxInProgressTries must be greater " + if (options->ClientBootstrapConsensusMaxInProgressTries < 1) { + REJECT("ClientBootstrapConsensusMaxInProgressTries must be greater " "than 0."); - } else if (options->TestingClientBootstrapConsensusMaxInProgressTries + } else if (options->ClientBootstrapConsensusMaxInProgressTries > 100) { - COMPLAIN("TestingClientBootstrapConsensusMaxInProgressTries is insanely " + COMPLAIN("ClientBootstrapConsensusMaxInProgressTries is insanely " "high."); } diff --git a/src/or/directory.c b/src/or/directory.c index 749b3a8..ab9f738 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3896,17 +3896,17 @@ find_dl_schedule(download_status_t *dls, const or_options_t *options) if (!use_fallbacks) { /* A bootstrapping client without extra fallback directories */ return - options->TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule; + options->ClientBootstrapConsensusAuthorityOnlyDownloadSchedule; } else if (dls->want_authority) { /* A bootstrapping client with extra fallback directories, but * connecting to an authority */ return - options->TestingClientBootstrapConsensusAuthorityDownloadSchedule; + options->ClientBootstrapConsensusAuthorityDownloadSchedule; } else { /* A bootstrapping client connecting to extra fallback directories */ return - options->TestingClientBootstrapConsensusFallbackDownloadSchedule; + options->ClientBootstrapConsensusFallbackDownloadSchedule; } } else { return options->TestingClientConsensusDownloadSchedule; diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 73755b5..3967f56 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -802,10 +802,10 @@ consensus_max_download_tries(const or_options_t *options, if (we_are_bootstrapping) { if (use_fallbacks) { - return options->TestingClientBootstrapConsensusMaxDownloadTries; + return options->ClientBootstrapConsensusMaxDownloadTries; } else { return - options->TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries; + options->ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries; } } @@ -850,7 +850,7 @@ update_consensus_networkstatus_downloads(time_t now) /* Check if we already have enough connections in progress */ if (we_are_bootstrapping) { max_in_progress_conns = - options->TestingClientBootstrapConsensusMaxInProgressTries; + options->ClientBootstrapConsensusMaxInProgressTries; } if (connection_dir_count_by_purpose_and_resource( DIR_PURPOSE_FETCH_CONSENSUS, diff --git a/src/or/or.h b/src/or/or.h index 111d098..592f295 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4188,7 +4188,7 @@ typedef struct { * This schedule is incremented by (potentially concurrent) connection * attempts, unlike other schedules, which are incremented by connection * failures. Only altered on testing networks. */ - smartlist_t *TestingClientBootstrapConsensusAuthorityDownloadSchedule; + smartlist_t *ClientBootstrapConsensusAuthorityDownloadSchedule; /** Schedule for when clients should download consensuses from fallback * directory mirrors if they are bootstrapping (that is, they don't have a @@ -4198,7 +4198,7 @@ typedef struct { * This schedule is incremented by (potentially concurrent) connection * attempts, unlike other schedules, which are incremented by connection * failures. Only altered on testing networks. */ - smartlist_t *TestingClientBootstrapConsensusFallbackDownloadSchedule; + smartlist_t *ClientBootstrapConsensusFallbackDownloadSchedule; /** Schedule for when clients should download consensuses from authorities * if they are bootstrapping (that is, they don't have a usable, reasonably @@ -4208,7 +4208,7 @@ typedef struct { * This schedule is incremented by (potentially concurrent) connection * attempts, unlike other schedules, which are incremented by connection * failures. Only altered on testing networks. */ - smartlist_t *TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule; + smartlist_t *ClientBootstrapConsensusAuthorityOnlyDownloadSchedule; /** Schedule for when clients should download bridge descriptors. Only * altered on testing networks. */ @@ -4230,17 +4230,17 @@ typedef struct { /** How many times will a client try to fetch a consensus while * bootstrapping using a list of fallback directories, before it gives up? * Only altered on testing networks. */ - int TestingClientBootstrapConsensusMaxDownloadTries; + int ClientBootstrapConsensusMaxDownloadTries; /** How many times will a client try to fetch a consensus while * bootstrapping using only a list of authorities, before it gives up? * Only altered on testing networks. */ - int TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries; + int ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries; /** How many simultaneous in-progress connections will we make when trying * to fetch a consensus before we wait for one to complete, timeout, or * error out? Only altered on testing networks. */ - int TestingClientBootstrapConsensusMaxInProgressTries; + int ClientBootstrapConsensusMaxInProgressTries; /** How many times will we try to download a router's descriptor before * giving up? Only altered on testing networks. */ diff --git a/src/test/test_options.c b/src/test/test_options.c index bd00e61..4f24757 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -307,9 +307,9 @@ fixed_get_uname(void) } #define TEST_OPTIONS_OLD_VALUES "TestingV3AuthInitialVotingInterval 1800\n" \ - "TestingClientBootstrapConsensusMaxDownloadTries 7\n" \ - "TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 4\n" \ - "TestingClientBootstrapConsensusMaxInProgressTries 3\n" \ + "ClientBootstrapConsensusMaxDownloadTries 7\n" \ + "ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 4\n" \ + "ClientBootstrapConsensusMaxInProgressTries 3\n" \ "TestingV3AuthInitialVoteDelay 300\n" \ "TestingV3AuthInitialDistDelay 300\n" \ "TestingClientMaxIntervalWithoutRequest 600\n" \

1 0

[tor/master] memarea: Don't assume that sizeof(ulong) >= sizeof(void*).
by nickm＠torproject.org 12 Apr '16

12 Apr '16

commit 39c057d45a67f9aa80bc05df85ec8deafdb6f46a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 11:10:14 2016 -0400 memarea: Don't assume that sizeof(ulong) >= sizeof(void*). Fixes bug 18716; bugfix on 0.2.1.1-alpha where memarea.c was introduced. Found by wbenny. --- changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug18716 b/changes/bug18716 new file mode 100644 index 0000000..b15a343 --- /dev/null +++ b/changes/bug18716 @@ -0,0 +1,4 @@ + o Minor bugfixes (assert, portability): + - Fix an assertion failure in memarea.c on systems where "long" is + shorter than the size of a pointer. + Fixes bug 18716; bugfix on 0.2.1.1-alpha diff --git a/src/common/memarea.c b/src/common/memarea.c index 6841ba5..6c7e4c7 100644 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@ -22,9 +22,9 @@ #define MEMAREA_ALIGN SIZEOF_VOID_P #if MEMAREA_ALIGN == 4 -#define MEMAREA_ALIGN_MASK 3lu +#define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 -#define MEMAREA_ALIGN_MASK 7lu +#define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif

1 0

[tor/maint-0.2.7] Do not link tests against both libor.a and libor-testing.a
by andrea＠torproject.org 12 Apr '16

12 Apr '16

commit 1a065cea46a9c179d64d74d012f051135bc4725a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 09:53:25 2016 -0500 Do not link tests against both libor.a and libor-testing.a Also, put libor-testing.a at a better position in the list of libraries, to avoid linker errors. This is a fix, or part of a fix, for 18490. Conflicts: src/test/include.am --- changes/build18490 | 4 ++++ src/test/include.am | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changes/build18490 b/changes/build18490 new file mode 100644 index 0000000..466a133 --- /dev/null +++ b/changes/build18490 @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - Do not link the unit tests against both the testing and non-testing + versions of the static libraries. Fixes bug 18490; bugfix on + 0.2.7.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 7a02a4e..9e0d552 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -128,9 +128,12 @@ src_test_test_workqueue_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ -src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ - src/common/libor-crypto-testing.a $(LIBDONNA) src/common/libor.a \ - src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ +src_test_test_LDADD = src/or/libtor-testing.a \ + src/common/libor-crypto-testing.a \ + $(LIBDONNA) \ + src/common/libor-testing.a \ + src/common/libor-event-testing.a \ + src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ @TOR_SYSTEMD_LIBS@

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 12 Apr '16

12 Apr '16

commit 63e3e647ee1153f1292561b8f69da4bca73d81ac Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 12 02:47:13 2016 +0000 Update translations for tails-onioncircuits --- hu/onioncircuits.pot | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hu/onioncircuits.pot b/hu/onioncircuits.pot index 299c7f9..cceb475 100644 --- a/hu/onioncircuits.pot +++ b/hu/onioncircuits.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# benewfy <benewfy(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 03:31+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-12 02:36+0000\n" +"Last-Translator: benewfy <benewfy(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +63,7 @@ msgstr "" #: ../onioncircuits:339 #, c-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" #: ../onioncircuits:564 msgid "Fingerprint:" @@ -74,12 +75,12 @@ msgstr "" #: ../onioncircuits:566 msgid "IP:" -msgstr "" +msgstr "IP:" #: ../onioncircuits:566 #, c-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: ../onioncircuits:567 msgid "Bandwidth:" @@ -88,4 +89,4 @@ msgstr "Sávszélesség:" #: ../onioncircuits:567 #, c-format msgid "%.2f Mb/s" -msgstr "" +msgstr "%.2f Mb/s"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 11 Apr '16

11 Apr '16

commit 876f96ed4b365e31768b909956c4ec0c65f60c62 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 11 18:45:10 2016 +0000 Update translations for torcheck --- nn/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nn/torcheck.po b/nn/torcheck.po index ac0a870..ccb0050 100644 --- a/nn/torcheck.po +++ b/nn/torcheck.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2016-04-11 18:17+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -97,7 +97,7 @@ msgid "However, it does not appear to be Tor Browser." msgstr "" msgid "Run a Relay" -msgstr "" +msgstr "Køyr eit relé" msgid "Stay Anonymous" msgstr "Ver anonym"

1 0

[stem/master] Add reconnect() controller method
by atagar＠torproject.org 11 Apr '16

11 Apr '16

commit 97a8df9d0fcb40b242bc44f429b0b634b7ae47ae Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 11 09:33:55 2016 -0700 Add reconnect() controller method While working on Nyx realized we need our connect() method to reconnect *and* authenticate. Without that multi-threaded access can do the following... CONNECT GETINFO stuff AUTHENTICATE That intermediate GETINFO causes tor to disconnect, failing our attempt to authenticate. We can't do this in our connect() method (since that's already part of our BaseController) so adding a new reconnect() method that does both. --- docs/change_log.rst | 1 + stem/control.py | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 4317307..1c6f491 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -49,6 +49,7 @@ The following are only available within Stem's `git repository * :func:`~stem.connection.connect` and :func:`~stem.control.Controller.from_port` now connect to both port 9051 (relay's default) and 9151 (Tor Browser's default) (:trac:`16075`) * :class:`~stem.exit_policy.ExitPolicy` support for *accept6/reject6* and *\*4/6* wildcards (:trac:`16053`) * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) + * Added :func:`~stem.control.Controller.reconnect` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.is_set` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.is_user_traffic_allowed` to the :class:`~stem.control.Controller` * Added the replica attribute to the :class:`~stem.response.events.HSDescEvent` (:spec:`4989e73`) diff --git a/stem/control.py b/stem/control.py index 1437d2d..3243d1c 100644 --- a/stem/control.py +++ b/stem/control.py @@ -71,6 +71,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo | +- from_socket_file - Provides a Controller based on a socket file connection. | |- authenticate - authenticates this controller with tor + |- reconnect - reconnects and authenticates to socket | |- get_info - issues a GETINFO query for a parameter |- get_version - provides our tor version @@ -1017,10 +1018,6 @@ class Controller(BaseController): self.add_event_listener(_confchanged_listener, EventType.CONF_CHANGED) - def connect(self): - super(Controller, self).connect() - self.clear_cache() - def close(self): # making a best-effort attempt to quit before detaching the socket if self.is_alive(): @@ -1042,6 +1039,22 @@ class Controller(BaseController): import stem.connection stem.connection.authenticate(self, *args, **kwargs) + def reconnect(self, *args, **kwargs): + """ + Reconnects and authenticates to our control socket. + + .. versionadded:: 1.5.0 + + :raises: + * :class:`stem.SocketError` if unable to re-establish socket + * :class:`stem.connection.AuthenticationFailure` if unable to authenticate + """ + + with self._msg_lock: + self.connect() + self.clear_cache() + self.authenticate(*args, **kwargs) + @with_default() def get_info(self, params, default = UNDEFINED, get_bytes = False): """

1 0