From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 19 Dec 2007 04:24:05 +0000 (+0000)
Subject:  r15562@tombo:  nickm | 2007-12-18 23:23:59 -0500
X-Git-Tag: tor-0.2.0.13-alpha~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a697573ce911f0b16e5cb5e8d73d4863883f82ac;p=thirdparty%2Ftor.git

 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 302e0a7596..f83ca0f246 100644
--- 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 34a7c26d86..4625f7852c 100644
--- 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 e66f8c0b12..f512659cd2 100644
--- 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)) {