Procházet zdrojové kódy

Merge branch 'bug21150_030_01_squashed'

Nick Mathewson před 7 roky
rodič
revize
222f2fe469
3 změnil soubory, kde provedl 12 přidání a 2 odebrání
  1. 5 0
      changes/bug21150
  2. 3 2
      src/or/config.c
  3. 4 0
      src/or/or.h

+ 5 - 0
changes/bug21150

@@ -0,0 +1,5 @@
+  o Minor bugfixes (config, hidden service): 
+    - Stop modifying the value of our torrc option HiddenServiceStatistics
+      just because we're not a bridge or relay. Use an internal value for what
+      tor should use and keep the torrc option intact. Fixes bug 21150; bugfix
+      on tor-0.2.6.2-alpha.

+ 3 - 2
src/or/config.c

@@ -358,7 +358,7 @@ static config_var_t option_vars_[] = {
   VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL),
   VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL),
   VAR("HiddenServiceNumIntroductionPoints", LINELIST_S, RendConfigLines, NULL),
-  V(HiddenServiceStatistics,     BOOL,     "1"),
+  VAR("HiddenServiceStatistics", BOOL,     HiddenServiceStatistics_option, "1"),
   V(HidServAuth,                 LINELIST, NULL),
   V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"),
   V(CloseHSServiceRendCircuitsImmediatelyOnTimeout, BOOL, "0"),
@@ -2004,6 +2004,8 @@ options_act(const or_options_t *old_options)
   /* Only collect directory-request statistics on relays and bridges. */
   options->DirReqStatistics = options->DirReqStatistics_option &&
     server_mode(options);
+  options->HiddenServiceStatistics =
+    options->HiddenServiceStatistics_option && server_mode(options);
 
   if (options->CellStatistics || options->DirReqStatistics ||
       options->EntryStatistics || options->ExitPortStatistics ||
@@ -2018,7 +2020,6 @@ options_act(const or_options_t *old_options)
       options->CellStatistics = 0;
       options->EntryStatistics = 0;
       options->ConnDirectionStatistics = 0;
-      options->HiddenServiceStatistics = 0;
       options->ExitPortStatistics = 0;
     }
 

+ 4 - 0
src/or/or.h

@@ -4168,6 +4168,10 @@ typedef struct {
 
   /** If true, the user wants us to collect statistics as hidden service
    * directory, introduction point, or rendezvous point. */
+  int HiddenServiceStatistics_option;
+  /** Internal variable to remember whether we're actually acting on
+   * HiddenServiceStatistics_option -- yes if it's set and we're a server,
+   * else no. */
   int HiddenServiceStatistics;
 
   /** If true, include statistics file contents in extra-info documents. */