diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-03 10:09:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-03 10:09:20 -0500 |
| commit | 6b3c07648ce5860f5ef0f4193eb812e971c02407 (patch) | |
| tree | 474aee860331c0c7515ac42188b0d4117c370265 /src/or/hs_service.c | |
| parent | b62b40a572d8693daa5851eee5f423007535b3b6 (diff) | |
| parent | 9ef97a268b06fed7b07908823600911a2a6eadc1 (diff) | |
| download | tor-6b3c07648ce5860f5ef0f4193eb812e971c02407.tar.gz tor-6b3c07648ce5860f5ef0f4193eb812e971c02407.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/hs_service.c')
| -rw-r--r-- | src/or/hs_service.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 80f3e50201..0db22991c2 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1191,9 +1191,9 @@ setup_desc_intro_point(const ed25519_keypair_t *signing_kp, /* Copy link specifier(s). */ SMARTLIST_FOREACH_BEGIN(ip->base.link_specifiers, const hs_desc_link_specifier_t *, ls) { - hs_desc_link_specifier_t *dup = tor_malloc_zero(sizeof(*dup)); - link_specifier_copy(dup, ls); - smartlist_add(desc_ip->link_specifiers, dup); + hs_desc_link_specifier_t *copy = tor_malloc_zero(sizeof(*copy)); + link_specifier_copy(copy, ls); + smartlist_add(desc_ip->link_specifiers, copy); } SMARTLIST_FOREACH_END(ls); /* For a legacy intro point, we'll use an RSA/ed cross certificate. */ @@ -2257,19 +2257,19 @@ upload_descriptor_to_hsdir(const hs_service_t *service, /* Logging so we know where it was sent. */ { int is_next_desc = (service->desc_next == desc); - const uint8_t *index = (is_next_desc) ? hsdir->hsdir_index->store_second: - hsdir->hsdir_index->store_first; + const uint8_t *idx = (is_next_desc) ? hsdir->hsdir_index->store_second: + hsdir->hsdir_index->store_first; log_info(LD_REND, "Service %s %s descriptor of revision %" PRIu64 " initiated upload request to %s with index %s", safe_str_client(service->onion_address), (is_next_desc) ? "next" : "current", desc->desc->plaintext_data.revision_counter, safe_str_client(node_describe(hsdir)), - safe_str_client(hex_str((const char *) index, 32))); + safe_str_client(hex_str((const char *) idx, 32))); /* Fire a UPLOAD control port event. */ hs_control_desc_event_upload(service->onion_address, hsdir->identity, - &desc->blinded_kp.pubkey, index); + &desc->blinded_kp.pubkey, idx); } end: |