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

[tor/master] config: Wrap a long line in relay_config.c
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit f10aa77afe33cad719e6a7331fa5b225d3c9adf7 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 11:33:23 2019 +1000 config: Wrap a long line in relay_config.c Part of 32213. --- src/feature/relay/relay_config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index e09f34de0..275e0e6a6 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -1046,7 +1046,8 @@ options_transition_affects_descriptor(const or_options_t *old_options, YES_IF_CHANGED_BOOL(DirCache); YES_IF_CHANGED_BOOL(AssumeReachable); - if (relay_get_effective_bwrate(old_options) != relay_get_effective_bwrate(new_options) || + if (relay_get_effective_bwrate(old_options) != + relay_get_effective_bwrate(new_options) || relay_get_effective_bwburst(old_options) != relay_get_effective_bwburst(new_options) || public_server_mode(old_options) != public_server_mode(new_options))

1 0

[tor/master] scripts: Fix update_versions.py for out-of-tree builds
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit 81972353cbd129984b7cf519bc10a726592793b3 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 12:00:14 2019 +1000 scripts: Fix update_versions.py for out-of-tree builds Fixes bug 32371; bugfix on 0.4.0.1-alpha. --- changes/bug32371 | 3 +++ scripts/maint/update_versions.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug32371 b/changes/bug32371 new file mode 100644 index 000000000..1fed15c2d --- /dev/null +++ b/changes/bug32371 @@ -0,0 +1,3 @@ + o Minor bugfixes (scripts): + - Fix update_versions.py for out-of-tree builds. + Fixes bug 32371; bugfix on 0.4.0.1-alpha. diff --git a/scripts/maint/update_versions.py b/scripts/maint/update_versions.py index 8067f2c6c..706a93b6a 100755 --- a/scripts/maint/update_versions.py +++ b/scripts/maint/update_versions.py @@ -95,7 +95,7 @@ def update_file(fname, replace_on_change(fname, have_changed) # Find out our version -with open("configure.ac") as f: +with open(P("configure.ac")) as f: version = find_version(f) # If we have no version, we can't proceed.

1 0

[tor/master] Makefile: Fix "make autostyle" for out-of-tree builds
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit 9e2a2d38f45c45e455df04c20147bca5ebf078ce Author: teor <teor(a)torproject.org> Date: Tue Nov 5 11:56:14 2019 +1000 Makefile: Fix "make autostyle" for out-of-tree builds Fixes bug 32370; bugfix on 0.4.1.2-alpha. --- Makefile.am | 8 ++++---- changes/bug32370 | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9866f87f8..8b2772577 100644 --- a/Makefile.am +++ b/Makefile.am @@ -488,19 +488,19 @@ version: .PHONY: autostyle-ifdefs autostyle-ifdefs: - $(PYTHON) scripts/maint/annotate_ifdef_directives.py $(OWNED_TOR_C_FILES) + $(PYTHON) $(top_srcdir)/scripts/maint/annotate_ifdef_directives.py $(OWNED_TOR_C_FILES) .PHONY: autostyle-ifdefs autostyle-operators: - $(PERL) scripts/coccinelle/test-operator-cleanup $(OWNED_TOR_C_FILES) + $(PERL) $(top_srcdir)/scripts/coccinelle/test-operator-cleanup $(OWNED_TOR_C_FILES) .PHONY: rectify-includes rectify-includes: - $(PYTHON) scripts/maint/rectify_include_paths.py + $(PYTHON) $(top_srcdir)/scripts/maint/rectify_include_paths.py .PHONY: update-copyright update-copyright: - $(PERL) scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES) + $(PERL) $(top_srcdir)/scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES) .PHONY: autostyle autostyle: update-versions rustfmt autostyle-ifdefs rectify-includes diff --git a/changes/bug32370 b/changes/bug32370 new file mode 100644 index 000000000..9e450d961 --- /dev/null +++ b/changes/bug32370 @@ -0,0 +1,3 @@ + o Minor bugfixes (build): + - Fix "make autostyle" for out-of-tree builds. + Fixes bug 32370; bugfix on 0.4.1.2-alpha.

1 0

[tor/master] practracker: Rename functions modified by a previous commit
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit c065ad3e3ddbe403702f82b34d3058997562f997 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 11:35:35 2019 +1000 practracker: Rename functions modified by a previous commit Part of 32213. --- scripts/maint/practracker/exceptions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index f7bd8287e..6111b0cdd 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -43,10 +43,10 @@ problem function-size /src/app/config/config.c:options_init_from_torrc() 207 problem function-size /src/app/config/config.c:options_init_from_string() 113 problem function-size /src/app/config/config.c:options_init_logs() 145 problem function-size /src/app/config/config.c:parse_bridge_line() 104 -problem function-size /src/app/config/config.c:parse_transport_line() 189 +problem function-size /src/app/config/config.c:pt_parse_transport_line() 189 problem function-size /src/app/config/config.c:parse_dir_authority_line() 150 problem function-size /src/app/config/config.c:parse_dir_fallback_line() 101 -problem function-size /src/app/config/config.c:parse_port_config() 446 +problem function-size /src/app/config/config.c:port_parse_config() 446 problem function-size /src/app/config/config.c:parse_ports() 168 problem file-size /src/app/config/or_options_st.h 1121 problem include-count /src/app/main/main.c 68

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1477'
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit 61694695469824f5daf5155d5f072dd97be22c32 Merge: d3af23783 bcb38d984 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 14:23:10 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1477' Makefile.am | 8 +- changes/bug32213 | 20 + changes/bug32352 | 6 + changes/bug32368 | 4 + changes/bug32370 | 3 + changes/bug32371 | 3 + changes/ticket32213_parseconf | 3 + scripts/maint/practracker/exceptions.txt | 30 +- scripts/maint/update_versions.py | 2 +- src/app/config/config.c | 1561 ++------------------ src/app/config/config.h | 55 +- src/app/config/statefile.c | 3 +- src/app/main/shutdown.c | 2 + src/core/include.am | 12 +- src/feature/client/transports.c | 4 +- src/feature/dirauth/dirauth_config.c | 440 ++++++ src/feature/dirauth/dirauth_config.h | 87 ++ src/feature/dircache/dircache.c | 3 +- src/feature/relay/relay_config.c | 1440 ++++++++++++++++++ src/feature/relay/relay_config.h | 188 +++ src/feature/relay/router.c | 7 +- src/feature/relay/transport_config.c | 307 ++++ src/feature/relay/transport_config.h | 85 ++ src/lib/confmgt/confmgt.c | 9 +- .../conf_examples/badnick_1/error_no_dirauth_relay | 1 + .../conf_examples/badnick_2/error_no_dirauth_relay | 1 + .../conf_examples/bridgeauth_1/error_no_dirauth | 1 + .../bridgeauth_1/error_no_dirauth_relay | 1 + .../conf_examples/bridgeauth_1/expected_no_dirauth | 7 - .../bridgeauth_1/expected_no_dirauth_relay | 6 - .../contactinfo_notutf8/error_no_dirauth_relay | 1 + src/test/conf_examples/dirauth_1/error_no_dirauth | 1 + .../conf_examples/dirauth_1/error_no_dirauth_relay | 1 + .../conf_examples/dirauth_1/expected_no_dirauth | 7 - .../dirauth_1/expected_no_dirauth_relay | 6 - .../conf_examples/example_1/error_no_dirauth_relay | 1 + .../conf_examples/example_3/error_no_dirauth_relay | 1 + .../conf_examples/include_1/error_no_dirauth_relay | 1 + .../include_bug_31408/error_no_dirauth_relay | 1 + .../conf_examples/large_1/error_no_dirauth_relay | 1 + .../conf_examples/ops_1/error_no_dirauth_relay | 1 + .../conf_examples/ops_1/expected_no_dirauth_relay | 1 - .../conf_examples/ops_3/error_no_dirauth_relay | 1 + .../conf_examples/ops_3/expected_no_dirauth_relay | 2 - .../conf_examples/ops_4/error_no_dirauth_relay | 1 + .../conf_examples/ops_4/expected_no_dirauth_relay | 1 - .../conf_examples/ops_5/error_no_dirauth_relay | 1 + .../conf_examples/ops_5/expected_no_dirauth_relay | 2 - .../conf_examples/pt_01/error_no_dirauth_relay | 1 + src/test/conf_examples/pt_01/expected | 0 src/test/conf_examples/pt_01/torrc | 7 + .../conf_examples/pt_02/error_no_dirauth_relay | 1 + src/test/conf_examples/pt_02/expected | 0 src/test/conf_examples/pt_02/torrc | 11 + .../conf_examples/pt_03/error_no_dirauth_relay | 1 + src/test/conf_examples/pt_03/expected | 1 + src/test/conf_examples/pt_03/torrc | 4 + .../conf_examples/pt_04/error_no_dirauth_relay | 1 + src/test/conf_examples/pt_04/expected | 3 + src/test/conf_examples/pt_04/torrc | 6 + .../conf_examples/pt_05/error_no_dirauth_relay | 1 + src/test/conf_examples/pt_05/expected | 4 + src/test/conf_examples/pt_05/torrc | 6 + .../conf_examples/pt_06/error_no_dirauth_relay | 1 + src/test/conf_examples/pt_06/expected | 6 + src/test/conf_examples/pt_06/torrc | 9 + .../conf_examples/pt_07/error_no_dirauth_relay | 1 + src/test/conf_examples/pt_07/expected | 4 + src/test/conf_examples/pt_07/torrc | 6 + src/test/conf_examples/pt_08/error | 1 + .../conf_examples/pt_08/error_no_dirauth_relay | 1 + src/test/conf_examples/pt_08/torrc | 5 + .../conf_examples/pt_09/error_no_dirauth_relay | 1 + src/test/conf_examples/pt_09/expected | 0 src/test/conf_examples/pt_09/torrc | 7 + .../conf_examples/relay_01/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_01/expected | 0 src/test/conf_examples/relay_01/torrc | 5 + .../conf_examples/relay_02/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_02/expected | 0 src/test/conf_examples/relay_02/torrc | 7 + .../conf_examples/relay_03/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_03/expected | 2 + src/test/conf_examples/relay_03/torrc | 5 + .../conf_examples/relay_04/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_04/expected | 2 + src/test/conf_examples/relay_04/torrc | 4 + .../conf_examples/relay_05/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_05/expected | 3 + src/test/conf_examples/relay_05/torrc | 5 + .../conf_examples/relay_06/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_06/expected | 3 + src/test/conf_examples/relay_06/torrc | 5 + .../conf_examples/relay_07/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_07/expected | 3 + src/test/conf_examples/relay_07/torrc | 5 + .../conf_examples/relay_08/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_08/expected | 3 + src/test/conf_examples/relay_08/torrc | 6 + .../conf_examples/relay_09/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_09/expected | 3 + src/test/conf_examples/relay_09/torrc | 6 + .../conf_examples/relay_10/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_10/expected | 3 + src/test/conf_examples/relay_10/torrc | 7 + src/test/conf_examples/relay_11/error | 1 + .../conf_examples/relay_11/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_11/torrc | 4 + src/test/conf_examples/relay_12/error | 1 + .../conf_examples/relay_12/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_12/torrc | 4 + src/test/conf_examples/relay_13/error | 1 + .../conf_examples/relay_13/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_13/torrc | 4 + .../conf_examples/relay_14/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_14/expected | 1 + src/test/conf_examples/relay_14/torrc | 4 + src/test/conf_examples/relay_15/error | 1 + .../conf_examples/relay_15/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_15/torrc | 5 + src/test/conf_examples/relay_16/error | 1 + .../conf_examples/relay_16/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_16/torrc | 4 + .../conf_examples/relay_17/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_17/expected | 4 + src/test/conf_examples/relay_17/torrc | 6 + src/test/conf_examples/relay_18/error | 1 + .../conf_examples/relay_18/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_18/torrc | 4 + .../conf_examples/relay_19/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_19/expected | 3 + src/test/conf_examples/relay_19/torrc | 5 + src/test/conf_examples/relay_20/error | 1 + .../conf_examples/relay_20/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_20/torrc | 5 + .../conf_examples/relay_21/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_21/expected | 3 + src/test/conf_examples/relay_21/torrc | 5 + src/test/conf_examples/relay_22/error | 1 + .../conf_examples/relay_22/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_22/torrc | 6 + src/test/conf_examples/relay_23/error | 1 + .../conf_examples/relay_23/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_23/torrc | 5 + src/test/conf_examples/relay_24/error | 1 + .../conf_examples/relay_24/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_24/torrc | 5 + src/test/conf_examples/relay_25/error | 1 + .../conf_examples/relay_25/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_25/torrc | 5 + src/test/conf_examples/relay_26/error | 1 + .../conf_examples/relay_26/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_26/torrc | 5 + src/test/conf_examples/relay_27/error | 1 + .../conf_examples/relay_27/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_27/torrc | 5 + src/test/conf_examples/relay_28/error | 1 + .../conf_examples/relay_28/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_28/torrc | 5 + .../conf_examples/relay_29/error_no_dirauth_relay | 1 + src/test/conf_examples/relay_29/expected | 2 + src/test/conf_examples/relay_29/torrc | 5 + src/test/include.am | 1 + src/test/test.c | 163 +- src/test/test.h | 1 + src/test/test_cmdline.sh | 17 + src/test/test_config.c | 214 +-- src/test/test_dir_handle_get.c | 9 +- src/test/test_key_expiration.sh | 21 +- src/test/test_keygen.sh | 21 +- src/test/test_options.c | 536 ++++--- src/test/test_parseconf.sh | 55 +- src/test/test_rebind.sh | 35 +- src/test/test_stats.c | 258 ++++ src/test/test_zero_length_keys.sh | 37 +- 175 files changed, 3989 insertions(+), 2022 deletions(-)

1 0

[tor/master] practracker: Update the exceptions file with improvements
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit bcb38d984d42a75832db9fc8f3b70d54dce472e4 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 12:50:08 2019 +1000 practracker: Update the exceptions file with improvements Regenerate the exceptions file, but only commit the improvements. Includes changes from 32213 and other tickets. --- scripts/maint/practracker/exceptions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 6111b0cdd..761299993 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -33,25 +33,25 @@ # # Remember: It is better to fix the problem than to add a new exception! -problem file-size /src/app/config/config.c 8459 -problem include-count /src/app/config/config.c 89 +problem file-size /src/app/config/config.c 7223 +problem include-count /src/app/config/config.c 80 problem function-size /src/app/config/config.c:options_act_reversible() 296 -problem function-size /src/app/config/config.c:options_act() 589 +problem function-size /src/app/config/config.c:options_act() 381 problem function-size /src/app/config/config.c:resolve_my_address() 190 -problem function-size /src/app/config/config.c:options_validate_cb() 1209 -problem function-size /src/app/config/config.c:options_init_from_torrc() 207 -problem function-size /src/app/config/config.c:options_init_from_string() 113 -problem function-size /src/app/config/config.c:options_init_logs() 145 +problem function-size /src/app/config/config.c:options_validate_cb() 785 +problem function-size /src/app/config/config.c:options_init_from_torrc() 188 +problem function-size /src/app/config/config.c:options_init_from_string() 103 +problem function-size /src/app/config/config.c:options_init_logs() 125 problem function-size /src/app/config/config.c:parse_bridge_line() 104 problem function-size /src/app/config/config.c:pt_parse_transport_line() 189 problem function-size /src/app/config/config.c:parse_dir_authority_line() 150 problem function-size /src/app/config/config.c:parse_dir_fallback_line() 101 problem function-size /src/app/config/config.c:port_parse_config() 446 -problem function-size /src/app/config/config.c:parse_ports() 168 -problem file-size /src/app/config/or_options_st.h 1121 +problem function-size /src/app/config/config.c:parse_ports() 132 +problem file-size /src/app/config/or_options_st.h 1117 problem include-count /src/app/main/main.c 68 problem function-size /src/app/main/main.c:dumpstats() 102 -problem function-size /src/app/main/main.c:tor_init() 137 +problem function-size /src/app/main/main.c:tor_init() 111 problem function-size /src/app/main/main.c:sandbox_init_filter() 291 problem function-size /src/app/main/main.c:run_tor_main_loop() 105 problem function-size /src/app/main/ntmain.c:nt_service_install() 126 @@ -204,7 +204,7 @@ problem function-size /src/feature/control/control_cmd.c:add_onion_helper_keyarg problem function-size /src/feature/control/control_events.c:control_event_stream_status() 118 problem include-count /src/feature/control/control_getinfo.c 54 problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_misc() 108 -problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_dir() 302 +problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_dir() 297 problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_events() 234 problem function-size /src/feature/dirauth/bwauth.c:dirserv_read_measured_bandwidths() 121 problem file-size /src/feature/dirauth/dirvote.c 4700 @@ -257,7 +257,7 @@ problem function-size /src/feature/hs/hs_descriptor.c:decrypt_desc_layer() 111 problem function-size /src/feature/hs/hs_descriptor.c:decode_introduction_point() 122 problem function-size /src/feature/hs/hs_descriptor.c:desc_decode_superencrypted_v3() 107 problem function-size /src/feature/hs/hs_descriptor.c:desc_decode_encrypted_v3() 107 -problem file-size /src/feature/hs/hs_service.c 4182 +problem file-size /src/feature/hs/hs_service.c 4172 problem function-size /src/feature/keymgt/loadkey.c:ed_key_init_from_file() 326 problem function-size /src/feature/nodelist/authcert.c:trusted_dirs_load_certs_from_string() 123 problem function-size /src/feature/nodelist/authcert.c:authority_certs_fetch_missing() 295 @@ -320,7 +320,7 @@ problem function-size /src/lib/net/address.c:tor_addr_compare_masked() 110 problem function-size /src/lib/net/inaddr.c:tor_inet_pton() 107 problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102 problem function-size /src/lib/osinfo/uname.c:get_uname() 116 -problem function-size /src/lib/process/process_unix.c:process_unix_exec() 220 +problem function-size /src/lib/process/process_unix.c:process_unix_exec() 213 problem function-size /src/lib/process/process_win32.c:process_win32_exec() 151 problem function-size /src/lib/process/process_win32.c:process_win32_create_pipe() 109 problem function-size /src/lib/process/restrict.c:set_max_file_descriptors() 102

1 0

[tor/master] practracker: Preserve improvements
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit 60d5ff303d65bb7caf5c064675c661faac4cecf1 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 14:28:02 2019 +1000 practracker: Preserve improvements --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 761299993..eb71d8cb4 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -33,7 +33,7 @@ # # Remember: It is better to fix the problem than to add a new exception! -problem file-size /src/app/config/config.c 7223 +problem file-size /src/app/config/config.c 7200 problem include-count /src/app/config/config.c 80 problem function-size /src/app/config/config.c:options_act_reversible() 296 problem function-size /src/app/config/config.c:options_act() 381

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1487'
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit 655603c779b36f2418d0cf35c32bba55ed2ea714 Merge: b9269d6d0 14831ea0a Author: teor <teor(a)torproject.org> Date: Tue Nov 5 14:26:23 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1487' Combine V_IMMUTABLE and FILENAME changes on PidFile. changes/ticket32339_relative | 4 ++++ src/app/config/config.c | 39 +++++++++++++++++---------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --cc src/app/config/config.c index 0f0d9ac46,275ac9e76..4a308a808 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@@ -386,9 -382,9 +386,9 @@@ static const config_var_t option_vars_[ V(UnixSocksGroupWritable, BOOL, "0"), V(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), - V(CookieAuthFile, STRING, NULL), + V(CookieAuthFile, FILENAME, NULL), V(CountPrivateBandwidth, BOOL, "0"), - VAR("DataDirectory", FILENAME, DataDirectory_option, NULL), + VAR_IMMUTABLE("DataDirectory", FILENAME, DataDirectory_option, NULL), V(DataDirectoryGroupReadable, BOOL, "0"), V(DisableOOSCheck, BOOL, "1"), V(DisableNetwork, BOOL, "0"), @@@ -594,8 -590,8 +594,8 @@@ V(PathsNeededToBuildCircuits, DOUBLE, "-1"), V(PerConnBWBurst, MEMUNIT, "0"), V(PerConnBWRate, MEMUNIT, "0"), - V_IMMUTABLE(PidFile, STRING, NULL), - V(PidFile, FILENAME, NULL), - V(TestingTorNetwork, BOOL, "0"), ++ V_IMMUTABLE(PidFile, FILENAME, NULL), + V_IMMUTABLE(TestingTorNetwork, BOOL, "0"), V(TestingMinExitFlagThreshold, MEMUNIT, "0"), V(TestingMinFastFlagThreshold, MEMUNIT, "0"),

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1486'
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit b9269d6d0a19c998295a2b7910b54bf5f4b1e9c6 Merge: 616946954 b985cf240 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 14:23:56 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1486' changes/ticket32344 | 4 +++ src/app/config/config.c | 86 +++++++++++++++++++---------------------------- src/lib/conf/conftypes.h | 5 +++ src/lib/confmgt/confmgt.c | 45 +++++++++++++++++++++++-- 4 files changed, 86 insertions(+), 54 deletions(-)

1 0

[tor/master] config: Run "make autostyle"
by teor＠torproject.org 05 Nov '19

05 Nov '19

commit 8b91fa707573e59dedaa09afdbcbf766e57ff750 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 12:01:29 2019 +1000 config: Run "make autostyle" Part of 32213. --- src/app/config/config.c | 2 +- src/feature/dirauth/dirauth_config.h | 2 +- src/feature/relay/relay_config.h | 6 +++--- src/feature/relay/transport_config.h | 6 +++--- src/test/test_options.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 108786fb6..1b697e73f 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2951,7 +2951,7 @@ options_validate(const or_options_t *old_options, or_options_t *options, vs = config_validate(get_options_mgr(), old_options, options, msg); return vs < 0 ? -1 : 0; } -#endif +#endif /* defined(TOR_UNIT_TESTS) */ #define REJECT(arg) \ STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END diff --git a/src/feature/dirauth/dirauth_config.h b/src/feature/dirauth/dirauth_config.h index fbe4ec1a5..655ab0a7f 100644 --- a/src/feature/dirauth/dirauth_config.h +++ b/src/feature/dirauth/dirauth_config.h @@ -39,7 +39,7 @@ int options_act_dirauth_mtbf(const or_options_t *old_options); int options_act_dirauth_stats(const or_options_t *old_options, bool *print_notice_out); -#else +#else /* !defined(HAVE_MODULE_DIRAUTH) */ /** When tor is compiled with the dirauth module disabled, it can't be * configured as a directory authority. diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h index c0d7d4124..214f07efc 100644 --- a/src/feature/relay/relay_config.h +++ b/src/feature/relay/relay_config.h @@ -88,9 +88,9 @@ STATIC int check_bridge_distribution_setting(const char *bd); STATIC int have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem, char **msg); -#endif +#endif /* defined(RELAY_CONFIG_PRIVATE) */ -#else +#else /* !defined(HAVE_MODULE_RELAY) */ #include "lib/cc/compat_compiler.h" @@ -183,6 +183,6 @@ options_validate_relay_mode(const or_options_t *old_options, #define options_act_relay_dir(old_options) \ (((void)(old_options)),0) -#endif +#endif /* defined(HAVE_MODULE_RELAY) */ #endif /* !defined(TOR_FEATURE_RELAY_RELAY_CONFIG_H) */ diff --git a/src/feature/relay/transport_config.h b/src/feature/relay/transport_config.h index de6e7668e..d3cceb369 100644 --- a/src/feature/relay/transport_config.h +++ b/src/feature/relay/transport_config.h @@ -34,9 +34,9 @@ STATIC smartlist_t *get_options_from_transport_options_line( const char *line, const char *transport); -#endif +#endif /* defined(RELAY_TRANSPORT_CONFIG_PRIVATE) */ -#else +#else /* !defined(HAVE_MODULE_RELAY) */ /** When tor is compiled with the relay module disabled, it can't be * configured with server pluggable transports. @@ -80,6 +80,6 @@ options_validate_server_transport(const or_options_t *old_options, #define options_act_server_transport(old_options) \ (((void)(old_options)),0) -#endif +#endif /* defined(HAVE_MODULE_RELAY) */ #endif /* !defined(TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H) */ diff --git a/src/test/test_options.c b/src/test/test_options.c index 8e673c09f..c06fb998f 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -112,7 +112,7 @@ clear_log_messages(void) #define ENABLE_AUTHORITY_V3 "" #define ENABLE_AUTHORITY_BRIDGE "" -#else +#else /* !defined(COCCI) */ #define ENABLE_AUTHORITY_MIN \ "AuthoritativeDirectory 1\n" @@ -144,7 +144,7 @@ clear_log_messages(void) ENABLE_AUTHORITY_BRIDGE_MIN \ AUTHORITY_OPT_REQ_ -#endif +#endif /* defined(COCCI) */ #define VALID_DIR_AUTH "DirAuthority dizum orport=443 v3ident=E8A9C45" \ "EDE6D711294FADF8E7951F4DE6CA56B58 194.109.206.212:80 7EA6 EAD6 FD83" \

1 0