[or-cvs] stop writing the "router.desc" file, ever. nothing uses it ...

[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:
	main.c router.c 
Log Message:
stop writing the "router.desc" file, ever. nothing uses it anymore.


Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -p -d -r1.636 -r1.637
--- main.c	21 Mar 2006 21:58:00 -0000	1.636
+++ main.c	22 Mar 2006 03:45:17 -0000	1.637
@@ -1096,11 +1096,12 @@ do_hup(void)
    * force a retry there. */
 
   if (server_mode(options)) {
-    const char *descriptor;
+//    const char *descriptor;
     /* Restart cpuworker and dnsworker processes, so they get up-to-date
      * configuration options. */
     cpuworkers_rotate();
     dnsworkers_rotate();
+#if 0
     /* Write out a fresh descriptor, but leave old one on failure. */
     router_rebuild_descriptor(1);
     descriptor = router_get_my_descriptor();
@@ -1112,6 +1113,7 @@ do_hup(void)
         return 0;
       }
     }
+#endif
   }
   return 0;
 }

Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -d -r1.256 -r1.257
--- router.c	22 Mar 2006 03:40:59 -0000	1.256
+++ router.c	22 Mar 2006 03:45:17 -0000	1.257
@@ -311,7 +311,7 @@ init_keys(void)
     log_err(LD_GENERAL,"Error initializing TLS context");
     return -1;
   }
-  /* 4. Dump router descriptor to 'router.desc' */
+  /* 4. Build our router descriptor. */
   /* Must be called after keys are initialized. */
   mydesc = router_get_my_descriptor();
   if (!mydesc) {
@@ -332,11 +332,13 @@ init_keys(void)
     }
   }
 
+#if 0
   tor_snprintf(keydir,sizeof(keydir),"%s/router.desc", datadir);
   log_info(LD_GENERAL,"Dumping descriptor to \"%s\"...",keydir);
   if (write_str_to_file(keydir, mydesc,0)) {
     return -1;
   }
+#endif
   /* 5. Dump fingerprint to 'fingerprint' */
   tor_snprintf(keydir,sizeof(keydir),"%s/fingerprint", datadir);
   log_info(LD_GENERAL,"Dumping fingerprint to \"%s\"...",keydir);