[or-cvs] r12870: Remove the LearnAuthorityAddrFromCerts option; make it alway (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-12-18 23:24:05 -0500 (Tue, 18 Dec 2007)
New Revision: 12870

Modified:
   tor/trunk/
   tor/trunk/src/or/config.c
   tor/trunk/src/or/or.h
   tor/trunk/src/or/routerlist.c
Log:
 r15562 at tombo:  nickm | 2007-12-18 23:23:59 -0500
 Remove the LearnAuthorityAddrFromCerts option; make it always-on.  One option down, ~160 options to go.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15562] on d9e39d38-0f13-419c-a857-e10a0ce2aa0c

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-12-19 04:18:28 UTC (rev 12869)
+++ tor/trunk/src/or/config.c	2007-12-19 04:24:05 UTC (rev 12870)
@@ -211,7 +211,6 @@
   V(HttpsProxyAuthenticator,     STRING,   NULL),
   OBSOLETE("IgnoreVersion"),
   V(KeepalivePeriod,             INTERVAL, "5 minutes"),
-  V(LearnAuthorityAddrFromCerts, BOOL,     "1"),
   VAR("Log",                     LINELIST, Logs,             NULL),
   OBSOLETE("LinkPadding"),
   OBSOLETE("LogLevel"),

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-12-19 04:18:28 UTC (rev 12869)
+++ tor/trunk/src/or/or.h	2007-12-19 04:24:05 UTC (rev 12870)
@@ -2318,10 +2318,6 @@
   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;
 

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-12-19 04:18:28 UTC (rev 12869)
+++ tor/trunk/src/or/routerlist.c	2007-12-19 04:24:05 UTC (rev 12870)
@@ -109,7 +109,6 @@
 {
   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 @@
              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)) {