[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] don"t try to build intro circs until you"ve fetched the dir...
- To: or-cvs@freehaven.net
- Subject: [or-cvs] don"t try to build intro circs until you"ve fetched the dir...
- From: arma@seul.org (Roger Dingledine)
- Date: Wed, 7 Apr 2004 18:48:08 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Wed, 07 Apr 2004 18:48:24 -0400
- Reply-to: or-dev@freehaven.net
- Sender: owner-or-cvs@freehaven.net
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or
Modified Files:
main.c rendservice.c
Log Message:
don't try to build intro circs until you've fetched the directory
Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- main.c 7 Apr 2004 21:44:46 -0000 1.227
+++ main.c 7 Apr 2004 22:48:06 -0000 1.228
@@ -333,7 +333,8 @@
* our descriptor (if any). */
if(time_to_fetch_directory < now) {
/* it's time to fetch a new directory and/or post our descriptor */
- rend_services_init(); /* make new intro points and re-upload if necessary */
+ if(has_fetched_directory)
+ rend_services_init(); /* make new intro points and re-upload if necessary */
if(options.ORPort) {
router_rebuild_descriptor();
router_upload_dir_desc_to_dirservers();
Index: rendservice.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rendservice.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- rendservice.c 7 Apr 2004 22:06:54 -0000 1.37
+++ rendservice.c 7 Apr 2004 22:48:06 -0000 1.38
@@ -704,7 +704,7 @@
service->intro_exclude_nodes,
exclude_routers);
if (!router) {
- log_fn(LOG_WARN, "Can't establish more than %d introduction points",
+ log_fn(LOG_WARN, "Could only establish %d introduction points",
smartlist_len(service->intro_nodes));
break;
}