November 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.1] hs-v3: Fix consensus param "hsdir-interval" name
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 7df28ce2990cc0890b05767f07756990e0d91e97 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 13 11:48:56 2017 -0500 hs-v3: Fix consensus param "hsdir-interval" name The dir-spec.txt specifies it to be "hsdir_interval" (underscore). Fixes #24262 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug24262 b/changes/bug24262 new file mode 100644 index 000000000..eee69512e --- /dev/null +++ b/changes/bug24262 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service): + - Fix the consensus parameter "hsdir-interval" to "hsdir_interval" so it + matches the dir-spec.txt. Fixes bug 24262; bugfix on 0.3.1.1-alpha. diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 42508126f..7cef5a8e2 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -56,7 +56,7 @@ hs_check_service_private_dir(const char *username, const char *path, STATIC uint64_t get_time_period_length(void) { - int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN, HS_TIME_PERIOD_LENGTH_MAX);

1 0

[tor/maint-0.3.2] hs-v3: Fix consensus param "hsdir-interval" name
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 7df28ce2990cc0890b05767f07756990e0d91e97 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 13 11:48:56 2017 -0500 hs-v3: Fix consensus param "hsdir-interval" name The dir-spec.txt specifies it to be "hsdir_interval" (underscore). Fixes #24262 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug24262 b/changes/bug24262 new file mode 100644 index 000000000..eee69512e --- /dev/null +++ b/changes/bug24262 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service): + - Fix the consensus parameter "hsdir-interval" to "hsdir_interval" so it + matches the dir-spec.txt. Fixes bug 24262; bugfix on 0.3.1.1-alpha. diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 42508126f..7cef5a8e2 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -56,7 +56,7 @@ hs_check_service_private_dir(const char *username, const char *path, STATIC uint64_t get_time_period_length(void) { - int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN, HS_TIME_PERIOD_LENGTH_MAX);

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit d0b75b5ade6713373e97fdbd563b8ffaf14f237b Merge: 3300a6e93 7df28ce29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 12:27:36 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/hs_common.c index f79aeb598,7cef5a8e2..a0f2af29c --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@@ -213,18 -56,7 +213,18 @@@ hs_check_service_private_dir(const cha STATIC uint64_t get_time_period_length(void) { + /* If we are on a test network, make the time period smaller than normal so + that we actually see it rotate. Specifically, make it the same length as + an SRV protocol run. */ + if (get_options()->TestingTorNetwork) { + unsigned run_duration = sr_state_get_protocol_run_duration(); + /* An SRV run should take more than a minute (it's 24 rounds) */ + tor_assert_nonfatal(run_duration > 60); + /* Turn it from seconds to minutes before returning: */ + return sr_state_get_protocol_run_duration() / 60; + } + - int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN, HS_TIME_PERIOD_LENGTH_MAX);

1 0

[tor/master] hs-v3: Fix consensus param "hsdir-interval" name
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 7df28ce2990cc0890b05767f07756990e0d91e97 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 13 11:48:56 2017 -0500 hs-v3: Fix consensus param "hsdir-interval" name The dir-spec.txt specifies it to be "hsdir_interval" (underscore). Fixes #24262 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug24262 b/changes/bug24262 new file mode 100644 index 000000000..eee69512e --- /dev/null +++ b/changes/bug24262 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service): + - Fix the consensus parameter "hsdir-interval" to "hsdir_interval" so it + matches the dir-spec.txt. Fixes bug 24262; bugfix on 0.3.1.1-alpha. diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 42508126f..7cef5a8e2 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -56,7 +56,7 @@ hs_check_service_private_dir(const char *username, const char *path, STATIC uint64_t get_time_period_length(void) { - int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN, HS_TIME_PERIOD_LENGTH_MAX);

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit d0b75b5ade6713373e97fdbd563b8ffaf14f237b Merge: 3300a6e93 7df28ce29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 12:27:36 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/hs_common.c index f79aeb598,7cef5a8e2..a0f2af29c --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@@ -213,18 -56,7 +213,18 @@@ hs_check_service_private_dir(const cha STATIC uint64_t get_time_period_length(void) { + /* If we are on a test network, make the time period smaller than normal so + that we actually see it rotate. Specifically, make it the same length as + an SRV protocol run. */ + if (get_options()->TestingTorNetwork) { + unsigned run_duration = sr_state_get_protocol_run_duration(); + /* An SRV run should take more than a minute (it's 24 rounds) */ + tor_assert_nonfatal(run_duration > 60); + /* Turn it from seconds to minutes before returning: */ + return sr_state_get_protocol_run_duration() / 60; + } + - int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN, HS_TIME_PERIOD_LENGTH_MAX);

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 08d933a7942434613418430cbe3c81d9fb4febb7 Merge: a71552268 d0b75b5ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 12:27:44 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit d0b75b5ade6713373e97fdbd563b8ffaf14f237b Merge: 3300a6e93 7df28ce29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 12:27:36 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/hs_common.c index f79aeb598,7cef5a8e2..a0f2af29c --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@@ -213,18 -56,7 +213,18 @@@ hs_check_service_private_dir(const cha STATIC uint64_t get_time_period_length(void) { + /* If we are on a test network, make the time period smaller than normal so + that we actually see it rotate. Specifically, make it the same length as + an SRV protocol run. */ + if (get_options()->TestingTorNetwork) { + unsigned run_duration = sr_state_get_protocol_run_duration(); + /* An SRV run should take more than a minute (it's 24 rounds) */ + tor_assert_nonfatal(run_duration > 60); + /* Turn it from seconds to minutes before returning: */ + return sr_state_get_protocol_run_duration() / 60; + } + - int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN, HS_TIME_PERIOD_LENGTH_MAX);

1 0

[tor/release-0.3.1] hs-v3: Fix consensus param "hsdir-interval" name
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 7df28ce2990cc0890b05767f07756990e0d91e97 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 13 11:48:56 2017 -0500 hs-v3: Fix consensus param "hsdir-interval" name The dir-spec.txt specifies it to be "hsdir_interval" (underscore). Fixes #24262 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug24262 b/changes/bug24262 new file mode 100644 index 000000000..eee69512e --- /dev/null +++ b/changes/bug24262 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service): + - Fix the consensus parameter "hsdir-interval" to "hsdir_interval" so it + matches the dir-spec.txt. Fixes bug 24262; bugfix on 0.3.1.1-alpha. diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 42508126f..7cef5a8e2 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -56,7 +56,7 @@ hs_check_service_private_dir(const char *username, const char *path, STATIC uint64_t get_time_period_length(void) { - int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN, HS_TIME_PERIOD_LENGTH_MAX);

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit d96f7f38e855dd8912389058a0a5759b9e5c0d02 Merge: 5355b99dc 7df28ce29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 12:26:46 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] hs-v3: Fix consensus param "hsdir-interval" name
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 7df28ce2990cc0890b05767f07756990e0d91e97 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 13 11:48:56 2017 -0500 hs-v3: Fix consensus param "hsdir-interval" name The dir-spec.txt specifies it to be "hsdir_interval" (underscore). Fixes #24262 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug24262 b/changes/bug24262 new file mode 100644 index 000000000..eee69512e --- /dev/null +++ b/changes/bug24262 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service): + - Fix the consensus parameter "hsdir-interval" to "hsdir_interval" so it + matches the dir-spec.txt. Fixes bug 24262; bugfix on 0.3.1.1-alpha. diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 42508126f..7cef5a8e2 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -56,7 +56,7 @@ hs_check_service_private_dir(const char *username, const char *path, STATIC uint64_t get_time_period_length(void) { - int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN, HS_TIME_PERIOD_LENGTH_MAX);

1 0