diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-03-22 03:45:17 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-03-22 03:45:17 +0000 |
| commit | 1db263ac3c4eeaa531727228a5c5075764905d7b (patch) | |
| tree | 7d3bec5b72787a0ff4bad788927260e889253cd2 | |
| parent | 805754fdd92035c8b640ba269d8912073478fe9f (diff) | |
| download | tor-1db263ac3c4eeaa531727228a5c5075764905d7b.tar.gz tor-1db263ac3c4eeaa531727228a5c5075764905d7b.zip | |
stop writing the "router.desc" file, ever. nothing uses it anymore.
svn:r6224
| -rw-r--r-- | src/or/main.c | 4 | ||||
| -rw-r--r-- | src/or/router.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 0e3274bc26..d98fe86d75 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -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; } diff --git a/src/or/router.c b/src/or/router.c index c1b78a9110..83adc82ace 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -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); |