aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-17 12:53:12 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-17 12:53:12 -0400
commit44da47d3c1e4809d5aaf91cd708c6f02b01a5396 (patch)
tree615791b0f68396516f4b0e285539010d2cf074d3 /src/or/routerlist.c
parent4165b1a0da893a9f67a2ba32b4fcd54a7804ce14 (diff)
downloadtor-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/routerlist.c')
-rw-r--r--src/or/routerlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 79a5bb3910..3d85d86f20 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4926,9 +4926,9 @@ routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri,
/* Set digest256_matches to 1 if the digest is correct, or if no
* digest256 was in the ri. */
digest256_matches = tor_memeq(ei->digest256,
- ri->extra_info_digest256, DIGEST256_LEN);
+ ri->cache_info.extra_info_digest256, DIGEST256_LEN);
digest256_matches |=
- tor_mem_is_zero(ri->extra_info_digest256, DIGEST256_LEN);
+ tor_mem_is_zero(ri->cache_info.extra_info_digest256, DIGEST256_LEN);
/* The identity must match exactly to have been generated at the same time
* by the same router. */