Преглед изворни кода

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 пре 15 година
родитељ
комит
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: