diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-06-05 10:08:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-06-05 10:08:27 -0400 |
| commit | 1fb9be53969011a10c453a36099583f631dc8a09 (patch) | |
| tree | f1eddd4171602f5b1701f36f22c38da469c645d2 /src/feature/rend/rendservice.c | |
| parent | b335ef178156e2a6825c48a04222384869c08c5f (diff) | |
| parent | 3e4814edeb563535b0f3bf658c01d7c10d6b4aa2 (diff) | |
| download | tor-1fb9be53969011a10c453a36099583f631dc8a09.tar.gz tor-1fb9be53969011a10c453a36099583f631dc8a09.zip | |
Merge remote-tracking branch 'tor-github/pr/1902/head'
Diffstat (limited to 'src/feature/rend/rendservice.c')
| -rw-r--r-- | src/feature/rend/rendservice.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 9d7ff2d17f..a88c2080fd 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -3715,20 +3715,23 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, base32_encode(desc_id_base32, sizeof(desc_id_base32), desc->desc_id, DIGEST_LEN); hs_dir_ip = tor_dup_ip(hs_dir->addr); - log_info(LD_REND, "Launching upload for v2 descriptor for " - "service '%s' with descriptor ID '%s' with validity " - "of %d seconds to hidden service directory '%s' on " - "%s:%d.", - safe_str_client(service_id), - safe_str_client(desc_id_base32), - seconds_valid, - hs_dir->nickname, - hs_dir_ip, - hs_dir->or_port); + if (hs_dir_ip) { + log_info(LD_REND, "Launching upload for v2 descriptor for " + "service '%s' with descriptor ID '%s' with validity " + "of %d seconds to hidden service directory '%s' on " + "%s:%d.", + safe_str_client(service_id), + safe_str_client(desc_id_base32), + seconds_valid, + hs_dir->nickname, + hs_dir_ip, + hs_dir->or_port); + tor_free(hs_dir_ip); + } + control_event_hs_descriptor_upload(service_id, hs_dir->identity_digest, desc_id_base32, NULL); - tor_free(hs_dir_ip); /* Remember successful upload to this router for next time. */ if (!smartlist_contains_digest(successful_uploads, hs_dir->identity_digest)) |