Commit 90f8a7a7 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

be less noisy at -l info, now that flow control bug is solved 


svn:r172
parent f9f08666

src/or/circuit.c

+2 −2
Changes for src/or/circuit.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ int circuit_consider_sending_sendme(circuit_t *circ, int edge_type) { 


  if(edge_type == EDGE_AP) { /* i'm the AP */

    while(circ->n_receive_circwindow < CIRCWINDOW_START-CIRCWINDOW_INCREMENT) {

      log(LOG_INFO,"circuit_consider_sending_sendme(): n_receive_circwindow %d, Queueing sendme forward.", circ->n_receive_circwindow);

      log(LOG_DEBUG,"circuit_consider_sending_sendme(): n_receive_circwindow %d, Queueing sendme forward.", circ->n_receive_circwindow);

      circ->n_receive_circwindow += CIRCWINDOW_INCREMENT;

      sendme.aci = circ->n_aci;

      if(connection_write_cell_to_buf(&sendme, circ->n_conn) < 0) {
@@ -503,7 +503,7 @@ int circuit_consider_sending_sendme(circuit_t *circ, int edge_type) { 
    }

  } else if(edge_type == EDGE_EXIT) { /* i'm the exit */

    while(circ->p_receive_circwindow < CIRCWINDOW_START-CIRCWINDOW_INCREMENT) {

      log(LOG_INFO,"circuit_consider_sending_sendme(): p_receive_circwindow %d, Queueing sendme back.", circ->p_receive_circwindow);

      log(LOG_DEBUG,"circuit_consider_sending_sendme(): p_receive_circwindow %d, Queueing sendme back.", circ->p_receive_circwindow);

      circ->p_receive_circwindow += CIRCWINDOW_INCREMENT;

      sendme.aci = circ->p_aci;

      if(connection_write_cell_to_buf(&sendme, circ->p_conn) < 0) {

src/or/command.c

+2 −2
Changes for src/or/command.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void command_process_sendme_cell(cell_t *cell, connection_t *conn) { 
  if(cell->aci == circ->p_aci) { /* it's an outgoing cell */

    circ->n_receive_circwindow += cell->length;

    assert(circ->n_receive_circwindow <= CIRCWINDOW_START);

    log(LOG_INFO,"command_process_sendme_cell(): n_receive_circwindow for aci %d is %d.",circ->n_aci,circ->n_receive_circwindow);

    log(LOG_DEBUG,"command_process_sendme_cell(): n_receive_circwindow for aci %d is %d.",circ->n_aci,circ->n_receive_circwindow);

    if(!circ->n_conn || circ->n_conn->type == CONN_TYPE_EXIT) {

      circuit_resume_edge_reading(circ, EDGE_EXIT);

    } else {
@@ -194,7 +194,7 @@ void command_process_sendme_cell(cell_t *cell, connection_t *conn) { 
  } else { /* it's an ingoing cell */

    assert(cell->aci == circ->n_aci);

    circ->p_receive_circwindow += cell->length;

    log(LOG_INFO,"command_process_sendme_cell(): p_receive_circwindow for aci %d is %d.",circ->p_aci,circ->p_receive_circwindow);

    log(LOG_DEBUG,"command_process_sendme_cell(): p_receive_circwindow for aci %d is %d.",circ->p_aci,circ->p_receive_circwindow);

    assert(circ->p_receive_circwindow <= CIRCWINDOW_START);

    if(!circ->p_conn || circ->p_conn->type == CONN_TYPE_AP) {

      circuit_resume_edge_reading(circ, EDGE_AP);