sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backport r10818: prevent streamid collisions on relay cells 

svn:r10819
This commit is contained in:
Roger Dingledine 2007-07-12 17:16:18 +00:00
parent d9cee67479
commit c222971b5a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24,6 +24,9 @@ Changes in version 0.1.2.15 - 2007-0?-??
- When sending destroy cells from a circuit's origin, don't include - When sending destroy cells from a circuit's origin, don't include
the reason for tearing down the circuit. The spec says we didn't, the reason for tearing down the circuit. The spec says we didn't,
and now we actually don't. Reported by lodger. and now we actually don't. Reported by lodger.
- Keep streamids from different exits on a circuit separate. This
bug may have allowed other routers on a given circuit to inject
cells into streams. Reported by lodger; fixes bug 446.
o Minor bugfixes (directory) o Minor bugfixes (directory)
- Count the number of authorities that recommend each version - Count the number of authorities that recommend each version

12
src/or/relay.c
View File

@ -17,7 +17,8 @@ const char relay_c_id[] =
static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction, static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
crypt_path_t **layer_hint, char *recognized); crypt_path_t **layer_hint, char *recognized);
static edge_connection_t *relay_lookup_conn(circuit_t *circ, cell_t *cell, static edge_connection_t *relay_lookup_conn(circuit_t *circ, cell_t *cell,
int cell_direction); int cell_direction,
crypt_path_t *layer_hint);
static int static int
connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
@ -162,7 +163,8 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, int cell_direction)
} }
if (recognized) { if (recognized) {
edge_connection_t *conn = relay_lookup_conn(circ, cell, cell_direction); edge_connection_t *conn = relay_lookup_conn(circ, cell, cell_direction,
layer_hint);
if (cell_direction == CELL_DIRECTION_OUT) { if (cell_direction == CELL_DIRECTION_OUT) {
++stats_n_relay_cells_delivered; ++stats_n_relay_cells_delivered;
log_debug(LD_OR,"Sending away from origin."); log_debug(LD_OR,"Sending away from origin.");
@ -372,7 +374,8 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
* attached to circ, return that conn, else return NULL. * attached to circ, return that conn, else return NULL.
*/ */
static edge_connection_t * static edge_connection_t *
relay_lookup_conn(circuit_t *circ, cell_t *cell, int cell_direction) relay_lookup_conn(circuit_t *circ, cell_t *cell, int cell_direction,
crypt_path_t *layer_hint)
{ {
edge_connection_t *tmpconn; edge_connection_t *tmpconn;
relay_header_t rh; relay_header_t rh;
@ -390,7 +393,8 @@ relay_lookup_conn(circuit_t *circ, cell_t *cell, int cell_direction)
for (tmpconn = TO_ORIGIN_CIRCUIT(circ)->p_streams; tmpconn; for (tmpconn = TO_ORIGIN_CIRCUIT(circ)->p_streams; tmpconn;
tmpconn=tmpconn->next_stream) { tmpconn=tmpconn->next_stream) {
if (rh.stream_id == tmpconn->stream_id && if (rh.stream_id == tmpconn->stream_id &&
!tmpconn->_base.marked_for_close) { !tmpconn->_base.marked_for_close &&
tmpconn->cpath_layer == layer_hint) {
log_debug(LD_APP,"found conn for stream %d.", rh.stream_id); log_debug(LD_APP,"found conn for stream %d.", rh.stream_id);
return tmpconn; return tmpconn;
} }