[or-cvs] retry streams where the connected cell hasn"t arrived in 15...

[Roger Dingledine]

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

Modified Files:
	connection_edge.c 
Log Message:
retry streams where the connected cell hasn't arrived in 15 seconds


Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- connection_edge.c	17 Feb 2004 08:29:21 -0000	1.90
+++ connection_edge.c	17 Feb 2004 21:07:15 -0000	1.91
@@ -538,11 +538,13 @@
     if (conn->type != CONN_TYPE_AP ||
         conn->state != AP_CONN_STATE_CONNECTING)
       continue;
-    if (now - conn->timestamp_lastread > 30) {
-      log_fn(LOG_WARN,"Stream is %d seconds late. Closing.",
+    if (now - conn->timestamp_lastread >= 15) {
+      log_fn(LOG_WARN,"Stream is %d seconds late. Retrying.",
              (int)(now - conn->timestamp_lastread));
-      /* XXX here is where it should move back into 'pending' state */
-      conn->marked_for_close = 1;
+      /* move it back into 'pending' state. It's possible it will
+       * reattach to this same circuit, but that's good enough for now.
+       */
+      conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
     }
   }
 }