nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

router: eliminate tiny router_build_fresh_descriptor() static functions

Browse Source 
Remove some tiny static functions called by router_build_fresh_descriptor(),
and move their code into more relevant functions.

Then, give router_update_{router,extra}info_descriptor_body identical layouts.

Preparation for testing 29017 and 20918.
This commit is contained in:
teor 2019-01-10 20:01:28 +10:00
parent a65c101973
commit af0a43be2c
1 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/feature/relay/router.c
View File

@ -2066,6 +2066,9 @@ router_build_fresh_routerinfo(routerinfo_t **ri_out)
ri->declared_family = get_my_declared_family(options); ri->declared_family = get_my_declared_family(options);
ri->purpose =
options->BridgeRelay ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL;
goto done; goto done;
err: err:
@ -2122,9 +2125,11 @@ router_update_extrainfo_descriptor_body(extrainfo_t *ei)
get_master_signing_keypair()) < 0) { get_master_signing_keypair()) < 0) {
log_warn(LD_BUG, "Couldn't generate extra-info descriptor."); log_warn(LD_BUG, "Couldn't generate extra-info descriptor.");
return -1; return -1;
} else { }
ei->cache_info.signed_descriptor_len = ei->cache_info.signed_descriptor_len =
strlen(ei->cache_info.signed_descriptor_body); strlen(ei->cache_info.signed_descriptor_body);
router_get_extrainfo_hash(ei->cache_info.signed_descriptor_body, router_get_extrainfo_hash(ei->cache_info.signed_descriptor_body,
ei->cache_info.signed_descriptor_len, ei->cache_info.signed_descriptor_len,
ei->cache_info.signed_descriptor_digest); ei->cache_info.signed_descriptor_digest);
@ -2132,8 +2137,8 @@ router_update_extrainfo_descriptor_body(extrainfo_t *ei)
ei->cache_info.signed_descriptor_body, ei->cache_info.signed_descriptor_body,
ei->cache_info.signed_descriptor_len, ei->cache_info.signed_descriptor_len,
DIGEST_SHA256); DIGEST_SHA256);
return 0; return 0;
}
} }
/** Set the fields in ri that depend on ei. /** Set the fields in ri that depend on ei.
@ -2184,20 +2189,13 @@ router_update_routerinfo_descriptor_body(routerinfo_t *ri)
ri->cache_info.signed_descriptor_len = ri->cache_info.signed_descriptor_len =
strlen(ri->cache_info.signed_descriptor_body); strlen(ri->cache_info.signed_descriptor_body);
router_get_router_hash(ri->cache_info.signed_descriptor_body,
strlen(ri->cache_info.signed_descriptor_body),
ri->cache_info.signed_descriptor_digest);
return 0; return 0;
} }
/** Set the purpose field in ri.
*/
static void
router_update_routerinfo_purpose(routerinfo_t *ri)
{
const or_options_t *options = get_options();
ri->purpose =
options->BridgeRelay ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL;
}
/** Set the cache_info.send_unencrypted fields in ri and ei. /** Set the cache_info.send_unencrypted fields in ri and ei.
*/ */
static void static void
@ -2220,16 +2218,6 @@ router_update_info_send_unencrypted(routerinfo_t *ri, extrainfo_t *ei)
} }
} }
/** Set signed_descriptor_digest in ri->cache_info.
*/
static void
router_update_routerinfo_digest(routerinfo_t *ri)
{
router_get_router_hash(ri->cache_info.signed_descriptor_body,
strlen(ri->cache_info.signed_descriptor_body),
ri->cache_info.signed_descriptor_digest);
}
/** Build a fresh routerinfo, signed server descriptor, and signed extra-info /** Build a fresh routerinfo, signed server descriptor, and signed extra-info
* document for this OR. * document for this OR.
* *
@ -2287,16 +2275,10 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e)
if (result < 0) if (result < 0)
goto err; goto err;
/* TODO: fold into router_build_fresh_routerinfo() */
router_update_routerinfo_purpose(ri);
/* TODO: fold into router_update_extrainfo_descriptor_body() and /* TODO: fold into router_update_extrainfo_descriptor_body() and
* router_update_routerinfo_descriptor_body() ? */ * router_update_routerinfo_descriptor_body() ? */
router_update_info_send_unencrypted(ri, ei); router_update_info_send_unencrypted(ri, ei);
/* TODO: fold into router_update_routerinfo_descriptor_body() */
router_update_routerinfo_digest(ri);
if (ei) { if (ei) {
if (BUG(routerinfo_incompatible_with_extrainfo(ri->identity_pkey, ei, if (BUG(routerinfo_incompatible_with_extrainfo(ri->identity_pkey, ei,
&ri->cache_info, NULL))) { &ri->cache_info, NULL))) {