瀏覽代碼

Comment out the (unused) RunTesting option

The code that makes use of the RunTesting option is #if 0, so setting
this option has no effect. Mark the option as obsolete for now, so that
Tor doesn't list it as an available option erroneously.
Sebastian Hahn 13 年之前
父節點
當前提交
13a7e8bea3
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 2 1
      src/or/config.c
  2. 2 2
      src/or/or.h

+ 2 - 1
src/or/config.c

@@ -337,7 +337,8 @@ static config_var_t _option_vars[] = {
   V(RephistTrackTime,            INTERVAL, "24 hours"),
   OBSOLETE("RouterFile"),
   V(RunAsDaemon,                 BOOL,     "0"),
-  V(RunTesting,                  BOOL,     "0"),
+//  V(RunTesting,                  BOOL,     "0"),
+  OBSOLETE("RunTesting"), // currently unused
   V(SafeLogging,                 STRING,   "1"),
   V(SafeSocks,                   BOOL,     "0"),
   V(ServerDNSAllowBrokenConfig,  BOOL,     "1"),

+ 2 - 2
src/or/or.h

@@ -2548,8 +2548,8 @@ typedef struct {
   uint64_t PerConnBWRate; /**< Long-term bw on a single TLS conn, if set. */
   uint64_t PerConnBWBurst; /**< Allowed burst on a single TLS conn, if set. */
   int NumCpus; /**< How many CPUs should we try to use? */
-  int RunTesting; /**< If true, create testing circuits to measure how well the
-                   * other ORs are running. */
+//int RunTesting; /**< If true, create testing circuits to measure how well the
+//                 * other ORs are running. */
   config_line_t *RendConfigLines; /**< List of configuration lines
                                           * for rendezvous services. */
   config_line_t *HidServAuth; /**< List of configuration lines for client-side