Add public_server_mode function.

diff --git a/src/or/router.c b/src/or/router.c
index 8b3a1849ac09fb77763b171de027558e25808a30..bc0e67c9b8134bd993a3aca59a2597ce3e3ab7c8 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -976,6 +976,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);
+}
+
 /** Return true iff the combination of options in <b>options</b> and parameters
  * in the consensus mean that we don't want to allow exits from circuits
  * we got from addresses not known to be servers. */

diff --git a/src/or/router.h b/src/or/router.h
index c17fc78bd098587cb408737e89c56b6cddca8492..4107c717c36fe5af4b1a8c89f80970021ee87b68 100644 (file)
--- a/src/or/router.h
+++ b/src/or/router.h
@@ -48,6 +48,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);