Commit 1e4e0244 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

minor race condition 

(it seemed to work anyway, but...)


svn:r100
parent f9f3e2f1

src/or/connection.c

+3 −2
Original line number Diff line number Diff line
@@ -635,8 +635,9 @@ int connection_consider_sending_sendme(connection_t *conn) { 


  circ = circuit_get_by_conn(conn);

  if(!circ) {

    log(LOG_DEBUG,"connection_consider_sending_sendme(): Bug: no circuit associated with conn. Closing.");

    return -1;

    /* this can legitimately happen if the destroy has already arrived and torn down the circuit */

    log(LOG_DEBUG,"connection_consider_sending_sendme(): No circuit associated with conn. Skipping.");

    return 0;

  }

  sendme.command = CELL_SENDME;

  sendme.length = RECEIVE_WINDOW_INCREMENT;

src/or/connection_ap.c

+1 −2
Original line number Diff line number Diff line
@@ -365,8 +365,7 @@ int connection_ap_finished_flushing(connection_t *conn) { 
    case AP_CONN_STATE_OPEN:

      /* FIXME down the road, we'll clear out circuits that are pending to close */

      connection_stop_writing(conn);

      connection_consider_sending_sendme(conn);

      return 0;

      return connection_consider_sending_sendme(conn);

    default:

      log(LOG_DEBUG,"Bug: connection_ap_finished_flushing() called in unexpected state.");

      return 0;