[tor-commits] [tor/master] hs: Remove rend_client_non_anonymous_mode_enabled

[nickm at torproject.org]

commit 8f13c3d3ed842d8db13bcf9ca6393dbe8e5781e3
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jul 12 09:23:57 2018 -0400

    hs: Remove rend_client_non_anonymous_mode_enabled
    
    The removal of Tor2Web made this function useless.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/feature/rend/rendclient.c | 13 -------------
 src/feature/rend/rendclient.h |  2 --
 src/feature/rend/rendcommon.c |  9 ++-------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 485ffa8be..2c4cec65b 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -1218,16 +1218,3 @@ rend_parse_service_authorization(const or_options_t *options,
   }
   return res;
 }
-
-/* At compile-time, was non-anonymous mode enabled via
- * NON_ANONYMOUS_MODE_ENABLED ? */
-int
-rend_client_non_anonymous_mode_enabled(const or_options_t *options)
-{
-  (void)options;
-#ifdef NON_ANONYMOUS_MODE_ENABLED
-  return 1;
-#else
-  return 0;
-#endif /* defined(NON_ANONYMOUS_MODE_ENABLED) */
-}
diff --git a/src/feature/rend/rendclient.h b/src/feature/rend/rendclient.h
index 2e7d7aeca..0d27d63e6 100644
--- a/src/feature/rend/rendclient.h
+++ b/src/feature/rend/rendclient.h
@@ -47,7 +47,5 @@ rend_service_authorization_t *rend_client_lookup_service_authorization(
                                                 const char *onion_address);
 void rend_service_authorization_free_all(void);
 
-int rend_client_non_anonymous_mode_enabled(const or_options_t *options);
-
 #endif /* !defined(TOR_RENDCLIENT_H) */
 
diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c
index 6e19d56b3..8cb5fd91e 100644
--- a/src/feature/rend/rendcommon.c
+++ b/src/feature/rend/rendcommon.c
@@ -987,16 +987,11 @@ rend_allow_non_anonymous_connection(const or_options_t* options)
 }
 
 /* Is this a rend client or server in non-anonymous mode?
- * Clients must be specifically compiled in this mode.
- * Onion services can be configured to start in this mode.
- * Prefer rend_client_non_anonymous_mode_enabled() or
- * rend_service_non_anonymous_mode_enabled() whenever possible, so that checks
- * are specific to Single Onion Services. */
+ * Onion services can be configured to start in this mode for single onion. */
 int
 rend_non_anonymous_mode_enabled(const or_options_t *options)
 {
-  return (rend_client_non_anonymous_mode_enabled(options)
-          || rend_service_non_anonymous_mode_enabled(options));
+  return rend_service_non_anonymous_mode_enabled(options);
 }
 
 /* Make sure that tor only builds one-hop circuits when they would not