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

Record, send, and receive flags in BEGIN cells

Browse Source
This commit is contained in:
Nick Mathewson 2012-10-24 23:39:28 -04:00
parent b35a0d1132
commit c64ee7099f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/connection_edge.c
View File

@ -1656,6 +1656,10 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn)
ap_conn->socks_request->address : "", ap_conn->socks_request->address : "",
ap_conn->socks_request->port); ap_conn->socks_request->port);
payload_len = (int)strlen(payload)+1; payload_len = (int)strlen(payload)+1;
if (payload_len <= RELAY_PAYLOAD_SIZE - 4) {
set_uint32(payload + payload_len, htonl(edge_conn->begincell_flags));
payload_len += 4;
}
log_info(LD_APP, log_info(LD_APP,
"Sending relay cell %d to begin stream %d.", "Sending relay cell %d to begin stream %d.",
@ -2235,14 +2239,14 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
} }
log_debug(LD_EXIT,"Creating new exit connection."); log_debug(LD_EXIT,"Creating new exit connection.");
n_stream = edge_connection_new(CONN_TYPE_EXIT, AF_INET); n_stream = edge_connection_new(CONN_TYPE_EXIT, AF_INET);/*XXXX IPv6*/
/* Remember the tunneled request ID in the new edge connection, so that /* Remember the tunneled request ID in the new edge connection, so that
* we can measure download times. */ * we can measure download times. */
n_stream->dirreq_id = circ->dirreq_id; n_stream->dirreq_id = circ->dirreq_id;
n_stream->base_.purpose = EXIT_PURPOSE_CONNECT; n_stream->base_.purpose = EXIT_PURPOSE_CONNECT;
n_stream->begincell_flags = bcell.flags;
n_stream->stream_id = rh.stream_id; n_stream->stream_id = rh.stream_id;
n_stream->base_.port = port; n_stream->base_.port = port;
/* leave n_stream->s at -1, because it's not yet valid */ /* leave n_stream->s at -1, because it's not yet valid */

2
src/or/or.h
View File

@ -1414,6 +1414,8 @@ typedef struct edge_connection_t {
uint32_t address_ttl; /**< TTL for address-to-addr mapping on exit uint32_t address_ttl; /**< TTL for address-to-addr mapping on exit
* connection. Exit connections only. */ * connection. Exit connections only. */
uint32_t begincell_flags; /** Flags sent or received in the BEGIN cell
* for this connection */
streamid_t stream_id; /**< The stream ID used for this edge connection on its streamid_t stream_id; /**< The stream ID used for this edge connection on its
* circuit */ * circuit */