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

Remove a little duplicated code before it becomes a lot

Browse Source
This commit is contained in:
Nick Mathewson 2016-08-25 11:30:32 -04:00
parent c6a2204e23
commit 07a9b79520
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/or/dirvote.c
View File

@ -61,6 +61,20 @@ static int dirvote_publish_consensus(void);
* Voting * Voting
* =====*/ * =====*/
/* If <b>opt_value</b> is non-NULL, return "keyword opt_value\n" in a new
* string. Otherwise return a new empty string. */
static char *
format_line_if_present(const char *keyword, const char *opt_value)
{
if (opt_value) {
char *result = NULL;
tor_asprintf(&result, "%s %s\n", keyword, opt_value);
return result;
} else {
return tor_strdup("");
}
}
/** Return a new string containing the string representation of the vote in /** Return a new string containing the string representation of the vote in
* <b>v3_ns</b>, signed with our v3 signing key <b>private_signing_key</b>. * <b>v3_ns</b>, signed with our v3 signing key <b>private_signing_key</b>.
* For v3 authorities. */ * For v3 authorities. */
@ -69,7 +83,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
networkstatus_t *v3_ns) networkstatus_t *v3_ns)
{ {
smartlist_t *chunks = smartlist_new(); smartlist_t *chunks = smartlist_new();
const char *client_versions = NULL, *server_versions = NULL;
char *packages = NULL; char *packages = NULL;
char fingerprint[FINGERPRINT_LEN+1]; char fingerprint[FINGERPRINT_LEN+1];
char digest[DIGEST_LEN]; char digest[DIGEST_LEN];
@ -88,21 +101,11 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
base16_encode(fingerprint, sizeof(fingerprint), base16_encode(fingerprint, sizeof(fingerprint),
v3_ns->cert->cache_info.identity_digest, DIGEST_LEN); v3_ns->cert->cache_info.identity_digest, DIGEST_LEN);
client_versions = v3_ns->client_versions;
server_versions = v3_ns->server_versions;
if (client_versions) { client_versions_line = format_line_if_present("client-versions",
tor_asprintf(&client_versions_line, "client-versions %s\n", v3_ns->client_versions);
client_versions); server_versions_line = format_line_if_present("server-versions",
} else { v3_ns->server_versions);
client_versions_line = tor_strdup("");
}
if (server_versions) {
tor_asprintf(&server_versions_line, "server-versions %s\n",
server_versions);
} else {
server_versions_line = tor_strdup("");
}
if (v3_ns->package_lines) { if (v3_ns->package_lines) {
smartlist_t *tmp = smartlist_new(); smartlist_t *tmp = smartlist_new();