nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

hs: Remove rend_client_non_anonymous_mode_enabled

Browse Source 
The removal of Tor2Web made this function useless.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2018-07-12 09:23:57 -04:00 committed by Nick Mathewson
parent f661d856fd
commit 8f13c3d3ed
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/feature/rend/rendclient.c
View File

@ -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) */
}

2
src/feature/rend/rendclient.h
View File

@ -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) */

9
src/feature/rend/rendcommon.c
View File

@ -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