diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-03-22 00:42:38 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-03-22 00:42:38 +0000 |
| commit | 35953edae073e69efe06f4ea313066b514b772a0 (patch) | |
| tree | 3f89981b90370e5c4c727e3b86905813871828d9 /src/or/or.h | |
| parent | 5d5b12ce750e60041f7654449129fe268ed76a2e (diff) | |
| download | tor-35953edae073e69efe06f4ea313066b514b772a0.tar tor-35953edae073e69efe06f4ea313066b514b772a0.tar.gz | |
Implement controller's "extendcircuit" directive.
Also refactor circuit building so we plan the whole path ahead
of time.
svn:r3797
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h index 1991d7fcf..d35e95e3f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1120,8 +1120,11 @@ char *circuit_list_path(circuit_t *circ, int verbose); void circuit_log_path(int severity, circuit_t *circ); void circuit_rep_hist_note_result(circuit_t *circ); void circuit_dump_by_conn(connection_t *conn, int severity); -circuit_t *circuit_establish_circuit(uint8_t purpose, const char *exit_digest, +circuit_t *circuit_init(uint8_t purpose, int need_uptime, + int need_capacity, int internal); +circuit_t *circuit_establish_circuit(uint8_t purpose, routerinfo_t *exit, int need_uptime, int need_capacity, int internal); +int circuit_handle_first_hop(circuit_t *circ); void circuit_n_conn_done(connection_t *or_conn, int status); int circuit_send_next_onion_skin(circuit_t *circ); void circuit_note_clock_jumped(int seconds_elapsed); @@ -1133,7 +1136,7 @@ int onionskin_answer(circuit_t *circ, unsigned char *payload, unsigned char *key int circuit_all_predicted_ports_handled(time_t now, int *need_uptime, int *need_capacity); -int circuit_append_new_hop(circuit_t *circ, char *nickname, const char *exit_digest); +int circuit_append_new_exit(circuit_t *circ, routerinfo_t *exit); void onion_append_to_cpath(crypt_path_t **head_ptr, crypt_path_t *new_hop); /********************************* circuitlist.c ***********************/ @@ -1181,8 +1184,8 @@ void circuit_has_opened(circuit_t *circ); void circuit_build_failed(circuit_t *circ); circuit_t *circuit_launch_by_nickname(uint8_t purpose, const char *exit_nickname, int need_uptime, int need_capacity, int is_internal); -circuit_t *circuit_launch_by_identity(uint8_t purpose, const char *exit_digest, - int need_uptime, int need_capacity, int is_internal); +circuit_t *circuit_launch_by_router(uint8_t purpose, routerinfo_t *exit, + int need_uptime, int need_capacity, int is_internal); void circuit_reset_failure_count(int timeout); int connection_ap_handshake_attach_chosen_circuit(connection_t *conn, circuit_t *circ); |