summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2006-02-13 22:29:37 +0000
committerPeter Palfrader <peter@palfrader.org>2006-02-13 22:29:37 +0000
commit0cc2390f8ccdfa0abaf216a13f922e71c000e924 (patch)
treecacbd93266476f294a165c21087ab9f476e8c824
parent5eea6c76df83ab8891dba2af6838c6a5dc512e23 (diff)
downloadtor-0cc2390f8ccdfa0abaf216a13f922e71c000e924.tar.gz
tor-0cc2390f8ccdfa0abaf216a13f922e71c000e924.zip
Warn if ReachableAddresses is set when also ReachableDirAddresses and ReachableORAddresses are set.
svn:r6010
-rw-r--r--src/or/config.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index c2c8d32656..407782667c 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1837,6 +1837,12 @@ parse_reachable_addresses(void)
{
or_options_t *options = get_options();
+ if (options->ReachableDirAddresses &&
+ options->ReachableORAddresses &&
+ options->ReachableAddresses)
+ log_warn(LD_CONFIG, "Both ReachableDirAddresses and ReachableORAddresses are set. "
+ "ReachableAddresses setting will be ignored.");
+
addr_policy_free(reachable_or_addr_policy);
reachable_or_addr_policy = NULL;
if (!options->ReachableORAddresses && options->ReachableAddresses)