From 569fe936b8349082d6f9dcd4e55f7d5758d236be Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 20 Jul 2011 12:55:42 -0400 Subject: Move entry-only fields from edge_connection_t to entry_connection_t Also, refactor the code accordingly. --- src/or/circuituse.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/or/circuituse.h') diff --git a/src/or/circuituse.h b/src/or/circuituse.h index ab7f6a2fe..9867fd820 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -14,7 +14,7 @@ void circuit_expire_building(void); void circuit_remove_handled_ports(smartlist_t *needed_ports); -int circuit_stream_is_being_handled(edge_connection_t *conn, uint16_t port, +int circuit_stream_is_being_handled(entry_connection_t *conn, uint16_t port, int min); #if 0 int circuit_conforms_to_options(const origin_circuit_t *circ, @@ -45,10 +45,10 @@ origin_circuit_t *circuit_launch_by_extend_info(uint8_t purpose, int flags); origin_circuit_t *circuit_launch(uint8_t purpose, int flags); void circuit_reset_failure_count(int timeout); -int connection_ap_handshake_attach_chosen_circuit(edge_connection_t *conn, +int connection_ap_handshake_attach_chosen_circuit(entry_connection_t *conn, origin_circuit_t *circ, crypt_path_t *cpath); -int connection_ap_handshake_attach_circuit(edge_connection_t *conn); +int connection_ap_handshake_attach_circuit(entry_connection_t *conn); int hostname_in_track_host_exits(const or_options_t *options, const char *address); -- cgit v1.2.3