March 2018 - tor-commits - lists.torproject.org

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 1c0707a9e7e0b0271a341f2ff0659a95a37e89e5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 21:46:39 2018 +0000 Update translations for tails-misc --- pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 21519bc59..9165c0b3e 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-28 21:15+0000\n" +"PO-Revision-Date: 2018-03-28 21:20+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -135,12 +135,12 @@ msgstr "Os seus programas adicionais foram instalados" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:178 msgid "Your additional software are ready to use." -msgstr "" +msgstr "Os seus programas adicionais estão prontos para serem usados. " #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:194 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:204 msgid "Your additional software upgrade failed" -msgstr "" +msgstr "A atualização dos seus programas adicionais falhou" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:195 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit e55e6f3a908900d85dbda835e705d4057c0282ca Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 21:16:38 2018 +0000 Update translations for tails-misc --- pt_BR.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 6221a6316..21519bc59 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-28 20:12+0000\n" +"PO-Revision-Date: 2018-03-28 21:15+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -121,17 +121,17 @@ msgstr "não disponível" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:170 msgid "Your additional software installation failed" -msgstr "" +msgstr "A instalação dos programas adicionais falhou" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:171 msgid "" "The installation failed. Please check your additional software " "configuration, or read the system log to understand better the problem." -msgstr "" +msgstr "A instalação falhou. Por favor, verifique as configurações dos seus programas adicionais ou leia o log do sistema para entender melhor o problema." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:177 msgid "Your additional software are installed" -msgstr "" +msgstr "Os seus programas adicionais foram instalados" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:178 msgid "Your additional software are ready to use." @@ -245,7 +245,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual\"" -msgstr "" +msgstr "\"Não há memória suficiente para procurar por atualizações.\n\nVerifique se o sistema cumpre os requerimentos para executar Tails\nConsulte o documento:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nTente reiniciar Tails para procurar por atualizações novamente\n\nOu faça a atualização manualmente\nConsulte https://tails.boum.org/doc/first_steps/upgrade#manual\"" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 0dcb7ae0fbea2a70e610fe289c5073b050e26c5a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 20:16:38 2018 +0000 Update translations for tails-misc --- pt_BR.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 15e83cb74..6221a6316 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-28 19:44+0000\n" +"PO-Revision-Date: 2018-03-28 20:12+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -59,14 +59,14 @@ msgstr "<h1>Ajude a consertar o erro que você encontrou!</h1>\nLeia <a href= #: config/chroot_local-includes/usr/local/bin/electrum:57 msgid "Persistence is disabled for Electrum" -msgstr "O Persistência está desabilitado para usar Electrum" +msgstr "O volume persistente está desabilitado para usar Electrum" #: config/chroot_local-includes/usr/local/bin/electrum:59 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." -msgstr "Ao reiniciar o Tails, todos os dados do Electrum serão perdidos, inclusive as carteiras de Bitcoin. Assim, o mais recomendado é executar Electrum quando a funcionalidade 'Persistente' estiver ativada." +msgstr "Ao reiniciar Tails, todos os dados do Electrum serão perdidos, inclusive as carteiras de Bitcoin. Assim, o mais recomendado é executar Electrum quando a funcionalidade 'Persistente' estiver ativada." #: config/chroot_local-includes/usr/local/bin/electrum:60 msgid "Do you want to start Electrum anyway?" @@ -269,7 +269,7 @@ msgstr "Tanto o sistema operacional hospedeiro quanto o programa de virtualizaç #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:76 msgid "Warning: non-free virtual machine detected!" -msgstr "Aviso: máquina virtual non-free detectada!" +msgstr "Aviso: máquina virtual de software não-livre (proprietário) detectada!" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:78 msgid "" @@ -277,7 +277,7 @@ msgid "" "monitor what you are doing in Tails. Only free software can be considered " "trustworthy, for both the host operating system and the virtualization " "software." -msgstr "Tando sistema operacional hospedeiro quanto o programa de virtualização podem monitorar a sua atividade no Tails. Somente os programas livres podem ser considerados confiáveis, em relação ao sistema operacional hospedeiro e ao programa de virtualização. " +msgstr "Tanto o sistema operacional hospedeiro quanto o programa de virtualização podem monitorar a sua atividade no Tails. Somente os programas livres podem ser considerados confiáveis, em relação ao sistema operacional hospedeiro e ao programa de virtualização. " #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:83 msgid "Learn more" @@ -304,7 +304,7 @@ msgid "" "Network activity within the Unsafe Browser is not anonymous.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." -msgstr "A atividade de rede no Navegador é não é anônima.\\nUse o Navegador somente se for necessário, por exemplo\\nse você tiver de fazer login ou registrar para ativar asua conexão de Internet.." +msgstr "A atividade de rede no Navegador não é anônima.\\nUse o Navegador Sem Segurança somente se for necessário, por exemplo\\nse você tiver de fazer login ou registrar-se para ativar a sua conexão de Internet." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 3f7716f52d242294cd557e641dece2a21c4a58bf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 19:46:41 2018 +0000 Update translations for tails-misc --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 882496869..15e83cb74 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-28 14:01+0000\n" +"PO-Revision-Date: 2018-03-28 19:44+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -162,7 +162,7 @@ msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." -msgstr "A atualização falhou. Isto pode ser devido a um problema de rede. Por favor, verifique a sua conexão de rede, tente reiniciar o Tails ou leia o registro do sistema para compreender melhor o problema." +msgstr "A atualização falhou. Isso pode ser devido a um problema de rede. Por favor, verifique a sua conexão de rede, tente reiniciar Tails ou leia o registro do sistema para compreender melhor o problema." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock"

1 0

[tor/master] Clear all control.c flags on control_free_all()
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 3519d0c8086edeade8d550f230caa3f95e4d2cdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 23 11:31:56 2018 -0400 Clear all control.c flags on control_free_all() Fixes bug 25512. --- changes/bug25512 | 5 +++++ src/or/control.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug25512 b/changes/bug25512 new file mode 100644 index 000000000..4b6491867 --- /dev/null +++ b/changes/bug25512 @@ -0,0 +1,5 @@ + o Minor bugfixes (restart-in-process): + - When shutting down, Tor now clears all the flags in the control.c + module. This should prevent a bug where authentication cookies + are not generated on restart. Fixes bug 25512; bugfix on 0.3.3.1-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 7786e1648..edbc2f70f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7602,6 +7602,11 @@ control_free_all(void) bootstrap_percent = BOOTSTRAP_STATUS_UNDEF; notice_bootstrap_percent = 0; bootstrap_problems = 0; + authentication_cookie_is_set = 0; + global_event_mask = 0; + disable_log_messages = 0; + memset(last_sent_bootstrap_message, 0, sizeof(last_sent_bootstrap_message)); + flush_queued_event_pending = 0; } #ifdef TOR_UNIT_TESTS

1 0

[tor/master] Remove uncompilable tor_mmap_file fallback. #25398
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 45d3b5fa4cd1ee2bdcbefcf5a33073b301733e46 Author: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> Date: Fri Mar 2 09:49:35 2018 -0500 Remove uncompilable tor_mmap_file fallback. #25398 --- changes/bug25398 | 2 ++ src/common/compat.c | 36 ++---------------------------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/changes/bug25398 b/changes/bug25398 new file mode 100644 index 000000000..5f3fd7f5e --- /dev/null +++ b/changes/bug25398 @@ -0,0 +1,2 @@ + o Minor bugfixes (portability): + - Remove uncompilable tor_mmap_file fallback. Fixes bug 25398. diff --git a/src/common/compat.c b/src/common/compat.c index e8916c8d1..9457b8289 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -417,40 +417,8 @@ tor_munmap_file(tor_mmap_t *handle) return 0; } #else -tor_mmap_t * -tor_mmap_file(const char *filename) -{ - struct stat st; - char *res = read_file_to_str(filename, RFTS_BIN|RFTS_IGNORE_MISSING, &st); - tor_mmap_t *handle; - if (! res) - return NULL; - handle = tor_malloc_zero(sizeof(tor_mmap_t)); - handle->data = res; - handle->size = st.st_size; - return handle; -} - -/** Unmap the file mapped with tor_mmap_file(), and return 0 for success - * or -1 for failure. - */ - -int -tor_munmap_file(tor_mmap_t *handle) -{ - char *d = NULL; - if (handle == NULL) - return 0; - - d = (char*)handle->data; - tor_free(d); - memwipe(handle, 0, sizeof(tor_mmap_t)); - tor_free(handle); - - /* Can't fail in this mmap()/munmap()-free case */ - return 0; -} -#endif /* defined(COMPAT_HAS_MMAN_AND_PAGESIZE) || ... || ... */ +#error "cannot implement tor_mmap_file" +#endif /* defined(HAVE_MMAP) || ... || ... */ /** Replacement for snprintf. Differs from platform snprintf in two * ways: First, always NUL-terminates its output. Second, always

1 0

[tor/master] Make check-changes pass on changes/bug25398
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 99641c93ce84f2e013c3dc2d96e368456b0ab930 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 14:48:36 2018 -0400 Make check-changes pass on changes/bug25398 --- changes/bug25398 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/changes/bug25398 b/changes/bug25398 index 5f3fd7f5e..3ea69c5b1 100644 --- a/changes/bug25398 +++ b/changes/bug25398 @@ -1,2 +1,3 @@ - o Minor bugfixes (portability): - - Remove uncompilable tor_mmap_file fallback. Fixes bug 25398. + o New system requirements: + - Tor no longer compiles on systems without mmap() or some local + equivalent. Closes ticket 25398.

1 0

[tor/master] Merge remote-tracking branch 'public/bug25512'
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 4c0e434f33d937f43b49dc707718d73e5aea23b7 Merge: cb083b5d3 3519d0c80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 14:45:47 2018 -0400 Merge remote-tracking branch 'public/bug25512' changes/bug25512 | 5 +++++ src/or/control.c | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'hello71/bug25398'
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 2f872f9762128228e98f74bf7cb53aed54aee088 Merge: 4c0e434f3 45d3b5fa4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 14:47:05 2018 -0400 Merge remote-tracking branch 'hello71/bug25398' changes/bug25398 | 2 ++ src/common/compat.c | 36 ++---------------------------------- 2 files changed, 4 insertions(+), 34 deletions(-)

1 0

[tor/master] Refactor: suppress duplicated functions from router.c and encapsulate NODE_DESC_BUF_LEN constant.
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 8775c93a996fd864b1747c04eebe51534425ff51 Author: Caio Valente <valentecaio95(a)gmail.com> Date: Tue Mar 6 20:42:32 2018 +0100 Refactor: suppress duplicated functions from router.c and encapsulate NODE_DESC_BUF_LEN constant. Also encapsulates format_node_description(). Closes ticket 25432. --- changes/ticket25432 | 6 +++ src/or/dirserv.c | 4 +- src/or/or.h | 4 +- src/or/router.c | 104 ++++++++++++++++++++-------------------------------- src/or/router.h | 18 --------- 5 files changed, 49 insertions(+), 87 deletions(-) diff --git a/changes/ticket25432 b/changes/ticket25432 new file mode 100644 index 000000000..2179770f6 --- /dev/null +++ b/changes/ticket25432 @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - Merge functions used for describing nodes and suppress the functions + that do not allocate memory for the output buffer string. + - NODE_DESC_BUF_LEN constant and format_node_description() function + cannot be used externally from router.c module anymore. + - Closes ticket 25432. Patch by valentecaio. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 7a693b9d4..7dae5ee9d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -858,13 +858,13 @@ directory_remove_invalid(void) SMARTLIST_FOREACH_BEGIN(nodes, node_t *, node) { const char *msg = NULL; + const char *description; routerinfo_t *ent = node->ri; - char description[NODE_DESC_BUF_LEN]; uint32_t r; if (!ent) continue; r = dirserv_router_get_status(ent, &msg, LOG_INFO); - router_get_description(description, ent); + description = router_describe(ent); if (r & FP_REJECT) { log_info(LD_DIRSERV, "Router %s is now rejected: %s", description, msg?msg:""); diff --git a/src/or/or.h b/src/or/or.h index 045cdd9e1..ecee534fe 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2343,10 +2343,10 @@ typedef struct routerstatus_t { * If it's a descriptor, we only use the first DIGEST_LEN bytes. */ char descriptor_digest[DIGEST256_LEN]; uint32_t addr; /**< IPv4 address for this router, in host order. */ - uint16_t or_port; /**< OR port for this router. */ + uint16_t or_port; /**< IPv4 OR port for this router. */ uint16_t dir_port; /**< Directory port for this router. */ tor_addr_t ipv6_addr; /**< IPv6 address for this router. */ - uint16_t ipv6_orport; /**<IPV6 OR port for this router. */ + uint16_t ipv6_orport; /**< IPv6 OR port for this router. */ unsigned int is_authority:1; /**< True iff this router is an authority. */ unsigned int is_exit:1; /**< True iff this router is a good exit. */ unsigned int is_stable:1; /**< True iff this router stays up a long time. */ diff --git a/src/or/router.c b/src/or/router.c index 991c7138c..e5996f665 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -103,6 +103,13 @@ static authority_cert_t *legacy_key_certificate = NULL; * used by tor-gencert to sign new signing keys and make new key * certificates. */ +const char *format_node_description(char *buf, + const char *id_digest, + int is_named, + const char *nickname, + const tor_addr_t *addr, + uint32_t addr32h); + /** Replace the current onion key with k. Does not affect * lastonionkey; to update lastonionkey correctly, call rotate_onion_key(). */ @@ -3453,6 +3460,15 @@ is_legal_hexdigest(const char *s) strspn(s,HEX_CHARACTERS)==HEX_DIGEST_LEN); } +/** + * Longest allowed output of format_node_description, plus 1 character for + * NUL. This allows space for: + * "$FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF~xxxxxxxxxxxxxxxxxxx at" + * " [ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255]" + * plus a terminating NUL. + */ +#define NODE_DESC_BUF_LEN (MAX_VERBOSE_NICKNAME_LEN+4+TOR_ADDR_BUF_LEN) + /** Use buf (which must be at least NODE_DESC_BUF_LEN bytes long) to * hold a human-readable description of a node with identity digest * id_digest, named-status is_named, nickname nickname, @@ -3498,15 +3514,16 @@ format_node_description(char *buf, return buf; } -/** Use buf (which must be at least NODE_DESC_BUF_LEN bytes long) to - * hold a human-readable description of ri. - * +/** Return a human-readable description of the routerinfo_t ri. * - * Return a pointer to the front of buf. + * This function is not thread-safe. Each call to this function invalidates + * previous values returned by this function. */ const char * -router_get_description(char *buf, const routerinfo_t *ri) +router_describe(const routerinfo_t *ri) { + static char buf[NODE_DESC_BUF_LEN]; + if (!ri) return "<null>"; return format_node_description(buf, @@ -3517,14 +3534,15 @@ router_get_description(char *buf, const routerinfo_t *ri) ri->addr); } -/** Use buf (which must be at least NODE_DESC_BUF_LEN bytes long) to - * hold a human-readable description of node. +/** Return a human-readable description of the node_t node. * - * Return a pointer to the front of buf. + * This function is not thread-safe. Each call to this function invalidates + * previous values returned by this function. */ const char * -node_get_description(char *buf, const node_t *node) +node_describe(const node_t *node) { + static char buf[NODE_DESC_BUF_LEN]; const char *nickname = NULL; uint32_t addr32h = 0; int is_named = 0; @@ -3549,14 +3567,16 @@ node_get_description(char *buf, const node_t *node) addr32h); } -/** Use buf (which must be at least NODE_DESC_BUF_LEN bytes long) to - * hold a human-readable description of rs. +/** Return a human-readable description of the routerstatus_t rs. * - * Return a pointer to the front of buf. + * This function is not thread-safe. Each call to this function invalidates + * previous values returned by this function. */ const char * -routerstatus_get_description(char *buf, const routerstatus_t *rs) +routerstatus_describe(const routerstatus_t *rs) { + static char buf[NODE_DESC_BUF_LEN]; + if (!rs) return "<null>"; return format_node_description(buf, @@ -3567,14 +3587,16 @@ routerstatus_get_description(char *buf, const routerstatus_t *rs) rs->addr); } -/** Use buf (which must be at least NODE_DESC_BUF_LEN bytes long) to - * hold a human-readable description of ei. +/** Return a human-readable description of the extend_info_t ei. * - * Return a pointer to the front of buf. + * This function is not thread-safe. Each call to this function invalidates + * previous values returned by this function. */ const char * -extend_info_get_description(char *buf, const extend_info_t *ei) +extend_info_describe(const extend_info_t *ei) { + static char buf[NODE_DESC_BUF_LEN]; + if (!ei) return "<null>"; return format_node_description(buf, @@ -3585,54 +3607,6 @@ extend_info_get_description(char *buf, const extend_info_t *ei) 0); } -/** Return a human-readable description of the routerinfo_t ri. - * - * This function is not thread-safe. Each call to this function invalidates - * previous values returned by this function. - */ -const char * -router_describe(const routerinfo_t *ri) -{ - static char buf[NODE_DESC_BUF_LEN]; - return router_get_description(buf, ri); -} - -/** Return a human-readable description of the node_t node. - * - * This function is not thread-safe. Each call to this function invalidates - * previous values returned by this function. - */ -const char * -node_describe(const node_t *node) -{ - static char buf[NODE_DESC_BUF_LEN]; - return node_get_description(buf, node); -} - -/** Return a human-readable description of the routerstatus_t rs. - * - * This function is not thread-safe. Each call to this function invalidates - * previous values returned by this function. - */ -const char * -routerstatus_describe(const routerstatus_t *rs) -{ - static char buf[NODE_DESC_BUF_LEN]; - return routerstatus_get_description(buf, rs); -} - -/** Return a human-readable description of the extend_info_t ei. - * - * This function is not thread-safe. Each call to this function invalidates - * previous values returned by this function. - */ -const char * -extend_info_describe(const extend_info_t *ei) -{ - static char buf[NODE_DESC_BUF_LEN]; - return extend_info_get_description(buf, ei); -} - /** Set buf (which must have MAX_VERBOSE_NICKNAME_LEN+1 bytes) to the * verbose representation of the identity of router. The format is: * A dollar sign. diff --git a/src/or/router.h b/src/or/router.h index 7f5030895..e5efe577e 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -123,24 +123,6 @@ int is_legal_nickname(const char *s); int is_legal_nickname_or_hexdigest(const char *s); int is_legal_hexdigest(const char *s); -/** - * Longest allowed output of format_node_description, plus 1 character for - * NUL. This allows space for: - * "$FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF~xxxxxxxxxxxxxxxxxxx at" - * " [ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255]" - * plus a terminating NUL. - */ -#define NODE_DESC_BUF_LEN (MAX_VERBOSE_NICKNAME_LEN+4+TOR_ADDR_BUF_LEN) -const char *format_node_description(char *buf, - const char *id_digest, - int is_named, - const char *nickname, - const tor_addr_t *addr, - uint32_t addr32h); -const char *router_get_description(char *buf, const routerinfo_t *ri); -const char *node_get_description(char *buf, const node_t *node); -const char *routerstatus_get_description(char *buf, const routerstatus_t *rs); -const char *extend_info_get_description(char *buf, const extend_info_t *ei); const char *router_describe(const routerinfo_t *ri); const char *node_describe(const node_t *node); const char *routerstatus_describe(const routerstatus_t *ri);

1 0