summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-06-20 03:13:16 +0000
committerRoger Dingledine <arma@torproject.org>2008-06-20 03:13:16 +0000
commitdd50ffb1de2b408be2d6e5c0aba767d361bc80c5 (patch)
tree3acda9823701b3fdb3fec702fb57937f40b648ed /src/or/or.h
parent67df8f60116b13d833810e8d63dea478340bdb50 (diff)
downloadtor-dd50ffb1de2b408be2d6e5c0aba767d361bc80c5.tar.gz
tor-dd50ffb1de2b408be2d6e5c0aba767d361bc80c5.zip
Big bridge bugfixes. Backport candidates.
If you have more than one bridge but don't know their keys, you would only learn a request for the descriptor of the first one on your list. (Tor considered launching requests for the others, but found that it already had a connection on the way for $0000...0000 so it didn't open another.) If you have more than one bridge but don't know their keys, and the connection to one of the bridges failed, you would cancel all pending bridge connections. (After all, they all have the same digest.) svn:r15366
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 219ea5f4c3..ad675ce02f 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2875,7 +2875,8 @@ int connection_edge_is_rendezvous_stream(edge_connection_t *conn);
int connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit);
void connection_ap_expire_beginning(void);
void connection_ap_attach_pending(void);
-void connection_ap_fail_onehop(const char *failed_digest);
+void connection_ap_fail_onehop(const char *failed_digest,
+ cpath_build_state_t *build_state);
void circuit_discard_optional_exit_enclaves(extend_info_t *info);
int connection_ap_detach_retriable(edge_connection_t *conn,
origin_circuit_t *circ,