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

Simplify channel_rsa_id_group_set_badness, #24119

Browse Source
This commit is contained in:
Alex Xu (Hello71) 2017-11-04 22:23:40 -04:00 committed by Nick Mathewson
parent 2cda005ac4
commit f1e8e54964
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/or/channel.c
View File

@ -4726,6 +4726,16 @@ channel_set_circid_type,(channel_t *chan,
} }
} }
static int
channel_sort_by_ed25519_identity(const void **a_, const void **b_)
{
const channel_t *a = *a_,
*b = *b_;
return fast_memcmp(&a->ed25519_identity.pubkey,
&b->ed25519_identity.pubkey,
sizeof(a->ed25519_identity.pubkey));
}
/** Helper for channel_update_bad_for_new_circs(): Perform the /** Helper for channel_update_bad_for_new_circs(): Perform the
* channel_update_bad_for_new_circs operation on all channels in <b>lst</b>, * channel_update_bad_for_new_circs operation on all channels in <b>lst</b>,
* all of which MUST have the same RSA ID. (They MAY have different * all of which MUST have the same RSA ID. (They MAY have different
@ -4746,42 +4756,40 @@ channel_rsa_id_group_set_badness(struct channel_list_s *lst, int force)
return; return;
} }
/* First, get a minimal list of the ed25519 identites */ smartlist_t *channels = smartlist_new();
smartlist_t *ed_identities = smartlist_new();
TOR_LIST_FOREACH(chan, lst, next_with_same_id) {
uint8_t *id_copy =
tor_memdup(&chan->ed25519_identity.pubkey, DIGEST256_LEN);
smartlist_add(ed_identities, id_copy);
}
smartlist_sort_digests256(ed_identities);
smartlist_uniq_digests256(ed_identities);
/* Now, for each Ed identity, build a smartlist and find the best entry on TOR_LIST_FOREACH(chan, lst, next_with_same_id) {
* it. */ if (BASE_CHAN_TO_TLS(chan)->conn) {
smartlist_add(channels, chan);
}
}
smartlist_sort(channels, channel_sort_by_ed25519_identity);
const ed25519_public_key_t *common_ed25519_identity = NULL;
/* it would be more efficient to do a slice, but this case is rare */
smartlist_t *or_conns = smartlist_new(); smartlist_t *or_conns = smartlist_new();
SMARTLIST_FOREACH_BEGIN(ed_identities, const uint8_t *, ed_id) { SMARTLIST_FOREACH_BEGIN(channels, channel_t *, channel) {
TOR_LIST_FOREACH(chan, lst, next_with_same_id) { if (!common_ed25519_identity)
channel_tls_t *chantls = BASE_CHAN_TO_TLS(chan); common_ed25519_identity = &channel->ed25519_identity;
if (tor_memneq(ed_id, &chan->ed25519_identity.pubkey, DIGEST256_LEN))
continue; if (! ed25519_pubkey_eq(&channel->ed25519_identity,
or_connection_t *orconn = chantls->conn; common_ed25519_identity)) {
if (orconn) { connection_or_group_set_badness_(or_conns, force);
tor_assert(orconn->chan == chantls); smartlist_clear(or_conns);
smartlist_add(or_conns, orconn); common_ed25519_identity = &channel->ed25519_identity;
}
} }
connection_or_group_set_badness_(or_conns, force); smartlist_add(or_conns, BASE_CHAN_TO_TLS(channel)->conn);
smartlist_clear(or_conns); } SMARTLIST_FOREACH_END(channel);
} SMARTLIST_FOREACH_END(ed_id);
connection_or_group_set_badness_(or_conns, force);
/* XXXX 15056 we may want to do something special with connections that have /* XXXX 15056 we may want to do something special with connections that have
* no set Ed25519 identity! */ * no set Ed25519 identity! */
smartlist_free(or_conns); smartlist_free(or_conns);
smartlist_free(channels);
SMARTLIST_FOREACH(ed_identities, uint8_t *, ed_id, tor_free(ed_id));
smartlist_free(ed_identities);
} }
/** Go through all the channels (or if <b>digest</b> is non-NULL, just /** Go through all the channels (or if <b>digest</b> is non-NULL, just