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

[nickm at torproject.org]

commit f661d856fd83cb978320bf55ba5dfdee55a666b8
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jul 12 09:21:52 2018 -0400

    hs: Remove rend_client_allow_non_anonymous_connection
    
    By removing Tor2Web, there is no way a client can be non anonymous so we
    remove that function and the callsites.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/core/or/circuituse.c      |  5 -----
 src/feature/rend/rendclient.c | 14 --------------
 src/feature/rend/rendclient.h |  1 -
 src/feature/rend/rendcommon.c |  9 ++-------
 4 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
index a10791f3a..0f2b1ede3 100644
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -888,11 +888,6 @@ circuit_log_ancient_one_hop_circuits(int age)
         (circ->purpose == CIRCUIT_PURPOSE_S_INTRO ||
          circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED))
       continue;
-     /* We only ignore active rend point connections, if we take a long time
-      * to rendezvous, that's worth logging. */
-    if (rend_client_allow_non_anonymous_connection(options) &&
-        circ->purpose == CIRCUIT_PURPOSE_C_REND_JOINED)
-      continue;
     ocirc = CONST_TO_ORIGIN_CIRCUIT(circ);
 
     if (ocirc->build_state && ocirc->build_state->onehop_tunnel) {
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 0b7d602d9..485ffa8be 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -1219,20 +1219,6 @@ rend_parse_service_authorization(const or_options_t *options,
   return res;
 }
 
-/* Can Tor client code make direct (non-anonymous) connections to introduction
- * or rendezvous points?
- * Returns true if tor was compiled with NON_ANONYMOUS_MODE_ENABLED. */
-int
-rend_client_allow_non_anonymous_connection(const or_options_t *options)
-{
-#ifdef NON_ANONYMOUS_MODE_ENABLED
-  return 1;
-#else
-  (void)options;
-  return 0;
-#endif /* defined(NON_ANONYMOUS_MODE_ENABLED) */
-}
-
 /* At compile-time, was non-anonymous mode enabled via
  * NON_ANONYMOUS_MODE_ENABLED ? */
 int
diff --git a/src/feature/rend/rendclient.h b/src/feature/rend/rendclient.h
index e41faa493..2e7d7aeca 100644
--- a/src/feature/rend/rendclient.h
+++ b/src/feature/rend/rendclient.h
@@ -47,7 +47,6 @@ rend_service_authorization_t *rend_client_lookup_service_authorization(
                                                 const char *onion_address);
 void rend_service_authorization_free_all(void);
 
-int rend_client_allow_non_anonymous_connection(const or_options_t *options);
 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 567cc5c1e..6e19d56b3 100644
--- a/src/feature/rend/rendcommon.c
+++ b/src/feature/rend/rendcommon.c
@@ -979,16 +979,11 @@ rend_auth_decode_cookie(const char *cookie_in, uint8_t *cookie_out,
 
 /* Is this a rend client or server that allows direct (non-anonymous)
  * connections?
- * Clients must be specifically compiled and configured in this mode.
- * Onion services can be configured to start in this mode.
- * Prefer rend_client_allow_non_anonymous_connection() or
- * rend_service_allow_non_anonymous_connection() 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_allow_non_anonymous_connection(const or_options_t* options)
 {
-  return (rend_client_allow_non_anonymous_connection(options)
-          || rend_service_allow_non_anonymous_connection(options));
+  return rend_service_allow_non_anonymous_connection(options);
 }
 
 /* Is this a rend client or server in non-anonymous mode?