aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-10-14 17:49:51 +0200
committerSebastian Hahn <sebastian@torproject.org>2010-10-14 17:49:51 +0200
commit4556f2e7c80274932019a239232235ce571c98f8 (patch)
tree28ce37b8f5646490ab73d663bf8f884ad185d3d5 /src/or/dirserv.c
parent376939c9acfe64b1722ef184fda0ef0235e14a7d (diff)
downloadtor-4556f2e7c80274932019a239232235ce571c98f8.tar.gz
tor-4556f2e7c80274932019a239232235ce571c98f8.zip
Rename router_get_by_digest()
We now call the function router_get_by_id_digest() to make clear that we're talking about the identity digest here, not descriptor digest.
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 4c0e049840..8ce23f7274 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -780,7 +780,7 @@ dirserv_add_extrainfo(extrainfo_t *ei, const char **msg)
tor_assert(msg);
*msg = NULL;
- ri = router_get_by_digest(ei->cache_info.identity_digest);
+ ri = router_get_by_id_digest(ei->cache_info.identity_digest);
if (!ri) {
*msg = "No corresponding router descriptor for extra-info descriptor";
extrainfo_free(ei);
@@ -2057,7 +2057,7 @@ routerstatus_format_entry(char *buf, size_t buf_len,
}
if (format != NS_V2) {
- const routerinfo_t* desc = router_get_by_digest(rs->identity_digest);
+ const routerinfo_t* desc = router_get_by_id_digest(rs->identity_digest);
uint32_t bw;
if (format != NS_CONTROL_PORT) {
@@ -3099,7 +3099,7 @@ dirserv_get_routerdescs(smartlist_t *descs_out, const char *key,
if (ri)
smartlist_add(descs_out, (void*) &(ri->cache_info));
} else {
- const routerinfo_t *ri = router_get_by_digest(d);
+ const routerinfo_t *ri = router_get_by_id_digest(d);
/* Don't actually serve a descriptor that everyone will think is
* expired. This is an (ugly) workaround to keep buggy 0.1.1.10
* Tors from downloading descriptors that they will throw away.
@@ -3299,7 +3299,7 @@ get_signed_descriptor_by_fp(const char *fp, int extrainfo,
else
return &(router_get_my_routerinfo()->cache_info);
} else {
- const routerinfo_t *ri = router_get_by_digest(fp);
+ const routerinfo_t *ri = router_get_by_id_digest(fp);
if (ri &&
ri->cache_info.published_on > publish_cutoff) {
if (extrainfo)