aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-02-13 00:00:40 -0500
committerRoger Dingledine <arma@torproject.org>2012-02-13 00:13:58 -0500
commitc08dde7e289a8f99f610a9ec944ec2b84c2f2d5d (patch)
treef8066907be9156edd3c3f1a9399bff4b9a0ab858 /src
parent2aa1a6baa320d2d9a63d5ed3222ea95ef5ac00dc (diff)
downloadtor-c08dde7e289a8f99f610a9ec944ec2b84c2f2d5d.tar
tor-c08dde7e289a8f99f610a9ec944ec2b84c2f2d5d.tar.gz
Reinstate TOR_PR_EXTENDED_SERVER_PORT, just a little
Diffstat (limited to 'src')
-rw-r--r--src/or/transports.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/transports.c b/src/or/transports.c
index 7bdb88aed..d279d7ad1 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -130,7 +130,7 @@ static INLINE void free_execve_args(char **arg);
/** Number of environment variables for managed proxy clients/servers. */
#define ENVIRON_SIZE_CLIENT 3
-#define ENVIRON_SIZE_SERVER 6
+#define ENVIRON_SIZE_SERVER 7 /* XXX known to be too high, but that's ok */
/** The first and only supported - at the moment - configuration
protocol version. */
@@ -1030,6 +1030,9 @@ set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp)
bindaddr_tmp = get_bindaddr_for_server_proxy(mp);
tor_asprintf(&bindaddr_env, "TOR_PT_SERVER_BINDADDR=%s", bindaddr_tmp);
+ strlcpy(extended_env, "TOR_PT_EXTENDED_SERVER_PORT=",
+ sizeof(extended_env));
+
smartlist_add(envs, orport_env);
smartlist_add(envs, extended_env);
smartlist_add(envs, bindaddr_env);
@@ -1120,6 +1123,7 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp)
router_get_advertised_or_port(options));
tor_asprintf(tmp++, "TOR_PT_SERVER_BINDADDR=%s", bindaddr);
tor_asprintf(tmp++, "TOR_PT_SERVER_TRANSPORTS=%s", transports_to_launch);
+ tor_asprintf(tmp++, "TOR_PT_EXTENDED_SERVER_PORT=");
} else {
tor_asprintf(tmp++, "TOR_PT_CLIENT_TRANSPORTS=%s", transports_to_launch);
}