Commit 161b2750 authored by Sebastian Hahn's avatar Sebastian Hahn
Browse files

Retry streams that ended with NOROUTE error 

Also add the NOROUTE reason to control-spec.
parent 150ed553

doc/spec/control-spec.txt

+1 −1
Changes for doc/spec/control-spec.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ $Id$ 


      Reason = "MISC" / "RESOLVEFAILED" / "CONNECTREFUSED" /

               "EXITPOLICY" / "DESTROY" / "DONE" / "TIMEOUT" /

               "HIBERNATING" / "INTERNAL"/ "RESOURCELIMIT" /

               "NOROUTE" / "HIBERNATING" / "INTERNAL"/ "RESOURCELIMIT" /

               "CONNRESET" / "TORPROTOCOL" / "NOTDIRECTORY" / "END"



   The "REASON" field is provided only for FAILED, CLOSED, and DETACHED

src/or/relay.c

+1 −0
Changes for src/or/relay.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ connection_ap_process_end_not_open( 
      case END_STREAM_REASON_RESOLVEFAILED:

      case END_STREAM_REASON_TIMEOUT:

      case END_STREAM_REASON_MISC:

      case END_STREAM_REASON_NOROUTE:

        if (client_dns_incr_failures(conn->socks_request->address)

            < MAX_RESOLVE_FAILURES) {

          /* We haven't retried too many times; reattach the connection. */