[tor-commits] [tor/maint-0.4.3] Merge branch 'bug32588_042' into bug32588_043

[nickm at torproject.org]

commit 52f61ec83ea8fd2641ca8cae111b2437d8114aa1
Merge: e380396d4 5e2f31f17
Author: teor <teor at torproject.org>
Date:   Sat Mar 21 04:01:00 2020 +1000

    Merge branch 'bug32588_042' into bug32588_043
    
    Merge static function declaration deletions from bug32588_042 and
    maint-0.4.3 in app/config/config.c.

 changes/bug32588           |   4 ++
 src/app/config/config.c    |   5 +-
 src/app/config/config.h    |   4 ++
 src/feature/relay/router.c |  77 ++++++++++++++++++-----------
 src/feature/relay/router.h |   2 +
 src/test/test_config.c     |  66 +++++++++++++++++++++++++
 src/test/test_router.c     | 117 +++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 243 insertions(+), 32 deletions(-)

diff --cc src/app/config/config.c
index bbf984ad0,126256843..d79cd8cb7
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@@ -819,13 -813,24 +819,10 @@@ static const config_deprecation_t optio
  #ifdef _WIN32
  static char *get_windows_conf_root(void);
  #endif
 -static int options_act_reversible(const or_options_t *old_options, char **msg);
 -static int options_transition_allowed(const or_options_t *old,
 -                                      const or_options_t *new,
 -                                      char **msg);
 -static int options_transition_affects_workers(
 -      const or_options_t *old_options, const or_options_t *new_options);
 -static int options_transition_affects_descriptor(
 -      const or_options_t *old_options, const or_options_t *new_options);
 -static int options_transition_affects_dirauth_timing(
 -      const or_options_t *old_options, const or_options_t *new_options);
 -static int normalize_nickname_list(config_line_t **normalized_out,
 -                                   const config_line_t *lst, const char *name,
 -                                   char **msg);
 -static char *get_bindaddr_from_transport_listen_line(const char *line,
 -                                                     const char *transport);
 -static int check_server_ports(const smartlist_t *ports,
 -                              const or_options_t *options,
 -                              int *num_low_ports_out);
 +
 +static int options_check_transition_cb(const void *old,
 +                                       const void *new,
 +                                       char **msg);
- static int parse_ports(or_options_t *options, int validate_only,
-                               char **msg_out, int *n_ports_out,
-                               int *world_writable_control_socket);
  static int validate_data_directories(or_options_t *options);
  static int write_configuration_file(const char *fname,
                                      const or_options_t *options);
diff --cc src/app/config/config.h
index 04d877e9d,2ed64fab3..311e27917
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@@ -302,23 -291,11 +302,27 @@@ STATIC uint64_t compute_real_max_mem_in
  STATIC int open_and_add_file_log(const log_severity_list_t *severity,
                                   const char *fname,
                                   int truncate_log);
 +STATIC int options_init_logs(const or_options_t *old_options,
 +                             const or_options_t *options, int validate_only);
 +
 +STATIC int options_create_directories(char **msg_out);
 +struct log_transaction_t;
 +STATIC struct log_transaction_t *options_start_log_transaction(
 +                              const or_options_t *old_options,
 +                              char **msg_out);
 +STATIC void options_commit_log_transaction(struct log_transaction_t *xn);
 +STATIC void options_rollback_log_transaction(struct log_transaction_t *xn);
 +
 +#ifdef TOR_UNIT_TESTS
 +int options_validate(const or_options_t *old_options,
 +                     or_options_t *options,
 +                     char **msg);
 +#endif
  
+ STATIC int parse_ports(or_options_t *options, int validate_only,
+                        char **msg, int *n_ports_out,
+                        int *world_writable_control_socket);
+ 
  #endif /* defined(CONFIG_PRIVATE) */
  
  #endif /* !defined(TOR_CONFIG_H) */