From: Robert Ransom <rransom.8774@gmail.com>
Date: Fri, 1 Oct 2010 07:07:10 +0000 (-0700)
Subject: Add public_server_mode function.
X-Git-Tag: tor-0.2.1.31~7^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07ab559a8e9932fbed1e00e3210a1bb855cf1508;p=thirdparty%2Ftor.git

Add public_server_mode function.
---

diff --git a/src/or/or.h b/src/or/or.h
index 0f5b2bb17b..f40511330a 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4239,6 +4239,7 @@ int authdir_mode_tests_reachability(or_options_t *options);
 int authdir_mode_bridge(or_options_t *options);
 
 int server_mode(or_options_t *options);
+int public_server_mode(or_options_t *options);
 int advertised_server_mode(void);
 int proxy_mode(or_options_t *options);
 void consider_publishable_server(int force);
diff --git a/src/or/router.c b/src/or/router.c
index 2afde746d4..45eeca09ff 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -954,6 +954,15 @@ server_mode(or_options_t *options)
   return (options->ORPort != 0 || options->ORListenAddress);
 }
 
+/** Return true iff we are trying to be a non-bridge server.
+ */
+int
+public_server_mode(or_options_t *options)
+{
+  if (!server_mode(options)) return 0;
+  return (!options->BridgeRelay);
+}
+
 /** Remember if we've advertised ourselves to the dirservers. */
 static int server_is_advertised=0;