Commit 516ef41a authored by Roger Dingledine's avatar Roger Dingledine
Browse files

if a stream times out after 15s without a connected cell, 

don't try that circuit again.


svn:r1239
parent c362ed87

src/or/connection_edge.c

+6 −1
Changes for src/or/connection_edge.c: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -568,7 +568,12 @@ void connection_ap_expire_beginning(void) { 
       */

      conn->state = AP_CONN_STATE_CIRCUIT_WAIT;

      circuit_detach_stream(circ, conn);

      /* give it another 15 seconds to try */

      /* kludge to make us not try this circuit again, yet to allow

       * current streams on it to survive if they can: make it

       * unattractive to use for new streams */

      assert(circ->timestamp_dirty);

      circ->timestamp_dirty -= options.NewCircuitPeriod;

      /* give our stream another 15 seconds to try */

      conn->timestamp_lastread += 15;

      if(connection_ap_handshake_attach_circuit(conn)<0) {

        /* it will never work */