mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 20:23:03 +02:00
Code

Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9

Browse Source
This commit is contained in:
teor 2019-04-19 11:38:52 +10:00
commit ec213ae8a0
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug23790 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (hidden service v2):
- When reloading tor (HUP) configured with hidden service(s), some
information weren't copy to the new service object. One problem with this
was that tor would wait at least the RendPostPeriod time before uploading
the descriptor if the reload happened before the descriptor needed to be
published. Fixes bug 23790; bugfix on 0.2.1.9-alpha.

27
src/or/rendservice.c
View File

@ -532,6 +532,30 @@ rend_service_check_dir_and_add(smartlist_t *service_list,
}
}
/* Copy relevant data from service src to dst while pruning the service lists.
* This should only be called during the pruning process which takes existing
* services and copy their data to the newly configured services. The src
* service replaycache will be set to NULL after this call. */
static void
copy_service_on_prunning(rend_service_t *dst, rend_service_t *src)
{
tor_assert(dst);
tor_assert(src);
/* Keep the timestamps for when the content changed and the next upload
* time so we can properly upload the descriptor if needed for the new
* service object. */
dst->desc_is_dirty = src->desc_is_dirty;
dst->next_upload_time = src->next_upload_time;
/* Move the replaycache to the new object. */
dst->accepted_intro_dh_parts = src->accepted_intro_dh_parts;
src->accepted_intro_dh_parts = NULL;
/* Copy intro point information to destination service. */
dst->intro_period_started = src->intro_period_started;
dst->n_intro_circuits_launched = src->n_intro_circuits_launched;
dst->n_intro_points_wanted = src->n_intro_points_wanted;
}
/** Set up rend_service_list, based on the values of HiddenServiceDir and
* HiddenServicePort in <b>options</b>. Return 0 on success and -1 on
* failure. (If <b>validate_only</b> is set, parse, warn and return as
@ -812,6 +836,9 @@ rend_config_services(const or_options_t *options, int validate_only)
smartlist_add_all(new->expiring_nodes, old->expiring_nodes);
smartlist_clear(old->expiring_nodes);
smartlist_add(surviving_services, old);
/* Copy service flags to the new service object. */
copy_service_on_prunning(new, old);
break;
}
} SMARTLIST_FOREACH_END(old);