mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

start the cpuworkers always, even for clients

Browse source 
prepares the way for client-side pow cpuworkers

also happens to resolve bug https://bugs.torproject.org/tpo/core/tor/40617
(which went into 0.4.7.4-alpha) because now we survive initing the
cpuworker subsystem when we're not a relay.
This commit is contained in:
Roger Dingledine 2022-09-04 00:48:42 -04:00 • committed by Micah Elizabeth Scott
parent 0716cd7cb2
commit a5b0c7b404
5 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app/main/main.c
View file

@ -1237,10 +1237,10 @@ run_tor_main_loop(void)
const time_t now = time(NULL); const time_t now = time(NULL);
directory_info_has_arrived(now, 1, 0); directory_info_has_arrived(now, 1, 0);
if (server_mode(get_options()) || dir_server_mode(get_options())) {
/* launch cpuworkers. Need to do this *after* we've read the onion key. */ /* launch cpuworkers. Need to do this *after* we've read the onion key. */
cpu_init(); /* launch them always for all tors, now that clients can solve onion PoWs. */
} cpuworker_init();
consdiffmgr_enable_background_compression(); consdiffmgr_enable_background_compression();
/* Setup shared random protocol subsystem. */ /* Setup shared random protocol subsystem. */

3
src/core/crypto/onion_crypto.c
View file

@ -64,6 +64,9 @@ static const size_t NTOR3_CIRC_VERIFICATION_LEN = 14;
server_onion_keys_t * server_onion_keys_t *
server_onion_keys_new(void) server_onion_keys_new(void)
{ {
if (!get_master_identity_key())
return NULL;
server_onion_keys_t *keys = tor_malloc_zero(sizeof(server_onion_keys_t)); server_onion_keys_t *keys = tor_malloc_zero(sizeof(server_onion_keys_t));
memcpy(keys->my_identity, router_get_my_id_digest(), DIGEST_LEN); memcpy(keys->my_identity, router_get_my_id_digest(), DIGEST_LEN);
ed25519_pubkey_copy(&keys->my_ed_identity, get_master_identity_key()); ed25519_pubkey_copy(&keys->my_ed_identity, get_master_identity_key());

2
src/core/mainloop/cpuworker.c
View file

@ -117,7 +117,7 @@ cpuworker_consensus_has_changed(const networkstatus_t *ns)
* during Tor's lifetime. * during Tor's lifetime.
*/ */
void void
cpu_init(void) cpuworker_init(void)
{ {
if (!replyqueue) { if (!replyqueue) {
replyqueue = replyqueue_new(0); replyqueue = replyqueue_new(0);

4
src/core/mainloop/cpuworker.h
View file

@ -12,9 +12,7 @@
#ifndef TOR_CPUWORKER_H #ifndef TOR_CPUWORKER_H
#define TOR_CPUWORKER_H #define TOR_CPUWORKER_H
#include "feature/nodelist/networkstatus_st.h" void cpuworker_init(void);
void cpu_init(void);
void cpuworkers_rotate_keyinfo(void); void cpuworkers_rotate_keyinfo(void);
void cpuworker_consensus_has_changed(const networkstatus_t *ns); void cpuworker_consensus_has_changed(const networkstatus_t *ns);

6
src/feature/relay/relay_config.c
View file

@ -1327,12 +1327,6 @@ options_act_relay(const or_options_t *old_options)
"Worker-related options changed. Rotating workers."); "Worker-related options changed. Rotating workers.");
const int server_mode_turned_on = const int server_mode_turned_on =
server_mode(options) && !server_mode(old_options); server_mode(options) && !server_mode(old_options);
const int dir_server_mode_turned_on =
dir_server_mode(options) && !dir_server_mode(old_options);
if (server_mode_turned_on || dir_server_mode_turned_on) {
cpu_init();
}
if (server_mode_turned_on) { if (server_mode_turned_on) {
ip_address_changed(0); ip_address_changed(0);