aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-18 20:06:48 -0400
committerNick Mathewson <nickm@torproject.org>2016-12-08 16:47:56 -0500
commitef5158b2d2f67a1d70e6194b0fde291f853d485e (patch)
tree62c77b66817ed2bd0b871760b8acce2d663ec90d /src/or/connection_or.c
parente054211237e88cace9f7d7ff403600c192df9a31 (diff)
downloadtor-ef5158b2d2f67a1d70e6194b0fde291f853d485e.tar.gz
tor-ef5158b2d2f67a1d70e6194b0fde291f853d485e.zip
When attempting to find a channel by ID, consider Ed ID.
Right now, there's only a mechanism to look for a channel where the RSA ID matches *and* the ED ID matches. We can add a separate map later if we want.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index eb67f0653f..e83dca2be4 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -149,7 +149,7 @@ connection_or_set_identity_digest(or_connection_t *conn,
const char *rsa_digest,
const ed25519_public_key_t *ed_id)
{
- (void) ed_id; // DOCDOC // XXXX not implemented yet.
+ (void) ed_id; // DOCDOC // XXXX not implemented yet. 15056
or_connection_t *tmp;
tor_assert(conn);
tor_assert(rsa_digest);
@@ -1182,7 +1182,7 @@ connection_or_connect, (const tor_addr_t *_addr, uint16_t port,
const ed25519_public_key_t *ed_id,
channel_tls_t *chan))
{
- (void) ed_id; // XXXX not fully used yet.
+ (void) ed_id; // XXXX not fully used yet. 15056
or_connection_t *conn;
const or_options_t *options = get_options();
int socket_error = 0;