diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 12:53:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 12:53:12 -0400 |
| commit | 44da47d3c1e4809d5aaf91cd708c6f02b01a5396 (patch) | |
| tree | 615791b0f68396516f4b0e285539010d2cf074d3 /src/or/router.c | |
| parent | 4165b1a0da893a9f67a2ba32b4fcd54a7804ce14 (diff) | |
| download | tor-44da47d3c1e4809d5aaf91cd708c6f02b01a5396.tar.gz tor-44da47d3c1e4809d5aaf91cd708c6f02b01a5396.zip | |
Move extra_info_digest256 into signed_descriptor_t
This patch includes no semantic changes; it's just a field movement.
It's prerequisite for a fix to 19017/17150.
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c index 841f6fde1b..3943643f9b 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2028,7 +2028,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) memcpy(ri->cache_info.extra_info_digest, ei->cache_info.signed_descriptor_digest, DIGEST_LEN); - memcpy(ri->extra_info_digest256, + memcpy(ri->cache_info.extra_info_digest256, ei->digest256, DIGEST256_LEN); } else { @@ -2543,9 +2543,9 @@ router_dump_router_to_string(routerinfo_t *router, char extra_info_digest[HEX_DIGEST_LEN+1]; base16_encode(extra_info_digest, sizeof(extra_info_digest), router->cache_info.extra_info_digest, DIGEST_LEN); - if (!tor_digest256_is_zero(router->extra_info_digest256)) { + if (!tor_digest256_is_zero(router->cache_info.extra_info_digest256)) { char d256_64[BASE64_DIGEST256_LEN+1]; - digest256_to_base64(d256_64, router->extra_info_digest256); + digest256_to_base64(d256_64, router->cache_info.extra_info_digest256); tor_asprintf(&extra_info_line, "extra-info-digest %s %s\n", extra_info_digest, d256_64); } else { |