Sfoglia il codice sorgente

Change UseOptimisticData default to 1.

This lets us use optimistic data for downloading our initial
consensus.

Closes ticket 18815.
Nick Mathewson 10 anni fa
parent
commit
4f37919fa1
2 ha cambiato i file con 7 aggiunte e 3 eliminazioni
  1. 3 0
      changes/bug18815
  2. 4 3
      src/or/circuituse.c

+ 3 - 0
changes/bug18815

@@ -0,0 +1,3 @@
+  o Minor features (performance):
+    - When fetching a consensus for the first time, use optimistic data.
+      This saves a round-trip during startup. Closes ticket 18815.

+ 4 - 3
src/or/circuituse.c

@@ -2141,10 +2141,11 @@ optimistic_data_enabled(void)
 {
 {
   const or_options_t *options = get_options();
   const or_options_t *options = get_options();
   if (options->OptimisticData < 0) {
   if (options->OptimisticData < 0) {
-    /* XXX023 consider having auto default to 1 rather than 0 before
-     * the 0.2.3 branch goes stable. See bug 3617. -RD */
+    /* Note: this default was 0 before #18815 was merged. We can't take the
+     * parameter out of the consensus until versions before that are all
+     * obsolete. */
     const int32_t enabled =
     const int32_t enabled =
-      networkstatus_get_param(NULL, "UseOptimisticData", 0, 0, 1);
+      networkstatus_get_param(NULL, "UseOptimisticData", /*default*/ 1, 0, 1);
     return (int)enabled;
     return (int)enabled;
   }
   }
   return options->OptimisticData;
   return options->OptimisticData;