commit 18c97ad8bc85b9c0a0b3cac088f719f7e261c60b Author: Andrea Shepard andrea@torproject.org Date: Fri Jul 25 17:49:47 2014 -0700

Expose parse_client_transport_line() and parse_server_transport_line() for the test suite --- src/or/config.c | 10 ++-------- src/or/config.h | 4 ++++ 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c index 310cef8..b50834b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -536,12 +536,6 @@ static int options_transition_affects_workers( static int options_transition_affects_descriptor( const or_options_t *old_options, const or_options_t *new_options); static int check_nickname_list(char **lst, const char *name, char **msg); - -static int parse_client_transport_line(const or_options_t *options, - const char *line, int validate_only); - -static int parse_server_transport_line(const or_options_t *options, - const char *line, int validate_only); static char *get_bindaddr_from_transport_listen_line(const char *line, const char *transport); static int parse_dir_authority_line(const char *line, @@ -4763,7 +4757,7 @@ parse_bridge_line(const char *line) * - If it's an external proxy line, add the transport described in the line to * our internal transport list. * - If it's a managed proxy line, launch the managed proxy. */ -static int +STATIC int parse_client_transport_line(const or_options_t *options, const char *line, int validate_only) { @@ -5063,7 +5057,7 @@ get_options_for_server_transport(const char *transport) * isn't. * If <b>validate_only</b> is 0, the line is well-formed, and it's a * managed proxy line, launch the managed proxy. */ -static int +STATIC int parse_server_transport_line(const or_options_t *options, const char *line, int validate_only) { diff --git a/src/or/config.h b/src/or/config.h index bf38613..31496c2 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -140,6 +140,10 @@ STATIC int options_validate(or_options_t *old_options, or_options_t *options, or_options_t *default_options, int from_setconf, char **msg); +STATIC int parse_client_transport_line(const or_options_t *options, + const char *line, int validate_only); +STATIC int parse_server_transport_line(const or_options_t *options, + const char *line, int validate_only); #endif

#endif