commit f0daaf8d60be8bfcfaa99e3a878cd90967a84bb0 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 18 12:55:09 2017 -0400
Expose connection_init_accepted_conn. --- src/or/connection.c | 8 +++++--- src/or/connection.h | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/or/connection.c b/src/or/connection.c index 632a83365..431ab3a3a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -118,8 +118,6 @@ static connection_t *connection_listener_new( const port_cfg_t *portcfg); static void connection_init(time_t now, connection_t *conn, int type, int socket_family); -static int connection_init_accepted_conn(connection_t *conn, - const listener_connection_t *listener); static int connection_handle_listener_read(connection_t *conn, int new_type); static int connection_bucket_should_increase(int bucket, or_connection_t *conn); @@ -1662,11 +1660,15 @@ connection_handle_listener_read(connection_t *conn, int new_type) }
/** Initialize states for newly accepted connection <b>conn</b>. + * * If conn is an OR, start the TLS handshake. + * * If conn is a transparent AP, get its original destination * and place it in circuit_wait. + * + * The <b>listener</b> parameter is only used for AP connections. */ -static int +int connection_init_accepted_conn(connection_t *conn, const listener_connection_t *listener) { diff --git a/src/or/connection.h b/src/or/connection.h index 4a5bd6971..7f488676e 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -26,7 +26,8 @@ entry_connection_t *entry_connection_new(int type, int socket_family); control_connection_t *control_connection_new(int socket_family); listener_connection_t *listener_connection_new(int type, int socket_family); connection_t *connection_new(int type, int socket_family); - +int connection_init_accepted_conn(connection_t *conn, + const listener_connection_t *listener); void connection_link_connections(connection_t *conn_a, connection_t *conn_b); MOCK_DECL(void,connection_free,(connection_t *conn)); void connection_free_all(void);