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

Rename get_supported_protocols to protover_get_supported_protocols

Browse Source
This commit is contained in:
Nick Mathewson 2016-09-12 14:18:43 -04:00
parent 3a3120819c
commit afe0419db7
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/protover.c
View File

@ -260,7 +260,7 @@ protocol_list_supports_protocol(const char *list, protocol_type_t tp,
/** Return the canonical string containing the list of protocols /** Return the canonical string containing the list of protocols
* that we support. */ * that we support. */
const char * const char *
get_supported_protocols(void) protover_get_supported_protocols(void)
{ {
return return
"Cons=1-2 " "Cons=1-2 "
@ -274,8 +274,9 @@ get_supported_protocols(void)
"Relay=1-2"; "Relay=1-2";
} }
/** The protocols from get_supported_protocols(), as parsed into a list of /** The protocols from protover_get_supported_protocols(), as parsed into a
* proto_entry_t values. Access this via get_supported_protocol_list. */ * list of proto_entry_t values. Access this via
* get_supported_protocol_list. */
static smartlist_t *supported_protocol_list = NULL; static smartlist_t *supported_protocol_list = NULL;
/** Return a pointer to a smartlist of proto_entry_t for the protocols /** Return a pointer to a smartlist of proto_entry_t for the protocols
@ -284,7 +285,8 @@ static const smartlist_t *
get_supported_protocol_list(void) get_supported_protocol_list(void)
{ {
if (PREDICT_UNLIKELY(supported_protocol_list == NULL)) { if (PREDICT_UNLIKELY(supported_protocol_list == NULL)) {
supported_protocol_list = parse_protocol_list(get_supported_protocols()); supported_protocol_list =
parse_protocol_list(protover_get_supported_protocols());
} }
return supported_protocol_list; return supported_protocol_list;
} }

2
src/or/protover.h
View File

@ -25,7 +25,7 @@ typedef enum protocol_type_t {
int protover_all_supported(const char *s, char **missing); int protover_all_supported(const char *s, char **missing);
int protover_is_supported_here(protocol_type_t pr, uint32_t ver); int protover_is_supported_here(protocol_type_t pr, uint32_t ver);
const char *get_supported_protocols(void); const char *protover_get_supported_protocols(void);
char *protover_compute_vote(const smartlist_t *list_of_proto_strings, char *protover_compute_vote(const smartlist_t *list_of_proto_strings,
int threshold); int threshold);

2
src/or/router.c
View File

@ -2125,7 +2125,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e)
get_platform_str(platform, sizeof(platform)); get_platform_str(platform, sizeof(platform));
ri->platform = tor_strdup(platform); ri->platform = tor_strdup(platform);
ri->protocol_list = tor_strdup(get_supported_protocols()); ri->protocol_list = tor_strdup(protover_get_supported_protocols());
/* compute ri->bandwidthrate as the min of various options */ /* compute ri->bandwidthrate as the min of various options */
ri->bandwidthrate = get_effective_bwrate(options); ri->bandwidthrate = get_effective_bwrate(options);