diff options
| author | teor <teor@torproject.org> | 2020-03-21 03:52:32 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-03-21 03:52:32 +1000 |
| commit | 5e2f31f177d106388021f18c9077b656bf494fec (patch) | |
| tree | 8bbb4ea8277a706d41fd593ec44d3cbcae4d735e /src/app/config | |
| parent | 3aa855dc6877fc281082e2cdaba242d2cc06430f (diff) | |
| parent | 2962c32b7a60b78f4d470bf063f8b1454b56506b (diff) | |
| download | tor-5e2f31f177d106388021f18c9077b656bf494fec.tar.gz tor-5e2f31f177d106388021f18c9077b656bf494fec.zip | |
Merge branch 'bug32588_041' into bug32588_042
Diffstat (limited to 'src/app/config')
| -rw-r--r-- | src/app/config/config.c | 5 | ||||
| -rw-r--r-- | src/app/config/config.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 8c635ab848..126256843c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -828,9 +828,6 @@ static int normalize_nickname_list(config_line_t **normalized_out, char **msg); static char *get_bindaddr_from_transport_listen_line(const char *line, const char *transport); -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 check_server_ports(const smartlist_t *ports, const or_options_t *options, int *num_low_ports_out); @@ -7333,7 +7330,7 @@ count_real_listeners(const smartlist_t *ports, int listenertype, * If <b>validate_only</b> is false, set configured_client_ports to the * new list of ports parsed from <b>options</b>. **/ -static int +STATIC int parse_ports(or_options_t *options, int validate_only, char **msg, int *n_ports_out, int *world_writable_control_socket) diff --git a/src/app/config/config.h b/src/app/config/config.h index 44f09e5ee9..2ed64fab34 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -292,6 +292,10 @@ STATIC int open_and_add_file_log(const log_severity_list_t *severity, const char *fname, int truncate_log); +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) */ |