mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 23:21:38 +01:00
Code Issues Projects Releases Wiki Activity

Expose connection_init_accepted_conn.

Browse source
This commit is contained in:
Nick Mathewson 2017-10-18 12:55:09 -04:00
parent 4eb5753bd2
commit f0daaf8d60
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/or/connection.c
View file

@ -118,8 +118,6 @@ static connection_t *connection_listener_new(
const port_cfg_t *portcfg); const port_cfg_t *portcfg);
static void connection_init(time_t now, connection_t *conn, int type, static void connection_init(time_t now, connection_t *conn, int type,
int socket_family); 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_handle_listener_read(connection_t *conn, int new_type);
static int connection_bucket_should_increase(int bucket, static int connection_bucket_should_increase(int bucket,
or_connection_t *conn); 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>. /** Initialize states for newly accepted connection <b>conn</b>.
*
* If conn is an OR, start the TLS handshake. * If conn is an OR, start the TLS handshake.
*
* If conn is a transparent AP, get its original destination * If conn is a transparent AP, get its original destination
* and place it in circuit_wait. * 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, connection_init_accepted_conn(connection_t *conn,
const listener_connection_t *listener) const listener_connection_t *listener)
{ {

3
src/or/connection.h
View file

@ -26,7 +26,8 @@ entry_connection_t *entry_connection_new(int type, int socket_family);
control_connection_t *control_connection_new(int socket_family); control_connection_t *control_connection_new(int socket_family);
listener_connection_t *listener_connection_new(int type, int socket_family); listener_connection_t *listener_connection_new(int type, int socket_family);
connection_t *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); void connection_link_connections(connection_t *conn_a, connection_t *conn_b);
MOCK_DECL(void,connection_free,(connection_t *conn)); MOCK_DECL(void,connection_free,(connection_t *conn));
void connection_free_all(void); void connection_free_all(void);