mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-28 14:23:30 +01:00
stop writing the "router.desc" file, ever. nothing uses it anymore.
svn:r6224
This commit is contained in:
parent
805754fdd9
commit
1db263ac3c
@ -1096,11 +1096,12 @@ do_hup(void)
|
|||||||
* force a retry there. */
|
* force a retry there. */
|
||||||
|
|
||||||
if (server_mode(options)) {
|
if (server_mode(options)) {
|
||||||
const char *descriptor;
|
// const char *descriptor;
|
||||||
/* Restart cpuworker and dnsworker processes, so they get up-to-date
|
/* Restart cpuworker and dnsworker processes, so they get up-to-date
|
||||||
* configuration options. */
|
* configuration options. */
|
||||||
cpuworkers_rotate();
|
cpuworkers_rotate();
|
||||||
dnsworkers_rotate();
|
dnsworkers_rotate();
|
||||||
|
#if 0
|
||||||
/* Write out a fresh descriptor, but leave old one on failure. */
|
/* Write out a fresh descriptor, but leave old one on failure. */
|
||||||
router_rebuild_descriptor(1);
|
router_rebuild_descriptor(1);
|
||||||
descriptor = router_get_my_descriptor();
|
descriptor = router_get_my_descriptor();
|
||||||
@ -1112,6 +1113,7 @@ do_hup(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -311,7 +311,7 @@ init_keys(void)
|
|||||||
log_err(LD_GENERAL,"Error initializing TLS context");
|
log_err(LD_GENERAL,"Error initializing TLS context");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
/* 4. Dump router descriptor to 'router.desc' */
|
/* 4. Build our router descriptor. */
|
||||||
/* Must be called after keys are initialized. */
|
/* Must be called after keys are initialized. */
|
||||||
mydesc = router_get_my_descriptor();
|
mydesc = router_get_my_descriptor();
|
||||||
if (!mydesc) {
|
if (!mydesc) {
|
||||||
@ -332,11 +332,13 @@ init_keys(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
tor_snprintf(keydir,sizeof(keydir),"%s/router.desc", datadir);
|
tor_snprintf(keydir,sizeof(keydir),"%s/router.desc", datadir);
|
||||||
log_info(LD_GENERAL,"Dumping descriptor to \"%s\"...",keydir);
|
log_info(LD_GENERAL,"Dumping descriptor to \"%s\"...",keydir);
|
||||||
if (write_str_to_file(keydir, mydesc,0)) {
|
if (write_str_to_file(keydir, mydesc,0)) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
/* 5. Dump fingerprint to 'fingerprint' */
|
/* 5. Dump fingerprint to 'fingerprint' */
|
||||||
tor_snprintf(keydir,sizeof(keydir),"%s/fingerprint", datadir);
|
tor_snprintf(keydir,sizeof(keydir),"%s/fingerprint", datadir);
|
||||||
log_info(LD_GENERAL,"Dumping fingerprint to \"%s\"...",keydir);
|
log_info(LD_GENERAL,"Dumping fingerprint to \"%s\"...",keydir);
|
||||||
|
Loading…
Reference in New Issue
Block a user