浏览代码

Avoid false positives from proxy_mode()

Previously it would erroneously return true if ListenAddr was set for
a client port, even if that port itself was 0.  This would give false
positives, which were not previously harmful... but which were about
to become.
Nick Mathewson 14 年之前
父节点
当前提交
6dfc0d5301
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      src/or/router.c

+ 4 - 4
src/or/router.c

@@ -1107,10 +1107,10 @@ set_server_advertised(int s)
 int
 int
 proxy_mode(or_options_t *options)
 proxy_mode(or_options_t *options)
 {
 {
-  return (options->SocksPort != 0 || options->SocksListenAddress ||
-          options->TransPort != 0 || options->TransListenAddress ||
-          options->NATDPort != 0 || options->NATDListenAddress ||
-          options->DNSPort != 0 || options->DNSListenAddress);
+  return (options->SocksPort != 0 ||
+          options->TransPort != 0 ||
+          options->NATDPort != 0 ||
+          options->DNSPort != 0);
 }
 }
 
 
 /** Decide if we're a publishable server. We are a publishable server if:
 /** Decide if we're a publishable server. We are a publishable server if: