aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-06-30 14:01:02 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-19 01:58:43 -0400
commitddc65e2b3303559ab7b842a176ee6c2eda9e4027 (patch)
tree79acda709f16d4a8ba2dca99ad81e3c708358e17 /src/or/config.h
parent2163e420b2aea36b57a620eb4bb2ff1e7c9e966f (diff)
downloadtor-ddc65e2b3303559ab7b842a176ee6c2eda9e4027.tar
tor-ddc65e2b3303559ab7b842a176ee6c2eda9e4027.tar.gz
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options. You can now have as many FooPort options as you want (for Foo in Socks, Trans, DNS, NATD), and they can have address:port arguments, and you can specify the level of isolation on those ports. Additionally, this patch refactors the client port parsing logic to use a new type, port_cfg_t. Previously, ports to be bound were half-parsed in config.c, and later re-parsed in connection.c when we're about to bind them. Now, parsing a port means converting it into a port_cfg_t, and binding it uses only a port_cfg_t, without needing to parse the user-provided strings at all. We should do a related refactoring on other port types. For control ports, that'll be easy enough. For ORPort and DirPort, we'll want to do this when we solve proposal 118 (letting servers bind to and advertise multiple ports). This implements tickets 3514 and 3515.
Diffstat (limited to 'src/or/config.h')
-rw-r--r--src/or/config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.h b/src/or/config.h
index 8a06f4443..4a5afdf17 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -64,6 +64,8 @@ or_state_t *get_or_state(void);
int did_last_state_file_write_fail(void);
int or_state_save(time_t now);
+const smartlist_t *get_configured_client_ports(void);
+
int options_need_geoip_info(const or_options_t *options,
const char **reason_out);
int getinfo_helper_config(control_connection_t *conn,