[or-cvs] Launch intro services after launching connections; allow OR...

[Nick Mathewson]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv329/src/or

Modified Files:
	circuit.c directory.c 
Log Message:
Launch intro services after launching connections; allow ORs to build circuits through as-yet-unconnectd ORs

Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- circuit.c	8 Apr 2004 02:50:34 -0000	1.199
+++ circuit.c	8 Apr 2004 03:53:39 -0000	1.200
@@ -1268,11 +1268,6 @@
   if(!n_conn || n_conn->state != OR_CONN_STATE_OPEN) { /* not currently connected */
     circ->n_addr = firsthop->addr;
     circ->n_port = firsthop->or_port;
-    if(options.ORPort) { /* we would be connected if he were up. and he's not. */
-      log_fn(LOG_INFO,"Route's firsthop isn't connected.");
-      circuit_mark_for_close(circ);
-      return NULL;
-    }
 
     if(!n_conn) { /* launch the connection */
       n_conn = connection_or_connect(firsthop);

Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/src/or/directory.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- directory.c	8 Apr 2004 01:47:33 -0000	1.87
+++ directory.c	8 Apr 2004 03:53:39 -0000	1.88
@@ -243,13 +243,13 @@
       } else {
         log_fn(LOG_INFO,"updated routers.");
       }
+      if(options.ORPort) { /* connect to them all */
+        router_retry_connections();
+      }
       if (has_fetched_directory==0) {
         has_fetched_directory=1;
         directory_has_arrived(); /* do things we've been waiting to do */
       }
-      if(options.ORPort) { /* connect to them all */
-        router_retry_connections();
-      }
     }
 
     if(conn->purpose == DIR_PURPOSE_UPLOAD_DIR) {