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

Merge remote-tracking branch 'arma/bug16844-logs'

This commit is contained in:
Nick Mathewson 2015-08-18 09:19:39 -04:00
parent eafae7f677 b4732bd2ea
commit a7de5bd02e
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/circuituse.c
View File

@ -1204,6 +1204,9 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn)
}
}
if (removed) {
log_debug(LD_APP, "Removing stream %d from circ %u",
conn->stream_id, (unsigned)circ->n_circ_id);
/* If the stream was removed, and it was a rend stream, decrement the
* number of streams on the circuit associated with the rend service.
*/

3
src/or/connection_edge.c
View File

@ -2128,8 +2128,9 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn)
}
log_info(LD_APP,
"Sending relay cell %d to begin stream %d.",
"Sending relay cell %d on circ %u to begin stream %d.",
(int)ap_conn->use_begindir,
(unsigned)circ->base_.n_circ_id,
edge_conn->stream_id);
begin_type = ap_conn->use_begindir ?

12
src/or/relay.c
View File

@ -209,8 +209,7 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
return 0;
}
conn = relay_lookup_conn(circ, cell, cell_direction,
layer_hint);
conn = relay_lookup_conn(circ, cell, cell_direction, layer_hint);
if (cell_direction == CELL_DIRECTION_OUT) {
++stats_n_relay_cells_delivered;
log_debug(LD_OR,"Sending away from origin.");
@ -1306,7 +1305,10 @@ connection_edge_process_relay_cell_not_open(
return 0;
}
conn->base_.state = AP_CONN_STATE_OPEN;
log_info(LD_APP,"'connected' received after %d seconds.",
log_info(LD_APP,"'connected' received for circid %u streamid %d "
"after %d seconds.",
(unsigned)circ->n_circ_id,
rh->stream_id,
(int)(time(NULL) - conn->base_.timestamp_lastread));
if (connected_cell_parse(rh, cell, &addr, &ttl) < 0) {
log_fn(LOG_PROTOCOL_WARN, LD_APP,
@ -1699,7 +1701,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
return -END_CIRC_REASON_TORPROTOCOL;
}
log_info(domain,
"'connected' received, no conn attached anymore. Ignoring.");
"'connected' received on circid %u for streamid %d, "
"no conn attached anymore. Ignoring.",
(unsigned)circ->n_circ_id, rh.stream_id);
return 0;
case RELAY_COMMAND_SENDME:
if (!rh.stream_id) {