mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

make it work (heh)

Browse Source 
svn:r231
This commit is contained in:
Roger Dingledine 2003-04-11 22:28:51 +00:00
parent 1d53d8ad0e
commit 7df5caad0d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/connection_edge.c
View File

@ -106,7 +106,12 @@ int connection_edge_process_data_cell(cell_t *cell, circuit_t *circ, int edge_ty
circuit_consider_sending_sendme(circ, edge_type); circuit_consider_sending_sendme(circ, edge_type);
for(conn = circ->p_conn; conn && conn->topic_id != topic_id; conn = conn->next_topic) ; if(edge_type == EDGE_AP)
conn = circ->p_conn;
else
conn = circ->n_conn;
for( ; conn && conn->topic_id != topic_id; conn = conn->next_topic) ;
/* now conn is either NULL, in which case we don't recognize the topic_id, or /* now conn is either NULL, in which case we don't recognize the topic_id, or
* it is set, in which case cell is talking about this conn. * it is set, in which case cell is talking about this conn.
@ -247,7 +252,7 @@ int connection_edge_finished_flushing(connection_t *conn) {
if(connection_wants_to_flush(conn)) /* in case there are any queued data cells */ if(connection_wants_to_flush(conn)) /* in case there are any queued data cells */
connection_start_writing(conn); connection_start_writing(conn);
return return
connection_exit_send_connected(conn) || /* deliver a 'connected' data cell back through the circuit. */ connection_edge_send_command(conn, circuit_get_by_conn(conn), TOPIC_COMMAND_CONNECTED) || /* deliver a 'connected' data cell back through the circuit. */
connection_process_inbuf(conn); /* in case the server has written anything */ connection_process_inbuf(conn); /* in case the server has written anything */
case AP_CONN_STATE_OPEN: case AP_CONN_STATE_OPEN:
case EXIT_CONN_STATE_OPEN: case EXIT_CONN_STATE_OPEN:

2
src/or/or.h
View File

@ -624,7 +624,7 @@ int connection_ap_handle_listener_read(connection_t *conn);
/********************************* connection_edge.c ***************************/ /********************************* connection_edge.c ***************************/
int connection_edge_process_inbuf(connection_t *conn); int connection_edge_process_inbuf(connection_t *conn);
int connection_edge_send_command(connection_t *conn, int topic_command); int connection_edge_send_command(connection_t *conn, circuit_t *circ, int topic_command);
int connection_edge_process_data_cell(cell_t *cell, circuit_t *circ, int edge_type); int connection_edge_process_data_cell(cell_t *cell, circuit_t *circ, int edge_type);
int connection_edge_finished_flushing(connection_t *conn); int connection_edge_finished_flushing(connection_t *conn);