commit edf5a327c5a27db218b4240b758669f5572e9565 Merge: 4b1e0dd5b e8790971f Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 20 13:57:05 2019 -0400
Merge branch 'ticket30914' into ticket30914_merged
changes/ticket30914 | 4 + scripts/maint/practracker/exceptions.txt | 5 +- src/app/config/config.c | 138 +++++++++--------- src/app/config/confparse.c | 178 ++++++++++------------- src/app/config/confparse.h | 25 ++-- src/app/config/statefile.c | 20 ++- src/feature/dirauth/shared_random_state.c | 23 +-- src/feature/nodelist/routerset.c | 62 ++++++++ src/feature/nodelist/routerset.h | 3 + src/lib/conf/conftypes.h | 40 ++++++ src/lib/confmgt/include.am | 2 + src/lib/confmgt/structvar.c | 226 ++++++++++++++++++++++++++++++ src/lib/confmgt/structvar.h | 54 +++++++ src/lib/confmgt/typedvar.c | 18 +-- src/test/test_confparse.c | 59 ++++++-- 15 files changed, 634 insertions(+), 223 deletions(-)
diff --cc scripts/maint/practracker/exceptions.txt index 4f3943f21,2190fb1ca..a1d00b9cd --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@@ -29,24 -29,25 +29,24 @@@ # # Remember: It is better to fix the problem than to add a new exception!
- problem file-size /src/app/config/config.c 8510 - problem include-count /src/app/config/config.c 87 + problem file-size /src/app/config/config.c 8518 + problem include-count /src/app/config/config.c 88 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:resolve_my_address() 192 -problem function-size /src/app/config/config.c:options_validate() 1217 +problem function-size /src/app/config/config.c:resolve_my_address() 190 +problem function-size /src/app/config/config.c:options_validate() 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() 173 -problem function-size /src/app/config/config.c:options_init_logs() 146 +problem function-size /src/app/config/config.c:options_init_from_string() 171 +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() 191 -problem function-size /src/app/config/config.c:parse_dir_authority_line() 151 -problem function-size /src/app/config/config.c:parse_dir_fallback_line() 102 -problem function-size /src/app/config/config.c:parse_port_config() 452 -problem function-size /src/app/config/config.c:parse_ports() 170 -problem function-size /src/app/config/config.c:getinfo_helper_config() 116 -problem function-size /src/app/config/confparse.c:config_assign_value() 205 -problem function-size /src/app/config/confparse.c:config_get_assigned_option() 129 -problem include-count /src/app/main/main.c 67 +problem function-size /src/app/config/config.c: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:parse_ports() 168 +problem function-size /src/app/config/config.c:getinfo_helper_config() 113 +problem file-size /src/app/config/or_options_st.h 1112 +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:sandbox_init_filter() 291 @@@ -276,11 -276,10 +276,10 @@@ problem function-size /src/lib/process/ problem function-size /src/lib/process/setuid.c:switch_id() 156 problem function-size /src/lib/sandbox/sandbox.c:prot_strings() 104 problem function-size /src/lib/string/scanf.c:tor_vsscanf() 112 -problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 153 -problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 171 -problem function-size /src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 126 +problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 152 +problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 170 +problem function-size /src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 121 problem function-size /src/tools/tor-gencert.c:parse_commandline() 111 -problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 104 -problem function-size /src/tools/tor-resolve.c:do_resolve() 174 +problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 102 +problem function-size /src/tools/tor-resolve.c:do_resolve() 171 problem function-size /src/tools/tor-resolve.c:main() 112 -