summaryrefslogtreecommitdiff
path: root/src/or/config.h
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-04-25 14:28:38 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-09 10:30:52 -0400
commit7f95ef6e66754112e7a84e4da83ed754b1dc9626 (patch)
tree6c5556e1a529ef87c13afeb9192b453d01e65365 /src/or/config.h
parent039e2a24da522f483909e0eb55f963dce6e3b0e5 (diff)
downloadtor-7f95ef6e66754112e7a84e4da83ed754b1dc9626.tar.gz
tor-7f95ef6e66754112e7a84e4da83ed754b1dc9626.zip
config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress option
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/config.h')
-rw-r--r--src/or/config.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/config.h b/src/or/config.h
index bb7802c990..27aec7fe3d 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -157,7 +157,7 @@ smartlist_t *get_options_for_server_transport(const char *transport);
#define CL_PORT_NO_STREAM_OPTIONS (1u<<0)
#define CL_PORT_WARN_NONLOCAL (1u<<1)
-#define CL_PORT_ALLOW_EXTRA_LISTENADDR (1u<<2)
+/* Was CL_PORT_ALLOW_EXTRA_LISTENADDR (1u<<2) */
#define CL_PORT_SERVER_OPTIONS (1u<<3)
#define CL_PORT_FORBID_NONLOCAL (1u<<4)
#define CL_PORT_TAKES_HOSTNAMES (1u<<5)
@@ -193,7 +193,6 @@ STATIC int have_enough_mem_for_dircache(const or_options_t *options,
size_t total_mem, char **msg);
STATIC int parse_port_config(smartlist_t *out,
const config_line_t *ports,
- const config_line_t *listenaddrs,
const char *portname,
int listener_type,
const char *defaultaddr,