diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-18 08:45:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-18 08:45:13 -0400 |
| commit | b551988ef46ac29427a3bd8d8a76965b190623ab (patch) | |
| tree | ebb700b59bc4e5f732514855b48b2b626db4312d /src/or/transports.h | |
| parent | dd44ff663e074d07a8bf8b94dc5d8b9d8dc3fb32 (diff) | |
| parent | 8a01a7c35b422a2c22fad2ee71f0268aa1b28b85 (diff) | |
| download | tor-b551988ef46ac29427a3bd8d8a76965b190623ab.tar.gz tor-b551988ef46ac29427a3bd8d8a76965b190623ab.zip | |
Merge branch 'bug8929_rebase_2'
Diffstat (limited to 'src/or/transports.h')
| -rw-r--r-- | src/or/transports.h | 6 |
1 files changed, 6 insertions, 0 deletions
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 |