[or-cvs] Reload rendezvous service keys on sighup; otherwise, we win...

Nick Mathewson nickm at seul.org
Fri Apr 9 17:48:12 UTC 2004


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

Modified Files:
	main.c 
Log Message:
Reload rendezvous service keys on sighup; otherwise, we wind up with a
bunch of half-initialized services.  This should solve half of
weasel's current bug.  The crash is the other half.

(arma: should we also call rend_services_init on hup?)



Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- main.c	9 Apr 2004 09:39:42 -0000	1.229
+++ main.c	9 Apr 2004 17:48:09 -0000	1.230
@@ -529,6 +529,12 @@
   if (init_from_config(0, NULL) < 0) {
     exit(1);
   }
+  /* reload keys as needed for rendezvous services. */
+  if (rend_service_init_keys()<0) {
+    log_fn(LOG_ERR,"Error reloading rendezvous service keys");
+    exit(1);
+  }
+  /* XXX also call rend_services_init ?? */
   if(retry_all_connections() < 0) {
     log_fn(LOG_ERR,"Failed to bind one of the listener ports.");
     return -1;



More information about the tor-commits mailing list