r15562@tombo: nickm | 2007-12-18 23:23:59 -0500

 Remove the LearnAuthorityAddrFromCerts option; make it always-on.  One option down, ~160 options to go.

svn:r12870

diff --git a/src/or/config.c b/src/or/config.c
index 302e0a7596ebb54b79b5d8fc8964362a165e4de4..f83ca0f2460cf1427c93b00a0fed84c91b4515b8 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -211,7 +211,6 @@ static config_var_t _option_vars[] = {
   V(HttpsProxyAuthenticator,     STRING,   NULL),
   OBSOLETE("IgnoreVersion"),
   V(KeepalivePeriod,             INTERVAL, "5 minutes"),
-  V(LearnAuthorityAddrFromCerts, BOOL,     "1"),
   VAR("Log",                     LINELIST, Logs,             NULL),
   OBSOLETE("LinkPadding"),
   OBSOLETE("LogLevel"),

diff --git a/src/or/or.h b/src/or/or.h
index 34a7c26d8675c3917b8ade71a06f66771f5bed4f..4625f7852cd443d855209f9d2d99928cd130bce1 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2317,10 +2317,6 @@ typedef struct {
    * cached. */
   char *FallbackNetworkstatusFile;
 
-  /** DOCDOC here and in tor.1 */
-  /**XXXX020 make this always on? */
-  int LearnAuthorityAddrFromCerts;
-
   /** DOCDOC here and in tor.1 */
   int BridgeRecordUsageByCountry;
   char *GeoIPFile;

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index e66f8c0b12748675297eaa0cf6dc637b10f35496..f512659cd20f02d9ec16f5b1e7dfa2581b7309ff 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -109,7 +109,6 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store)
 {
   trusted_dir_server_t *ds;
   const char *s, *eos;
-  or_options_t *options = get_options();
 
   for (s = contents; *s; s = eos) {
     authority_cert_t *cert = authority_cert_parse_from_string(s, &eos);
@@ -151,8 +150,9 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store)
              ds->nickname, hex_str(cert->signing_key_digest,DIGEST_LEN));
 
     smartlist_add(ds->v3_certs, cert);
-    if (options->LearnAuthorityAddrFromCerts &&
-        cert->cache_info.published_on > ds->addr_current_at) {
+    if (cert->cache_info.published_on > ds->addr_current_at) {
+      /* Check to see whether we should update our view of the authority's
+       * address. */
       if (cert->addr && cert->dir_port &&
           (ds->addr != cert->addr ||
            ds->dir_port != cert->dir_port)) {