[or-cvs] when we"re trying to build a circuit and we"re being picky ...

[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:
when we're trying to build a circuit and we're being picky about what
sort we get but there aren't any suitable servers, try being less picky
rather than simply failing.


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- circuitbuild.c	22 Aug 2005 22:58:38 -0000	1.137
+++ circuitbuild.c	26 Aug 2005 22:10:22 -0000	1.138
@@ -1168,6 +1168,8 @@
     smartlist_t *needed_ports = circuit_get_unhandled_ports(time(NULL));
 
     if (best_support == -1) {
+      if (need_uptime || need_capacity)
+        return choose_good_exit_server_general(dir, 0, 0);
       log(LOG_NOTICE, "All routers are down or middleman -- choosing a doomed exit at random.");
     }
     for (try = 0; try < 2; try++) {