[or-cvs] finally find and possibly fix the circuit_deliver_relay_cel...

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	circuit.c config.c 
Log Message:
finally find and possibly fix the circuit_deliver_relay_cell warn bug


Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- circuit.c	17 Nov 2003 07:29:43 -0000	1.100
+++ circuit.c	17 Nov 2003 07:43:03 -0000	1.101
@@ -857,9 +857,10 @@
      */
     struct in_addr in;
     in.s_addr = htonl(circ->n_addr);
-    log_fn(LOG_WARN,"Next router (%s:%d) not connected. Closing.", inet_ntoa(in), circ->n_port);
-    /* XXX later we should fail more gracefully here, like with a 'truncated' */
-    return -1;
+    log_fn(LOG_INFO,"Next router (%s:%d) not connected. Closing.", inet_ntoa(in), circ->n_port);
+    connection_edge_send_command(NULL, circ, RELAY_COMMAND_TRUNCATED,
+                                 NULL, 0, NULL);
+    return 0;
   }
 
   circ->n_addr = n_conn->addr; /* these are different if we found a twin instead */

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- config.c	13 Nov 2003 23:01:55 -0000	1.68
+++ config.c	17 Nov 2003 07:43:03 -0000	1.69
@@ -265,7 +265,7 @@
   options->MaxConn = 900;
   options->DirFetchPostPeriod = 600;
   options->KeepalivePeriod = 300;
-  options->MaxOnionsPending = 10;
+  options->MaxOnionsPending = 100;
   options->NewCircuitPeriod = 60; /* once a minute */
   options->TotalBandwidth = 800000; /* at most 800kB/s total sustained incoming */
   options->NumCpus = 1;