From e6590efaa77c8cf186ce92e6ebad175e9c6450d1 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Sun, 8 Dec 2013 20:42:33 +0200 Subject: Fix get_configured_bridge_by_addr_port_digest(.,.,NULL) The old behavior was that NULL matched only bridges without known identities; the correct behavior is that NULL should match all bridges (assuming that their addr:port matches). --- src/or/entrynodes.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/or') diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index ebbd85c78..d463303fc 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1657,7 +1657,8 @@ get_configured_bridge_by_orports_digest(const char *digest, /** If we have a bridge configured whose digest matches digest, or a * bridge with no known digest whose address matches addr:/port, - * return that bridge. Else return NULL. */ + * return that bridge. Else return NULL. If digest is NULL, check for + * address/port matches only. */ static bridge_info_t * get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr, uint16_t port, @@ -1667,7 +1668,7 @@ get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr, return NULL; SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge) { - if (tor_digest_is_zero(bridge->identity) && + if ((tor_digest_is_zero(bridge->identity) || digest == NULL) && !tor_addr_compare(&bridge->addr, addr, CMP_EXACT) && bridge->port == port) return bridge; -- cgit v1.2.3