[or-cvs] when you tried to set orport through the controller, it would

[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:
	config.c 
Log Message:
when you tried to set orport through the controller, it would
trigger an assert because you hadn't made your onion keys yet
you wanted to launch cpu workers.

now init keys first, reset uptime, and tell the user that we're
starting the reachability testing.


Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -p -d -r1.493 -r1.494
--- config.c	16 Jan 2006 20:08:33 -0000	1.493
+++ config.c	17 Jan 2006 04:01:32 -0000	1.494
@@ -729,6 +729,16 @@ options_act(or_options_t *old_options)
 
     if (options_transition_affects_workers(old_options, options)) {
       info(LD_GENERAL,"Worker-related options changed. Rotating workers.");
+      if (server_mode(options) && !server_mode(old_options)) {
+        extern int has_completed_circuit;
+        if (init_keys() < 0) {
+          err(LD_GENERAL,"Error initializing keys; exiting");
+          return -1;
+        }
+        server_has_changed_ip();
+        if (has_completed_circuit)
+          inform_testing_reachability();
+      }
       cpuworkers_rotate();
       dnsworkers_rotate();
     }