summaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-10 16:38:04 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-08 16:48:00 -0500
commit3b1e04fe4505ccbd7d93061dccb5673523519c64 (patch)
treec5e7e5c1ef0dfbc07f248a771cb0038b5a7a1d20 /src/or/connection_or.c
parent5ada24957954163f68e77b300925d445ccbe7e55 (diff)
downloadtor-3b1e04fe4505ccbd7d93061dccb5673523519c64.tar.gz
tor-3b1e04fe4505ccbd7d93061dccb5673523519c64.zip
Teach channel_rsa_id_group_set_badness_() about Ed25519
(Only run the connection_or_group_set_badness_() function on groups of channels that have the same RSA and Ed25519 identities.) There's a possible opportunity here where we might want to set a channel to "bad" if it has no ed25519 identity and some other channel has some. Also there's an opportunity to add a warning if we ever have an Ed mismatch on open connections with the same RSA ID.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 2889bb7a4d..953e9df251 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -966,9 +966,9 @@ connection_or_mark_bad_for_new_circs(or_connection_t *or_conn)
void
connection_or_group_set_badness_(smartlist_t *group, int force)
{
- /* XXXX this should be entirely about channels, not OR connections. 15056*/
- /* XXXX Look at Ed25519 ids too! 15056 */
-
+ /* XXXX this function should be entirely about channels, not OR
+ * XXXX connections. */
+
or_connection_t *best = NULL;
int n_old = 0, n_inprogress = 0, n_canonical = 0, n_other = 0;
time_t now = time(NULL);