aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-08-24 12:31:09 -0400
committerNick Mathewson <nickm@torproject.org>2012-08-24 12:31:09 -0400
commit03ca9c63c8c04f455eee7aee8adf0554e9bc9952 (patch)
tree39c0f6b9dc13a75c5e695f6d3fc8bc2b20220a89 /src
parent3410a46ebc7870c1ded14ef34a8e96f0a48b3994 (diff)
downloadtor-03ca9c63c8c04f455eee7aee8adf0554e9bc9952.tar
tor-03ca9c63c8c04f455eee7aee8adf0554e9bc9952.tar.gz
Clarify docs on get_configured_bridge_by_*_digest
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitbuild.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 9f10190c9..b4e79ed74 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -5126,9 +5126,10 @@ bridge_free(bridge_info_t *bridge)
tor_free(bridge);
}
-/** Return a bridge pointer if either <b>digest</b>, if possible, or
- * any of the tor_addr_port_t's in <b>orports</b>, if necessary,
- * matches any of our known bridges. Else return NULL. */
+/** If we have a bridge configured whose digest matches <b>digest</b>, or a
+ * bridge with no known digest whose address matches any of the
+ * tor_addr_port_t's in <b>orports</b>, return that bridge. Else return
+ * NULL. */
static bridge_info_t *
get_configured_bridge_by_orports_digest(const char *digest,
const smartlist_t *orports)
@@ -5153,9 +5154,9 @@ get_configured_bridge_by_orports_digest(const char *digest,
return NULL;
}
-/** Return a bridge pointer if <b>digest</b>, if possible, or
- * <b>addr</b> and <b>port</b>, if necessary, matches any of our known
- * bridges. Else return NULL. */
+/** If we have a bridge configured whose digest matches <b>digest</b>, or a
+ * bridge with no known digest whose address matches <b>addr</b>:<b>/port</b>,
+ * return that bridge. Else return NULL. */
static bridge_info_t *
get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr,
uint16_t port,