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

Merge remote-tracking branch 'public/bug3311'

Browse Source
This commit is contained in:
Nick Mathewson 2012-06-18 12:07:39 -04:00
commit e6782b355a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug3311 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Replace "Sending publish request" log messages with "Launching
upload", so that they no longer confusingly imply that we're
sending somtheing to a directory we might not even be connected
to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha.

6
src/or/rendservice.c
View File

@ -1918,7 +1918,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
continue; continue;
node = node_get_by_id(hs_dir->identity_digest); node = node_get_by_id(hs_dir->identity_digest);
if (!node || !node_has_descriptor(node)) { if (!node || !node_has_descriptor(node)) {
log_info(LD_REND, "Not sending publish request for v2 descriptor to " log_info(LD_REND, "Not launching upload for for v2 descriptor to "
"hidden service directory %s; we don't have its " "hidden service directory %s; we don't have its "
"router descriptor. Queuing for later upload.", "router descriptor. Queuing for later upload.",
safe_str_client(routerstatus_describe(hs_dir))); safe_str_client(routerstatus_describe(hs_dir)));
@ -1934,7 +1934,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
base32_encode(desc_id_base32, sizeof(desc_id_base32), base32_encode(desc_id_base32, sizeof(desc_id_base32),
desc->desc_id, DIGEST_LEN); desc->desc_id, DIGEST_LEN);
hs_dir_ip = tor_dup_ip(hs_dir->addr); hs_dir_ip = tor_dup_ip(hs_dir->addr);
log_info(LD_REND, "Sending publish request for v2 descriptor for " log_info(LD_REND, "Launching upload for v2 descriptor for "
"service '%s' with descriptor ID '%s' with validity " "service '%s' with descriptor ID '%s' with validity "
"of %d seconds to hidden service directory '%s' on " "of %d seconds to hidden service directory '%s' on "
"%s:%d.", "%s:%d.",
@ -2032,7 +2032,7 @@ upload_service_descriptor(rend_service_t *service)
} }
/* Post the current descriptors to the hidden service directories. */ /* Post the current descriptors to the hidden service directories. */
rend_get_service_id(service->desc->pk, serviceid); rend_get_service_id(service->desc->pk, serviceid);
log_info(LD_REND, "Sending publish request for hidden service %s", log_info(LD_REND, "Launching upload for hidden service %s",
serviceid); serviceid);
directory_post_to_hs_dir(service->desc, descs, serviceid, directory_post_to_hs_dir(service->desc, descs, serviceid,
seconds_valid); seconds_valid);