torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug14219_025'

Browse Source
This commit is contained in:
Nick Mathewson
2015-01-18 15:41:13 -05:00
parent efdac2a68c 9407040c59
commit fae72a8d0a
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug14219
+6
View File
@@ -0,0 +1,6 @@
o Minor bugfixes (hidden services):
- When fetching a hidden service descriptor for a down service that we
recently up, do not keep refetching until we try the same replica twice
in a row. Fixes bug 14219; bugfix on 0.2.0.10-alpha.
src/or/rendcommon.c
+2 -9
View File
@@ -1251,19 +1251,12 @@ rend_cache_store_v2_desc_as_client(const char *desc,
/* Do we already have a newer descriptor? */
tor_snprintf(key, sizeof(key), "2%s", service_id);
e = (rend_cache_entry_t*) strmap_get_lc(rend_cache, key);
if (e && e->parsed->timestamp > parsed->timestamp) {
log_info(LD_REND, "We already have a newer service descriptor for "
if (e && e->parsed->timestamp >= parsed->timestamp) {
log_info(LD_REND, "We already have a new enough service descriptor for "
"service ID %s with the same desc ID and version.",
safe_str_client(service_id));
goto okay;
}
/* Do we already have this descriptor? */
if (e && !strcmp(desc, e->desc)) {
log_info(LD_REND,"We already have this service descriptor %s.",
safe_str_client(service_id));
e->received = time(NULL);
goto okay;
}
if (!e) {
e = tor_malloc_zero(sizeof(rend_cache_entry_t));
strmap_set_lc(rend_cache, key, e);