[or-cvs] don"t upload your descriptor if rebuilding it failed

[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:
	or.h router.c 
Log Message:
don't upload your descriptor if rebuilding it failed


Index: or.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -d -r1.611 -r1.612
--- or.h	7 Jun 2005 18:01:46 -0000	1.611
+++ or.h	8 Jun 2005 19:45:17 -0000	1.612
@@ -162,7 +162,7 @@
 /** How long do we keep DNS cache entries before purging them? */
 #define MAX_DNS_ENTRY_AGE (150*60)
 #else
-#define MAX_DNS_ENTRY_AGE (15*60)
+#define MAX_DNS_ENTRY_AGE (30*60)
 #endif
 
 /** How often do we rotate onion keys? */

Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- router.c	27 May 2005 17:43:43 -0000	1.176
+++ router.c	8 Jun 2005 19:45:17 -0000	1.177
@@ -500,8 +500,8 @@
 void consider_publishable_server(time_t now, int force) {
   if (decide_if_publishable_server(now)) {
     set_server_advertised(1);
-    router_rebuild_descriptor(force);
-    router_upload_dir_desc_to_dirservers(force);
+    if (router_rebuild_descriptor(force) == 0)
+      router_upload_dir_desc_to_dirservers(force);
   } else {
     set_server_advertised(0);
   }