mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Actually, bail out of routerstatus_format_entry() if fmt_addr32() fails
This commit is contained in:
@@ -54,22 +54,23 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version,
|
||||
smartlist_t *chunks = smartlist_new();
|
||||
|
||||
const char *ip_str = fmt_addr32(rs->addr);
|
||||
if (ip_str[0] == '\0')
|
||||
goto err;
|
||||
|
||||
format_iso_time(published, rs->published_on);
|
||||
digest_to_base64(identity64, rs->identity_digest);
|
||||
digest_to_base64(digest64, rs->descriptor_digest);
|
||||
|
||||
if (ip_str[0])
|
||||
smartlist_add_asprintf(chunks,
|
||||
"r %s %s %s%s%s %s %d %d\n",
|
||||
rs->nickname,
|
||||
identity64,
|
||||
(format==NS_V3_CONSENSUS_MICRODESC)?"":digest64,
|
||||
(format==NS_V3_CONSENSUS_MICRODESC)?"":" ",
|
||||
published,
|
||||
ip_str,
|
||||
(int)rs->or_port,
|
||||
(int)rs->dir_port);
|
||||
smartlist_add_asprintf(chunks,
|
||||
"r %s %s %s%s%s %s %d %d\n",
|
||||
rs->nickname,
|
||||
identity64,
|
||||
(format==NS_V3_CONSENSUS_MICRODESC)?"":digest64,
|
||||
(format==NS_V3_CONSENSUS_MICRODESC)?"":" ",
|
||||
published,
|
||||
ip_str,
|
||||
(int)rs->or_port,
|
||||
(int)rs->dir_port);
|
||||
|
||||
/* TODO: Maybe we want to pass in what we need to build the rest of
|
||||
* this here, instead of in the caller. Then we could use the
|
||||
|
||||
Reference in New Issue
Block a user