瀏覽代碼

simplify we_use_microdescriptors_for_circuits()

Roger Dingledine 7 年之前
父節點
當前提交
f0fb55ad30
共有 1 個文件被更改,包括 3 次插入6 次删除
  1. 3 6
      src/or/microdesc.c

+ 3 - 6
src/or/microdesc.c

@@ -917,12 +917,9 @@ update_microdescs_from_networkstatus(time_t now)
 int
 we_use_microdescriptors_for_circuits(const or_options_t *options)
 {
-  int ret = options->UseMicrodescriptors;
-  if (ret == -1) {
-    /* UseMicrodescriptors is "auto"; choose yes. */
-    return 1;
-  }
-  return ret;
+  if (options->UseMicrodescriptors == 0)
+    return 0; /* the user explicitly picked no */
+  return 1; /* yes and auto both mean yes */
 }
 
 /** Return true iff we should try to download microdescriptors at all. */