diff options
| author | teor <teor@torproject.org> | 2020-03-21 03:50:36 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-03-21 03:50:36 +1000 |
| commit | 2962c32b7a60b78f4d470bf063f8b1454b56506b (patch) | |
| tree | a17e7f5655386190cc0fb58e420c884e1df034a2 /src/app | |
| parent | 42ea03eb7f7e380016ed5440697a81cebe731aa1 (diff) | |
| parent | 96ca14d98924fec8a18a592c491900a9142f6e71 (diff) | |
| download | tor-2962c32b7a60b78f4d470bf063f8b1454b56506b.tar.gz tor-2962c32b7a60b78f4d470bf063f8b1454b56506b.zip | |
Merge branch 'bug32588_035' into bug32588_041
Merge tests from maint-0.4.1 with new tests from bug32588_035
in test_router.c.
Diffstat (limited to 'src/app')
| -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 3ab0f3b129..434fd2d494 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -824,9 +824,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); @@ -7371,7 +7368,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 46db02f944..e74f11cf8b 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -293,6 +293,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) */ |