[or-cvs] END_CIRC_REASON_OR_IDENTITY apparently means that we were t...

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitbuild.c 
Log Message:
END_CIRC_REASON_OR_IDENTITY apparently means that we were told to
connect to a different OR than lives on the addr:port we connected
to. we don't actually remember whether that was the case, currently.
so call it END_CIRC_REASON_OR_CONN_CLOSED as a compromise.


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -d -r1.233 -r1.234
--- circuitbuild.c	30 May 2006 05:29:03 -0000	1.233
+++ circuitbuild.c	30 May 2006 06:17:28 -0000	1.234
@@ -423,7 +423,7 @@ circuit_n_conn_done(connection_t *or_con
                 DIGEST_LEN)) {
       if (!status) { /* or_conn failed; close circ */
         log_info(LD_CIRC,"or_conn failed. Closing circ.");
-        circuit_mark_for_close(circ, END_CIRC_REASON_OR_IDENTITY);
+        circuit_mark_for_close(circ, END_CIRC_REASON_OR_CONN_CLOSED);
         continue;
       }
       log_debug(LD_CIRC, "Found circ, sending create cell.");