From ac311a38ec62e17868b484b8ace069d171c7506d Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 13 Oct 2020 14:00:22 -0400 Subject: [PATCH 1/3] Make "usecreatefast" always-off. Part of #40139, where I'm removing network parameters that we shouldn't be looking at any longer. --- src/core/or/circuitbuild.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index ab4ce9f784..3df0f9be8f 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -770,27 +770,15 @@ circuit_deliver_create_cell,(circuit_t *circ, return -1; } -/** Return true iff we should send a create_fast cell to start building a given - * circuit */ -static inline int +/** Return true iff we should send a create_fast cell to start building a + * given circuit */ +static inline bool should_use_create_fast_for_circuit(origin_circuit_t *circ) { - const or_options_t *options = get_options(); tor_assert(circ->cpath); tor_assert(circ->cpath->extend_info); - if (!circuit_has_usable_onion_key(circ)) { - /* We don't have ntor, and we don't have or can't use TAP, - * so our hand is forced: only a create_fast will work. */ - return 1; - } - if (public_server_mode(options)) { - /* We're a server, and we have a usable onion key. We can choose. - * Prefer to blend our circuit into the other circuits we are - * creating on behalf of others. */ - return 0; - } - return networkstatus_get_param(NULL, "usecreatefast", 0, 0, 1); + return ! circuit_has_usable_onion_key(circ); } /** From 42a5e652cb9dc9818abd63d93fd51e908f2c56a4 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 13 Oct 2020 14:37:40 -0400 Subject: [PATCH 2/3] Make OptimisticData always-on. We've been using it for years, and it seems to work just fine. This patch removes the option and its network parameter. Part of #40139 --- doc/man/tor.1.txt | 9 ------- src/app/config/config.c | 2 +- src/app/config/or_options_st.h | 4 --- src/core/or/circuituse.c | 25 +++---------------- src/test/conf_examples/large_1/expected | 1 - .../conf_examples/large_1/expected_no_dirauth | 1 - 6 files changed, 5 insertions(+), 37 deletions(-) diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index cd53d5ea26..0e54fe9e0f 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -1314,15 +1314,6 @@ The following options are useful only for clients (that is, if Every NUM seconds consider whether to build a new circuit. (Default: 30 seconds) -[[OptimisticData]] **OptimisticData** **0**|**1**|**auto**:: - When this option is set, and Tor is using an exit node that supports - the feature, it will try optimistically to send data to the exit node - without waiting for the exit node to report whether the connection - succeeded. This can save a round-trip time for protocols like HTTP - where the client talks first. If OptimisticData is set to **auto**, - Tor will look at the UseOptimisticData parameter in the networkstatus. - (Default: auto) - // These are out of order because they logically belong together [[PathBiasCircThreshold]] **PathBiasCircThreshold** __NUM__ + diff --git a/src/app/config/config.c b/src/app/config/config.c index 0706a0dbdc..9625ed77fb 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -610,7 +610,7 @@ static const config_var_t option_vars_[] = { V(TestingAuthKeySlop, INTERVAL, "3 hours"), V(TestingSigningKeySlop, INTERVAL, "1 day"), - V(OptimisticData, AUTOBOOL, "auto"), + OBSOLETE("OptimisticData"), OBSOLETE("PortForwarding"), OBSOLETE("PortForwardingHelper"), OBSOLETE("PreferTunneledDirConns"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 7f201b8dd7..6a5d408c54 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -869,10 +869,6 @@ struct or_options_t { * once. */ int MaxClientCircuitsPending; - /** If 1, we always send optimistic data when it's supported. If 0, we - * never use it. If -1, we do what the consensus says. */ - int OptimisticData; - /** If 1, we accept and launch no external network connections, except on * control ports. */ int DisableNetwork; diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index df23c63cff..9b506e67a1 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2632,22 +2632,6 @@ cpath_is_on_circuit(origin_circuit_t *circ, crypt_path_t *crypt_path) return 0; } -/** Return true iff client-side optimistic data is supported. */ -static int -optimistic_data_enabled(void) -{ - const or_options_t *options = get_options(); - if (options->OptimisticData < 0) { - /* Note: this default was 0 before #18815 was merged. We can't take the - * parameter out of the consensus until versions before that are all - * obsolete. */ - const int32_t enabled = - networkstatus_get_param(NULL, "UseOptimisticData", /*default*/ 1, 0, 1); - return (int)enabled; - } - return options->OptimisticData; -} - /** Attach the AP stream apconn to circ's linked list of * p_streams. Also set apconn's cpath_layer to cpath, or to the last * hop in circ's cpath if cpath is NULL. @@ -2700,11 +2684,10 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, exitnode = node_get_by_id(cpath->extend_info->identity_digest); /* See if we can use optimistic data on this circuit */ - if (optimistic_data_enabled() && - (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL || - circ->base_.purpose == CIRCUIT_PURPOSE_C_HSDIR_GET || - circ->base_.purpose == CIRCUIT_PURPOSE_S_HSDIR_POST || - circ->base_.purpose == CIRCUIT_PURPOSE_C_REND_JOINED)) + if (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL || + circ->base_.purpose == CIRCUIT_PURPOSE_C_HSDIR_GET || + circ->base_.purpose == CIRCUIT_PURPOSE_S_HSDIR_POST || + circ->base_.purpose == CIRCUIT_PURPOSE_C_REND_JOINED) apconn->may_use_optimistic_data = 1; else apconn->may_use_optimistic_data = 0; diff --git a/src/test/conf_examples/large_1/expected b/src/test/conf_examples/large_1/expected index 99a12ffc84..7197993350 100644 --- a/src/test/conf_examples/large_1/expected +++ b/src/test/conf_examples/large_1/expected @@ -111,7 +111,6 @@ NumDirectoryGuards 4 NumEntryGuards 5 NumPrimaryGuards 8 OfflineMasterKey 1 -OptimisticData 1 ORPort 2222 OutboundBindAddress 10.0.0.7 OutboundBindAddressExit 10.0.0.8 diff --git a/src/test/conf_examples/large_1/expected_no_dirauth b/src/test/conf_examples/large_1/expected_no_dirauth index 26a33bdc7c..15919dae1b 100644 --- a/src/test/conf_examples/large_1/expected_no_dirauth +++ b/src/test/conf_examples/large_1/expected_no_dirauth @@ -110,7 +110,6 @@ NumDirectoryGuards 4 NumEntryGuards 5 NumPrimaryGuards 8 OfflineMasterKey 1 -OptimisticData 1 ORPort 2222 OutboundBindAddress 10.0.0.7 OutboundBindAddressExit 10.0.0.8 From a251cff0c3c9cb04422c1d93ad6ea2e804b50a1e Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 13 Oct 2020 14:42:59 -0400 Subject: [PATCH 3/3] Add changes file for 40139 (removing usecreatefast and useoptimisticdata --- changes/ticket40139 | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changes/ticket40139 diff --git a/changes/ticket40139 b/changes/ticket40139 new file mode 100644 index 0000000000..fce29233ef --- /dev/null +++ b/changes/ticket40139 @@ -0,0 +1,7 @@ + o Removed features (network parameters): + - The "optimistic data" feature is now always on; there is no longer an + option to disable it from the torrc file or from the consensus + directory. + Closes part of 40139. + - The "usecreatefast" network parameter is now removed; there is no + longer an option for authorities to turn it off. Closes part of 40139.