diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-15 17:32:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-18 08:45:03 -0400 |
| commit | 8a01a7c35b422a2c22fad2ee71f0268aa1b28b85 (patch) | |
| tree | d3da851d5d2d6f60891c6f449dab175ff05a1878 /src/or | |
| parent | 31871f7d774b5d18b5cf62ac44a8a2b41f87a8c1 (diff) | |
| download | tor-8a01a7c35b422a2c22fad2ee71f0268aa1b28b85.tar.gz tor-8a01a7c35b422a2c22fad2ee71f0268aa1b28b85.zip | |
Improve test coverage of 8929 code
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/transports.c | 9 | ||||
| -rw-r--r-- | src/or/transports.h | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/or/transports.c b/src/or/transports.c index 39cb872c23..5941560cc7 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -102,9 +102,6 @@ create_managed_proxy_environment(const managed_proxy_t *mp); static INLINE int proxy_configuration_finished(const managed_proxy_t *mp); -static void managed_proxy_destroy(managed_proxy_t *mp, - int also_terminate_process); - static void handle_finished_proxy(managed_proxy_t *mp); static void configure_proxy(managed_proxy_t *mp); @@ -694,7 +691,7 @@ register_proxy(const managed_proxy_t *mp) } /** Free memory allocated by managed proxy <b>mp</b>. */ -static void +STATIC void managed_proxy_destroy(managed_proxy_t *mp, int also_terminate_process) { @@ -1103,7 +1100,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) /** Return a newly allocated string that tor should place in * TOR_PT_SERVER_TRANSPORT_OPTIONS while configuring the server * manged proxy in <b>mp</b>. Return NULL if no such options are found. */ -static char * +STATIC char * get_transport_options_for_server_proxy(const managed_proxy_t *mp) { char *options_string = NULL; @@ -1265,7 +1262,7 @@ create_managed_proxy_environment(const managed_proxy_t *mp) * <b>proxy_argv</b>. * * Requires that proxy_argv have at least one element. */ -static managed_proxy_t * +STATIC managed_proxy_t * managed_proxy_create(const smartlist_t *transport_list, char **proxy_argv, int is_server) { diff --git a/src/or/transports.h b/src/or/transports.h index cc3e018d6d..dc68e946f2 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -110,6 +110,12 @@ STATIC int parse_smethod_line(const char *line, managed_proxy_t *mp); STATIC int parse_version(const char *line, managed_proxy_t *mp); STATIC void parse_env_error(const char *line); STATIC void handle_proxy_line(const char *line, managed_proxy_t *mp); +STATIC char *get_transport_options_for_server_proxy(const managed_proxy_t *mp); + +STATIC void managed_proxy_destroy(managed_proxy_t *mp, + int also_terminate_process); +STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server); #endif |