sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename compute_protover_vote to protover_compute_vote

This commit is contained in:
Nick Mathewson 2016-09-12 14:11:44 -04:00
parent 78c07eeee1
commit 3a3120819c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/dirvote.c
View File

@ -1256,7 +1256,7 @@ compute_nth_protocol_set(int n, int n_voters, const smartlist_t *votes)
smartlist_add(proto_votes, (void*)v);
} SMARTLIST_FOREACH_END(ns);
char *protocols = compute_protover_vote(proto_votes, threshold);
char *protocols = protover_compute_vote(proto_votes, threshold);
smartlist_free(proto_votes);
char *result = NULL;

2
src/or/protover.c
View File

@ -520,7 +520,7 @@ contract_protocol_list(const smartlist_t *proto_strings)
* contract_protocol_list above.
*/
char *
compute_protover_vote(const smartlist_t *list_of_proto_strings,
protover_compute_vote(const smartlist_t *list_of_proto_strings,
int threshold)
{
smartlist_t *all_entries = smartlist_new();

2
src/or/protover.h
View File

@ -27,7 +27,7 @@ int protover_all_supported(const char *s, char **missing);
int protover_is_supported_here(protocol_type_t pr, uint32_t ver);
const char *get_supported_protocols(void);
char *compute_protover_vote(const smartlist_t *list_of_proto_strings,
char *protover_compute_vote(const smartlist_t *list_of_proto_strings,
int threshold);
const char *protover_compute_for_old_tor(const char *version);
int protocol_list_supports_protocol(const char *list, protocol_type_t tp,

8
src/test/test_protover.c
View File

@ -120,22 +120,22 @@ test_protover_vote(void *arg)
(void) arg;
smartlist_t *lst = smartlist_new();
char *result = compute_protover_vote(lst, 1);
char *result = protover_compute_vote(lst, 1);
tt_str_op(result, OP_EQ, "");
tor_free(result);
smartlist_add(lst, (void*) "Foo=1-10,500 Bar=1,3-7,8");
result = compute_protover_vote(lst, 1);
result = protover_compute_vote(lst, 1);
tt_str_op(result, OP_EQ, "Bar=1,3-8 Foo=1-10,500");
tor_free(result);
smartlist_add(lst, (void*) "Quux=123-456,78 Bar=2-6,8 Foo=9");
result = compute_protover_vote(lst, 1);
result = protover_compute_vote(lst, 1);
tt_str_op(result, OP_EQ, "Bar=1-8 Foo=1-10,500 Quux=78,123-456");
tor_free(result);
result = compute_protover_vote(lst, 2);
result = protover_compute_vote(lst, 2);
tt_str_op(result, OP_EQ, "Bar=3-6,8 Foo=9");
tor_free(result);