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

Extract code to summarize protocol versions into new function

Browse Source 
This will let us put this summary into routerinfo_t too.

No behavior change.
This commit is contained in:
Nick Mathewson 2018-01-24 13:38:01 -05:00
parent d9fbd34f42
commit 7792be2d44
1 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/or/routerparse.c
View File

@ -2530,6 +2530,50 @@ routerstatus_parse_guardfraction(const char *guardfraction_str,
return 0; return 0;
} }
/** Summarize the protocols listed in <b>protocols</b> into <b>out</b>,
* falling back or correcting them based on <b>version</b> as appropriate.
*/
static void
summarize_protover_flags(protover_summary_flags_t *out,
const char *protocols,
const char *version)
{
tor_assert(out);
memset(out, 0, sizeof(*out));
if (protocols) {
out->protocols_known = 1;
out->supports_extend2_cells =
protocol_list_supports_protocol(protocols, PRT_RELAY, 2);
out->supports_ed25519_link_handshake_compat =
protocol_list_supports_protocol(protocols, PRT_LINKAUTH, 3);
out->supports_ed25519_link_handshake_any =
protocol_list_supports_protocol_or_later(protocols, PRT_LINKAUTH, 3);
out->supports_ed25519_hs_intro =
protocol_list_supports_protocol(protocols, PRT_HSINTRO, 4);
out->supports_v3_hsdir =
protocol_list_supports_protocol(protocols, PRT_HSDIR,
PROTOVER_HSDIR_V3);
out->supports_v3_rendezvous_point =
protocol_list_supports_protocol(protocols, PRT_HSDIR,
PROTOVER_HS_RENDEZVOUS_POINT_V3);
}
if (version && !strcmpstart(version, "Tor ")) {
if (!out->protocols_known) {
/* The version is a "Tor" version, and where there is no
* list of protocol versions that we should be looking at instead. */
out->supports_extend2_cells =
tor_version_as_new_as(version, "0.2.4.8-alpha");
out->protocols_known = 1;
} else {
/* Bug #22447 forces us to filter on this version. */
if (!tor_version_as_new_as(version, "0.3.0.8")) {
out->supports_v3_hsdir = 0;
}
}
}
}
/** Given a string at *<b>s</b>, containing a routerstatus object, and an /** Given a string at *<b>s</b>, containing a routerstatus object, and an
* empty smartlist at <b>tokens</b>, parse and return the first router status * empty smartlist at <b>tokens</b>, parse and return the first router status
* object in the string, and advance *<b>s</b> to just after the end of the * object in the string, and advance *<b>s</b> to just after the end of the
@ -2695,46 +2739,23 @@ routerstatus_parse_entry_from_string(memarea_t *area,
if (consensus_method >= MIN_METHOD_FOR_EXCLUDING_INVALID_NODES) if (consensus_method >= MIN_METHOD_FOR_EXCLUDING_INVALID_NODES)
rs->is_valid = 1; rs->is_valid = 1;
} }
int found_protocol_list = 0; {
const char *protocols = NULL, *version = NULL;
if ((tok = find_opt_by_keyword(tokens, K_PROTO))) { if ((tok = find_opt_by_keyword(tokens, K_PROTO))) {
found_protocol_list = 1; tor_assert(tok->n_args == 1);
rs->pv.protocols_known = 1; protocols = tok->args[0];
rs->pv.supports_extend2_cells =
protocol_list_supports_protocol(tok->args[0], PRT_RELAY, 2);
rs->pv.supports_ed25519_link_handshake_compat =
protocol_list_supports_protocol(tok->args[0], PRT_LINKAUTH, 3);
rs->pv.supports_ed25519_link_handshake_any =
protocol_list_supports_protocol_or_later(tok->args[0], PRT_LINKAUTH, 3);
rs->pv.supports_ed25519_hs_intro =
protocol_list_supports_protocol(tok->args[0], PRT_HSINTRO, 4);
rs->pv.supports_v3_hsdir =
protocol_list_supports_protocol(tok->args[0], PRT_HSDIR,
PROTOVER_HSDIR_V3);
rs->pv.supports_v3_rendezvous_point =
protocol_list_supports_protocol(tok->args[0], PRT_HSDIR,
PROTOVER_HS_RENDEZVOUS_POINT_V3);
} }
if ((tok = find_opt_by_keyword(tokens, K_V))) { if ((tok = find_opt_by_keyword(tokens, K_V))) {
tor_assert(tok->n_args == 1); tor_assert(tok->n_args == 1);
if (!strcmpstart(tok->args[0], "Tor ") && !found_protocol_list) { version = tok->args[0];
/* We only do version checks like this in the case where
* the version is a "Tor" version, and where there is no
* list of protocol versions that we should be looking at instead. */
rs->pv.supports_extend2_cells =
tor_version_as_new_as(tok->args[0], "0.2.4.8-alpha");
rs->pv.protocols_known = 1;
}
if (!strcmpstart(tok->args[0], "Tor ") && found_protocol_list) {
/* Bug #22447 forces us to filter on this version. */
if (!tor_version_as_new_as(tok->args[0], "0.3.0.8")) {
rs->pv.supports_v3_hsdir = 0;
}
}
if (vote_rs) { if (vote_rs) {
vote_rs->version = tor_strdup(tok->args[0]); vote_rs->version = tor_strdup(tok->args[0]);
} }
} }
summarize_protover_flags(&rs->pv, protocols, version);
}
/* handle weighting/bandwidth info */ /* handle weighting/bandwidth info */
if ((tok = find_opt_by_keyword(tokens, K_W))) { if ((tok = find_opt_by_keyword(tokens, K_W))) {
int i; int i;