瀏覽代碼

always use begin_dir for publishing and fetching bridge
descriptors, no matter our config


svn:r12365

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

+ 3 - 1
src/or/directory.c

@@ -624,7 +624,9 @@ directory_initiate_command(const char *address, uint32_t addr,
 {
 {
   dir_connection_t *conn;
   dir_connection_t *conn;
   or_options_t *options = get_options();
   or_options_t *options = get_options();
-  int use_begindir = options->TunnelDirConns && supports_begindir && or_port &&
+  int use_begindir = supports_begindir && or_port &&
+                     (options->TunnelDirConns ||
+                      router_purpose == ROUTER_PURPOSE_BRIDGE) &&
                      (anonymized_connection ||
                      (anonymized_connection ||
                       fascist_firewall_allows_address_or(addr, or_port));
                       fascist_firewall_allows_address_or(addr, or_port));