summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-03-16 09:40:44 -0400
committerNick Mathewson <nickm@torproject.org>2013-07-18 14:59:55 -0400
commit8bf0382b220b31605fb5a542f36a842bdd7a6ed0 (patch)
tree860c1909b98b9db6587f4e5a3dea14175f86665d /src/or/config.c
parentf45e1fbd5b25735c75bed8767d9d50e279c4b63a (diff)
downloadtor-8bf0382b220b31605fb5a542f36a842bdd7a6ed0.tar.gz
tor-8bf0382b220b31605fb5a542f36a842bdd7a6ed0.zip
Skeleton ExtORPort implementation. Needs testing, documentation.
Does not implement TransportControlPort yet.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 2218e5078b..afdee3d3d4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -230,6 +230,7 @@ static config_var_t option_vars_[] = {
V(ExitPolicyRejectPrivate, BOOL, "1"),
V(ExitPortStatistics, BOOL, "0"),
V(ExtendAllowPrivateAddresses, BOOL, "0"),
+ VPORT(ExtORPort, LINELIST, NULL),
V(ExtraInfoStatistics, BOOL, "1"),
V(FallbackDir, LINELIST, NULL),
@@ -5688,6 +5689,14 @@ parse_ports(or_options_t *options, int validate_only,
goto err;
}
if (parse_port_config(ports,
+ options->ExtORPort_lines, NULL,
+ "ExtOR", CONN_TYPE_EXT_OR_LISTENER,
+ "127.0.0.1", 0,
+ CL_PORT_SERVER_OPTIONS) < 0) {
+ *msg = tor_strdup("Invalid ExtORPort configuration");
+ goto err;
+ }
+ if (parse_port_config(ports,
options->DirPort_lines, options->DirListenAddress,
"Dir", CONN_TYPE_DIR_LISTENER,
"0.0.0.0", 0,