nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

relay: Split out opening a connection for an extend

Browse Source 
Part of 33633.
This commit is contained in:
teor 2020-03-18 19:06:41 +10:00
parent 2640030b10
commit ca9565b9f7
1 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/feature/relay/circuitbuild_relay.c
View File

@ -156,6 +156,47 @@ circuit_extend_lspec_valid_helper(const extend_cell_t *ec,
return 0; return 0;
} }
/* When there is no open channel for an extend cell <b>ec</b>, set up the
* circuit <b>circ</b> to wait for a new connection. If <b>should_launch</b>
* is true, open a new connection. (Otherwise, we are already waiting for a
* new connection to the same relay.)
*
* Always returns 0.
*/
static int
circuit_open_connection_for_extend(const extend_cell_t *ec,
struct circuit_t *circ,
int should_launch)
{
circ->n_hop = extend_info_new(NULL /*nickname*/,
(const char*)ec->node_id,
&ec->ed_pubkey,
NULL, /*onion_key*/
NULL, /*curve25519_key*/
&ec->orport_ipv4.addr,
ec->orport_ipv4.port);
circ->n_chan_create_cell = tor_memdup(&ec->create_cell,
sizeof(ec->create_cell));
circuit_set_state(circ, CIRCUIT_STATE_CHAN_WAIT);
if (should_launch) {
/* we should try to open a connection */
channel_t *n_chan = channel_connect_for_circuit(&ec->orport_ipv4.addr,
ec->orport_ipv4.port,
(const char*)ec->node_id,
&ec->ed_pubkey);
if (!n_chan) {
log_info(LD_CIRC,"Launching n_chan failed. Closing circuit.");
circuit_mark_for_close(circ, END_CIRC_REASON_CONNECTFAILED);
return 0;
}
log_debug(LD_CIRC,"connecting in progress (or finished). Good.");
}
return 0;
}
/** Take the 'extend' <b>cell</b>, pull out addr/port plus the onion /** Take the 'extend' <b>cell</b>, pull out addr/port plus the onion
* skin and identity digest for the next hop. If we're already connected, * skin and identity digest for the next hop. If we're already connected,
* pass the onion skin to the next hop using a create cell; otherwise * pass the onion skin to the next hop using a create cell; otherwise
@ -203,32 +244,8 @@ circuit_extend(struct cell_t *cell, struct circuit_t *circ)
fmt_addrport(&ec.orport_ipv4.addr,ec.orport_ipv4.port), fmt_addrport(&ec.orport_ipv4.addr,ec.orport_ipv4.port),
msg?msg:"????"); msg?msg:"????");
circ->n_hop = extend_info_new(NULL /*nickname*/, circuit_open_connection_for_extend(&ec, circ, should_launch);
(const char*)ec.node_id,
&ec.ed_pubkey,
NULL, /*onion_key*/
NULL, /*curve25519_key*/
&ec.orport_ipv4.addr,
ec.orport_ipv4.port);
circ->n_chan_create_cell = tor_memdup(&ec.create_cell,
sizeof(ec.create_cell));
circuit_set_state(circ, CIRCUIT_STATE_CHAN_WAIT);
if (should_launch) {
/* we should try to open a connection */
n_chan = channel_connect_for_circuit(&ec.orport_ipv4.addr,
ec.orport_ipv4.port,
(const char*)ec.node_id,
&ec.ed_pubkey);
if (!n_chan) {
log_info(LD_CIRC,"Launching n_chan failed. Closing circuit.");
circuit_mark_for_close(circ, END_CIRC_REASON_CONNECTFAILED);
return 0;
}
log_debug(LD_CIRC,"connecting in progress (or finished). Good.");
}
/* return success. The onion/circuit/etc will be taken care of /* return success. The onion/circuit/etc will be taken care of
* automatically (may already have been) whenever n_chan reaches * automatically (may already have been) whenever n_chan reaches
* OR_CONN_STATE_OPEN. * OR_CONN_STATE_OPEN.