From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 15 Aug 2004 20:16:26 +0000 (+0000)
Subject: We are an OR if ORPort *or* ORBindAddress is set; similarly for being an OP
X-Git-Tag: tor-0.0.8rc1~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e19af3fa0fcf4a704048c0568ed95223b90b5e1f;p=thirdparty%2Ftor.git

We are an OR if ORPort *or* ORBindAddress is set; similarly for being an OP


svn:r2237
---

diff --git a/src/or/main.c b/src/or/main.c
index 74b79c6346..fdd0aed81c 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -465,7 +465,7 @@ int clique_mode(void) {
 /** Return true iff we are trying to be a server.
  */
 int server_mode(void) {
-  return (options.ORPort != 0);
+  return (options.ORPort != 0 || options.ORBindAddress);
 }
 
 /** Remember if we've advertised ourselves to the dirservers. */
@@ -479,7 +479,7 @@ int advertised_server_mode(void) {
 
 /** Return true iff we are trying to be a socks proxy. */
 int proxy_mode(void) {
-  return (options.SocksPort != 0);
+  return (options.SocksPort != 0 || options.SocksBindAddress);
 }
 
 /** Perform regular maintenance tasks.  This function gets run once per