nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

if you're an auth dir server, always publish your dirport,

Browse Source 
even if you haven't yet found yourself to be reachable.

this is the cause of Jan Tore Morken's recent or-talk bug.


svn:r4575
This commit is contained in:
Roger Dingledine 2005-07-15 18:49:35 +00:00
parent 83dc42055d
commit 97174b67c2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/router.c
View File

@ -830,6 +830,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
const char *cp;
routerinfo_t *ri_tmp;
#endif
or_options_t *options = get_options();
/* Make sure the identity key matches the one in the routerinfo. */
if (crypto_pk_cmp_keys(ident_key, router->identity_pkey)) {
@ -888,7 +889,8 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
router->nickname,
router->address,
router->or_port,
check_whether_dirport_reachable() ? router->dir_port : 0,
(authdir_mode(options) || check_whether_dirport_reachable()) ?
router->dir_port : 0,
router->platform,
published,
fingerprint,
@ -909,9 +911,9 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
/* From now on, we use 'written' to remember the current length of 's'. */
written = result;
if (get_options()->ContactInfo && strlen(get_options()->ContactInfo)) {
if (options->ContactInfo && strlen(options->ContactInfo)) {
result = tor_snprintf(s+written,maxlen-written, "contact %s\n",
get_options()->ContactInfo);
options->ContactInfo);
if (result<0)
return -1;
written += result;