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

prop224: When HUPing, move HS state from old to new service.

Browse Source 
We used to not copy the state which means that after HUP we would forget
if we are in overlap mode or not. That caused bugs where the service
would enter overlap mode twice, and rotate its descs twice, causing all
sorts of bugs.
This commit is contained in:
George Kadianakis 2017-08-25 17:09:17 +03:00
parent 409ecbec52
commit ea5af8f442
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/or/hs_service.c
View File

@ -750,6 +750,26 @@ service_escaped_dir(const hs_service_t *s)
escaped(s->config.directory_path); escaped(s->config.directory_path);
} }
/** Move the hidden service state from <b>src</b> to <b>dst</b>. We do this
* when we receive a SIGHUP: <b>dst</b> is the post-HUP service */
static void
move_hs_state(hs_service_t *src_service, hs_service_t *dst_service)
{
tor_assert(src_service);
tor_assert(dst_service);
hs_service_state_t *src = &src_service->state;
hs_service_state_t *dst = &dst_service->state;
/* Let's do a shallow copy */
dst->intro_circ_retry_started_time = src->intro_circ_retry_started_time;
dst->num_intro_circ_launched = src->num_intro_circ_launched;
dst->in_overlap_period = src->in_overlap_period;
dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie;
src->replay_cache_rend_cookie = NULL; /* steal pointer reference */
}
/* Register services that are in the staging list. Once this function returns, /* Register services that are in the staging list. Once this function returns,
* the global service map will be set with the right content and all non * the global service map will be set with the right content and all non
* surviving services will be cleaned up. */ * surviving services will be cleaned up. */
@ -785,6 +805,7 @@ register_all_services(void)
/* Pass ownership of the descriptors from s (the current service) to /* Pass ownership of the descriptors from s (the current service) to
* snew (the newly configured one). */ * snew (the newly configured one). */
move_descriptors(s, snew); move_descriptors(s, snew);
move_hs_state(s, snew);
/* Remove the service from the global map because after this, we need to /* Remove the service from the global map because after this, we need to
* go over the remaining service in that map that aren't surviving the * go over the remaining service in that map that aren't surviving the
* reload to close their circuits. */ * reload to close their circuits. */