[tor-commits] [tor/release-0.2.2] Avoid false positives from proxy_mode()

[nickm at torproject.org]

commit 6dfc0d530113e055d91b68969c81595ddc749f07
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 28 17:45:41 2011 -0400

    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.
---
 src/or/router.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/router.c b/src/or/router.c
index 0ef4728..65afd49 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1107,10 +1107,10 @@ set_server_advertised(int s)
 int
 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: