aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-09-15 04:40:08 -0400
committerRoger Dingledine <arma@torproject.org>2009-09-15 04:40:08 -0400
commit40bcab1faf26dd26de48b5ea6c1846c562a11f9d (patch)
treebf9efa03125ade36b479340b7dc4648219838fdf /src/or/dirserv.c
parent56c6d78520a98fb643e67b80b9192a2875f95e29 (diff)
downloadtor-40bcab1faf26dd26de48b5ea6c1846c562a11f9d.tar.gz
tor-40bcab1faf26dd26de48b5ea6c1846c562a11f9d.zip
ConsensusParams config option lists key=value params
finishes the authority-operator interface side of proposal 167.
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index c4a339738e..6a88286b10 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2553,6 +2553,13 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key,
}
smartlist_sort_strings(v3_out->known_flags);
+ if (options->ConsensusParams) {
+ v3_out->net_params = smartlist_create();
+ smartlist_split_string(v3_out->net_params,
+ options->ConsensusParams, NULL, 0, 0);
+ smartlist_sort_strings(v3_out->net_params);
+ }
+
voter = tor_malloc_zero(sizeof(networkstatus_voter_info_t));
voter->nickname = tor_strdup(options->Nickname);
memcpy(voter->identity_digest, identity_digest, DIGEST_LEN);