[or-cvs] don"t mark the helper node as down when we fail to connect to

[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:
	connection_or.c 
Log Message:
don't mark the helper node as down when we fail to connect to
our https proxy.


Index: connection_or.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- connection_or.c	10 Dec 2005 09:36:25 -0000	1.201
+++ connection_or.c	11 Dec 2005 11:54:55 -0000	1.202
@@ -442,9 +442,12 @@
 
   switch (connection_connect(conn, conn->address, addr, port)) {
     case -1:
-      if (!options->HttpsProxy)
+      if (!options->HttpsProxy) {
+        /* If the connection failed immediately, our https proxy
+         * is down. Don't blame the Tor server. */
         router_mark_as_down(conn->identity_digest);
-      helper_node_set_status(conn->identity_digest, 0);
+        helper_node_set_status(conn->identity_digest, 0);
+      }
       control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED);
       connection_free(conn);
       return NULL;