November 2019 - tor-commits - lists.torproject.org

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Nov '19

15 Nov '19

commit 5c1dd66c34ac1fae4ccc6e7666da716d1a926fbf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 15 09:53:08 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/contents+es.po b/contents+es.po index 709f8373c..591dca905 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3251,7 +3251,7 @@ msgid "" "not make you anonymous on the Internet." msgstr "" "A pesar de que el nombre puede indicar lo contrario, el \"modo incógnito\" y" -" las \"pestañas privadas\" no te hacen anónimo en internet." +" las \"pestañas privadas\" no te hacen anónimo en Internet." #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -3261,8 +3261,8 @@ msgid "" "activity or digital fingerprint online." msgstr "" "Estos modos borran la información de tu ordenador relativa a la sesión de " -"navegación recien terminada, pero no aplican ninguna medida para esconder tu" -" actividad o la huella que dejas en internet." +"navegación recién terminada, pero no aplican ninguna medida para esconder tu" +" actividad o la huella que dejas en Internet." #: https//support.torproject.org/tbb/tbb-and-incognito-mode/ #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description) @@ -3282,7 +3282,7 @@ msgid "" "browsing session that's fully obfuscated from end-to-end." msgstr "" "El Navegador Tor ofrece todas las características amnésicas de las " -"\"pestañas privadas\" a la vez que también oculta tu dirección IP, las " +"\"pestañas privadas\", a la vez que también oculta tu dirección IP, las " "páginas que visitas y detalles sobre tu dispositivo que podrían ser " "utilizados para trazar un perfil sobre tu actividad en la web, permitiendo " "una navegación realmente privada que es camuflada de principio a fin." @@ -3310,7 +3310,7 @@ msgstr "Se supone que tengo que \"editar mi torrc\". ¿Que significa esto?" msgid "" "WARNING: Do NOT follow random advice instructing you to edit your `torrc`!" msgstr "" -"PRECAUCIÓN: ¡NO sigas instrucciones de ningún desconocido que te diga como " +"PRECAUCIÓN: ¡NO sigas instrucciones de ningún desconocido que te diga cómo " "cambiar las opciones del archivo `torrc`!" #: https//support.torproject.org/tbb/tbb-editing-torrc/ @@ -3319,8 +3319,8 @@ msgid "" "Doing so can allow an attacker to compromise your security and anonymity " "through malicious configuration of your `torrc`." msgstr "" -"Ello podría causar que un adversario diera al traste con tu seguridad y/o tu" -" anonimato mediante unos ajustes maliciosos en tu archivo `torrc`." +"Ello podría causar que un adversario comprometa tu seguridad y/o tu " +"anonimato mediante unos ajustes maliciosos en tu archivo `torrc`." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3328,8 +3328,8 @@ msgid "" "Tor uses a text file called `torrc` that contains configuration instructions" " for how Tor should behave." msgstr "" -"Tor utiliza un archivo de texto llamado `torrc` que contiene las " -"instrucciones de configuración que marcan como ha de comportarse Tor." +"Tor usa un archivo de texto llamado `torrc` que contiene las instrucciones " +"de configuración que marcan cómo ha de comportarse Tor." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3337,7 +3337,7 @@ msgid "" "The default configuration should work fine for most Tor users (hence the " "warning above.)" msgstr "" -"La configuración por defecto debería de funcionar bien para la mayoríade " +"La configuración por defecto debería funcionar bien para la mayoría de " "usuarios (de ahí la advertencia anterior)." #: https//support.torproject.org/tbb/tbb-editing-torrc/ @@ -3375,7 +3375,7 @@ msgid "" "* The `torrc` is in the Tor Browser Data directory at `~/Library/Application" " Support/TorBrowser-Data/Tor`." msgstr "" -"* El archivo `torrc`se encuentra el el directorio de datos del Navegador Tor" +"* El archivo `torrc`se encuentra en el directorio de datos del Navegador Tor" " en `~/Library/Application Support/TorBrowser-Data/Tor`." #: https//support.torproject.org/tbb/tbb-editing-torrc/

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Nov '19

15 Nov '19

commit cf61b3b461e1ed7ff32af6ea12619978fbafd6df Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 15 08:53:07 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+es.po b/contents+es.po index 4b2691b43..709f8373c 100644 --- a/contents+es.po +++ b/contents+es.po @@ -352,7 +352,7 @@ msgid "" "[NoScript](https://noscript.net) — and adding anything else could " "deanonymize you." msgstr "" -"El Navegador Tor ya trae instalado dos complementos - [HTTPS " +"El Navegador Tor ya trae dos complementos instalados - [HTTPS " "Everywhere](https://www.eff.org/https-everywhere) y " "[NoScript](https://noscript.net) - y añadir cualquier otra cosa podría " "desanonimizarte." @@ -2908,9 +2908,9 @@ msgid "" " deter or block Tor use. The error message about an infected machine should " "clear up again after a short time." msgstr "" -"Hasta donde nosotros sabemos, Google no está haciendo nada intencionado para" -" obstaculizar el uso de Tor. El mensaje de error sobre ordenadores " -"infectados desaparece normalmente al cabo de poco tiempo." +"Según nuestra perspectiva, Google no está haciendo nada para obstaculizar " +"específicamente el uso de Tor. El mensaje de error sobre ordenadores " +"infectados desaparece por si mismo al cabo de un tiempo." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.title) @@ -3055,7 +3055,7 @@ msgid "" "[Firewalled](https://2019.www.torproject.org/docs/faq.html.en#FirewallPorts)" " clients for how to restrict what ports your Tor will try to access." msgstr "" -"Si tus servidores proxy solo te permiten conectar a ciertos puertos, lee la " +"Si tus servidores proxy sólo te permiten conectar a ciertos puertos, lee la " "página [clientes detrás de un " "cortafuegos](https://2019.www.torproject.org/docs/faq.html.en#FirewallPorts)" " para saber como restringir los puertos a los que Tor intentará conectarse."

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 15 Nov '19

15 Nov '19

commit 012bb067e360354be1f1952531fed952500a5d11 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 15 08:49:54 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 81 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/contents+es.po b/contents+es.po index e7819eb19..77dc7a24d 100644 --- a/contents+es.po +++ b/contents+es.po @@ -4,9 +4,9 @@ # David Figuera <dfb(a)fastmail.com>, 2019 # erinm, 2019 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019 -# Emma Peel, 2019 # Nicolas Sera-Leyva <nseraleyva(a)internews.org>, 2019 # strel, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-08 10:34+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: strel, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -331,8 +331,8 @@ msgid "" "mirrors, either through [EFF](https://tor.eff.org), [Calyx " "Institute](https://tor.calyxinstitute.org) or [CCC](https://tor.ccc.de)." msgstr "" -"Si no eres capaz de descargar el Tor Browser del sitio web oficial del " -"Proyecto Tor, puedes tratar de descargarlo de uno de nuestros sitios espejo " +"Si no puedes descargar el Tor Browser del sitio web oficial del Proyecto " +"Tor, puedes tratar de descargarlo de uno de nuestros espejos (mirrors) " "oficiales, tanto a través de [EFF](https://tor.eff.org), como [Calyx " "Institute](https://tor.calyxinstitute.org) o [CCC](https://tor.ccc.de)." @@ -679,7 +679,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "### TIPOS DE TRANSPORTE INSERTABLE" +msgstr "### TIPOS DE TRANSPORTE CONECTABLE" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -687,8 +687,8 @@ msgid "" "Currently there are three pluggable transports available, but more are being" " developed." msgstr "" -"Actualmente, hay tres transportes conectables disponibles, pero más están " -"siendo desarrollados." +"Actualmente, hay tres transportes conectables disponibles, pero se están " +"dessarrollando más." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -729,7 +729,7 @@ msgid "" msgstr "" "obfs4 hace que el tráfico Tor luzca aleatorio, y también previene que los " "censores encuentren puentes mediante el escaneo de Internet. Los puentes " -"obfs4 es menos probable que se bloqueen que los antetiores puentes obfs3." +"obfs4 es menos probable que se bloqueen que los anteriores puentes obfs3." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -781,7 +781,7 @@ msgstr "</table>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### USING PLUGGABLE TRANSPORTS" -msgstr "### USAR TRANSPORTES INSERTABLES" +msgstr "### USAR TRANSPORTES CONECTABLES" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -807,7 +807,7 @@ msgid "" "'Connect' to save your settings." msgstr "" "Una vez que hayas seleccionado el transporte conectable que te gustaría " -"usar, cliqueá 'Conectar' para guardar tus ajustes." +"usar, haz clic en 'Conectar' para guardar tus ajustes." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -827,9 +827,9 @@ msgid "" "If you are trying to circumvent a blocked connection for the first time, you" " should try the different transports: obfs4, snowflake, and meek-azure." msgstr "" -"Si es la primera vez que intentas eludir una conexión bloqueada, has de " -"probar con los distintos transportes que hay disponibles: obfs4, snowflake y" -" meek-azure." +"Si es la primera vez que intentas usar una conexión censurada, has de probar" +" con los distintos transportes que hay disponibles: obfs4, snowflake y meek-" +"azure." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -838,7 +838,7 @@ msgid "" "need to enter bridge addresses manually." msgstr "" "Si pruebas todas estas opciones y no consigues conectar con ninguna de " -"ellas, necesitarás introducir direcciones de puentes de red manualmente. " +"ellas, necesitarás introducir direcciones de puentes de red manualmente." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -846,8 +846,8 @@ msgid "" "Read the [Bridges](/en-US/bridges/) section to learn what bridges are and " "how to obtain them." msgstr "" -"Lee la sección de [Puentes](/en-US/bridges/) para saber qué son los " -"repetidores puente y cómo obtenerlos." +"Lee la sección de [Puentes](/es/bridges/) para saber qué son los repetidores" +" puente y cómo obtenerlos." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) @@ -869,8 +869,8 @@ msgid "" "Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use " "of “bridge” relays." msgstr "" -"La mayoría de los [Transportes Conectables](/circumvention), como obfs4, se " -"basan en el uso de repetidores \"puente\"." +"La mayoría de los [Transportes Conectables](/es/circumvention), como obfs4, " +"se basan en el uso de repetidores \"puente\"." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -955,8 +955,9 @@ msgid "" "Otherwise, click on 'Preferences' in the hamburger menu (main menu) and then" " on 'Tor' in the sidebar." msgstr "" -" De otra manera, cliqueá el Botón Tor a la izquierda de de la barra URL, " -"luego seleccioná 'Ajustes de red de Tor...' para acceder a éstas opciones." +" También puedes hacer clic en el Botón Tor a la izquierda de de la barra " +"URL, luego selecciona 'Ajustes de red de Tor...' para acceder a éstas " +"opciones." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1134,9 +1135,9 @@ msgstr "" "otros nodos en el circuito. A los efectos de evitar los ataques que tratan " "de trazar un perfil, el nodo Guarda cambia solamente cada 2-3 meses, a " "diferencia de los otros nodos, que cambian con cada nuevo dominio. Para más " -"información acerca de Guardas, consulta las <a " -"href=\"/es/docs/faq#EntryGuards\">Preguntas Más Frecuentes</a> y el <a " -"href=\"https://support.torproject.org/es/tbb/tbb-2/\">Portal de Soporte</a>." +"información acerca de Guardas, consulta las [Preguntas Más " +"Frecuentes](https://www.torproject.org/docs/faq#EntryGuards) y el [Portal de" +" Soporte](https://support.torproject.org/es/tbb/tbb-2/)." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1189,8 +1190,8 @@ msgid "" "information on how to secure your connection when logging in." msgstr "" "* Mira la página [Conexiones seguras](/es/secure-connections) para conocer " -"información importante sobre como protegerte cuando inicias sesión en otras " -"páginas." +"información importante sobre cómo protegerte cuando inicias sesión en sitios" +" web." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1273,14 +1274,14 @@ msgid "" " does not clear any private information or unlink your activity, nor does it" " affect your current connections to other websites." msgstr "" -"Esta opción es útil si el <a href=\"/es/about/#how-tor-works\">repetidor de " -"salida</a> que estás usando no puede conectar al sitio web que solicitas, o " -"no está cargando adecuadamente. Seleccionarla provocará que la pestaña " -"actualmente activa se recargue sobre un nuevo circuito de Tor. Otras " -"pestañas y ventanas abiertas para el mismo sitio web también usarán el nuevo" -" circuito una vez sean recargadas. Esta opción no borra ninguna información " -"privada ni desvincula tu actividad, y tampoco afecta a tus conexiones " -"actuales a otros sitios web." +"Esta opción es útil si el [repetidor de salida](/es/about/#how-tor-works) " +"que estás usando no puede conectar al sitio web que solicitas, o no está " +"cargando adecuadamente. Seleccionarla provocará que la pestaña actualmente " +"activa se recargue sobre un nuevo circuito de Tor. Otras pestañas y ventanas" +" abiertas para el mismo sitio web también usarán el nuevo circuito una vez " +"sean recargadas. Esta opción no borra ninguna información privada ni " +"desvincula tu actividad, y tampoco afecta a tus conexiones actuales a otros " +"sitios web." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1338,8 +1339,8 @@ msgid "" "connections)." msgstr "" "* Todo el tráfico entre los usuarios de Tor y los servicios cebolla está " -"cifrado de extremo-a-extremo, por lo que no hace falta preocuparse de <a " -"href=\"/es/secure-connections\">conectar a través de HTTPS</a>." +"cifrado de extremo-a-extremo, por lo que no hace falta preocuparse de " +"[conectar a través de HTTPS](/es/secure-connections)." #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1357,7 +1358,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### HOW TO ACCESS AN ONION SERVICE" -msgstr "### COMO ACCEDER UN SERVICIO CEBOLLA" +msgstr "### COMO ACCEDER A UN SERVICIO CEBOLLA" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1495,8 +1496,8 @@ msgid "" "degree of usability you require." msgstr "" "Al incrementar el nivel de seguridad del Navegador Tor algunas páginas web " -"dejarán de funcionar apropiadamente, de manera que debieras sopesar tus " -"necesidades de seguridad en contra del grado de usabilidad que requieres." +"dejarán de funcionar apropiadamente, de manera que deberías sopesar tus " +"necesidades de seguridad contra del grado de usabilidad que requieres." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1509,7 +1510,7 @@ msgid "" "The Security Settings can be accessed by clicking the Shield icon next to " "the Tor Browser URL bar." msgstr "" -"Puedes acceder a la Configuración de Seguridad haciendo clic en el ícono " +"Puedes acceder a la Configuración de Seguridad haciendo clic en el icono " "Escudo, próximo a la barra URL del Tor Browser." #: https//tb-manual.torproject.org/security-settings/ @@ -1627,7 +1628,7 @@ msgid "" "to-play." msgstr "" "* Javascript está deshabilitado por defecto en todos los sitios; algunas " -"fuentes, íconos, símbolos matemáticos, e imágenes están deshabilitados; " +"fuentes, iconos, símbolos matemáticos, e imágenes están deshabilitados; " "audio y vídeo (medios HTML5) son hacer-clic-para-reproducir." #: https//tb-manual.torproject.org/updating/

1 0

[tor/master] dirauth: Remove a HAVE_MODULE_DIRAUTH inside a function
by teor＠torproject.org 15 Nov '19

15 Nov '19

commit ef00b1ce0fee88a6b4bac0baa4798f55f7a0a20f Author: teor <teor(a)torproject.org> Date: Thu Nov 14 15:43:27 2019 +1000 dirauth: Remove a HAVE_MODULE_DIRAUTH inside a function There are now no HAVE_MODULE_{DIRAUTH,RELAY} inside functions. Closes ticket 32163. --- changes/ticket32163 | 3 +++ src/feature/dirauth/reachability.h | 31 +++++++++++-------------------- src/feature/nodelist/routerlist.c | 2 -- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/changes/ticket32163 b/changes/ticket32163 new file mode 100644 index 000000000..06ea838f0 --- /dev/null +++ b/changes/ticket32163 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove the last remaining HAVE_MODULE_DIRAUTH inside a function. + Closes ticket 32163. diff --git a/src/feature/dirauth/reachability.h b/src/feature/dirauth/reachability.h index 46d0e7ee2..d100908de 100644 --- a/src/feature/dirauth/reachability.h +++ b/src/feature/dirauth/reachability.h @@ -24,10 +24,10 @@ #define REACHABILITY_TEST_CYCLE_PERIOD \ (REACHABILITY_TEST_INTERVAL*REACHABILITY_MODULO_PER_TEST) +#ifdef HAVE_MODULE_DIRAUTH void dirserv_single_reachability_test(time_t now, routerinfo_t *router); void dirserv_test_reachability(time_t now); -#ifdef HAVE_MODULE_DIRAUTH int dirserv_should_launch_reachability_test(const routerinfo_t *ri, const routerinfo_t *ri_old); void dirserv_orconn_tls_done(const tor_addr_t *addr, @@ -35,25 +35,16 @@ void dirserv_orconn_tls_done(const tor_addr_t *addr, const char *digest_rcvd, const struct ed25519_public_key_t *ed_id_rcvd); #else /* !defined(HAVE_MODULE_DIRAUTH) */ -static inline int -dirserv_should_launch_reachability_test(const routerinfo_t *ri, - const routerinfo_t *ri_old) -{ - (void)ri; - (void)ri_old; - return 0; -} -static inline void -dirserv_orconn_tls_done(const tor_addr_t *addr, - uint16_t or_port, - const char *digest_rcvd, - const struct ed25519_public_key_t *ed_id_rcvd) -{ - (void)addr; - (void)or_port; - (void)digest_rcvd; - (void)ed_id_rcvd; -} +#define dirserv_single_reachability_test(now, router) \ + (((void)(now)),((void)(router))) +#define dirserv_test_reachability(now) \ + (((void)(now))) + +#define dirserv_should_launch_reachability_test(ri, ri_old) \ + (((void)(ri)),((void)(ri_old)),0) +#define dirserv_orconn_tls_done(addr, or_port, digest_rcvd, ed_id_rcvd) \ + (((void)(addr)),((void)(or_port)),((void)(digest_rcvd)), \ + ((void)(ed_id_rcvd))) #endif /* defined(HAVE_MODULE_DIRAUTH) */ #endif /* !defined(TOR_REACHABILITY_H) */ diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 0cd7a76a9..0709a3bbe 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -1936,9 +1936,7 @@ routerlist_descriptors_added(smartlist_t *sl, int from_cache) learned_bridge_descriptor(ri, from_cache); if (ri->needs_retest_if_added) { ri->needs_retest_if_added = 0; -#ifdef HAVE_MODULE_DIRAUTH dirserv_single_reachability_test(approx_time(), ri); -#endif } } SMARTLIST_FOREACH_END(ri); }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1533'
by teor＠torproject.org 15 Nov '19

15 Nov '19

commit b58e5091b7f442568a10e949fec4ee901c809b12 Merge: d8d36c7dc ef00b1ce0 Author: teor <teor(a)torproject.org> Date: Fri Nov 15 12:11:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1533' changes/ticket32163 | 3 +++ src/feature/dirauth/reachability.h | 31 +++++++++++-------------------- src/feature/nodelist/routerlist.c | 2 -- 3 files changed, 14 insertions(+), 22 deletions(-)

1 0

[tor/master] relay: Disable relay_periodic when the relay module is disabled
by teor＠torproject.org 15 Nov '19

15 Nov '19

commit 88c2a23c4b3954b321d2247ca3d66cff68e1912d Author: teor <teor(a)torproject.org> Date: Thu Nov 14 16:17:17 2019 +1000 relay: Disable relay_periodic when the relay module is disabled Closes ticket 32244. --- changes/ticket32244 | 3 +++ src/core/include.am | 2 +- src/feature/relay/relay_periodic.h | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/changes/ticket32244 b/changes/ticket32244 new file mode 100644 index 000000000..b3690b7d8 --- /dev/null +++ b/changes/ticket32244 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Disable relay_periodic when the relay module is disabled. + Closes ticket 32244. diff --git a/src/core/include.am b/src/core/include.am index 193b10a1c..5cafc4121 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -143,7 +143,6 @@ LIBTOR_APP_A_SOURCES = \ src/feature/relay/dns.c \ src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ - src/feature/relay/relay_periodic.c \ src/feature/relay/relay_sys.c \ src/feature/relay/router.c \ src/feature/relay/routerkeys.c \ @@ -174,6 +173,7 @@ LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) MODULE_RELAY_SOURCES = \ src/feature/relay/routermode.c \ src/feature/relay/relay_config.c \ + src/feature/relay/relay_periodic.c \ src/feature/relay/transport_config.c # The Directory Authority module. diff --git a/src/feature/relay/relay_periodic.h b/src/feature/relay/relay_periodic.h index b6ea83c74..8da5b536a 100644 --- a/src/feature/relay/relay_periodic.h +++ b/src/feature/relay/relay_periodic.h @@ -12,7 +12,20 @@ #ifndef TOR_FEATURE_RELAY_RELAY_PERIODIC_H #define TOR_FEATURE_RELAY_RELAY_PERIODIC_H +#ifdef HAVE_MODULE_RELAY + void relay_register_periodic_events(void); void reschedule_descriptor_update_check(void); +#else + +#include "lib/cc/compat_compiler.h" + +#define relay_register_periodic_events() \ + STMT_NIL +#define reschedule_descriptor_update_check() \ + STMT_NIL + +#endif + #endif /* !defined(TOR_FEATURE_RELAY_RELAY_PERIODIC_H) */

1 0

[tor/master] relay: Disable relay_sys when the relay module is disabled
by teor＠torproject.org 15 Nov '19

15 Nov '19

commit 0df8bcfb6fc31fabccf480f5a153174360dffc7a Author: teor <teor(a)torproject.org> Date: Thu Nov 14 16:27:06 2019 +1000 relay: Disable relay_sys when the relay module is disabled Closes ticket 32245. --- changes/ticket32245 | 3 +++ src/app/main/subsystem_list.c | 4 +++- src/core/include.am | 2 +- src/feature/dirauth/dirauth_sys.h | 4 ++++ src/feature/relay/relay_sys.h | 4 ++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/changes/ticket32245 b/changes/ticket32245 new file mode 100644 index 000000000..fc79e748b --- /dev/null +++ b/changes/ticket32245 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Disable relay_sys when the relay module is disabled. + Closes ticket 32245. diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 4a40702e7..a343207c1 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -18,7 +18,6 @@ #include "core/or/or_sys.h" #include "core/or/orconn_event_sys.h" #include "feature/control/btrack_sys.h" -#include "feature/relay/relay_sys.h" #include "lib/compress/compress_sys.h" #include "lib/crypt_ops/crypto_sys.h" #include "lib/err/torerr_sys.h" @@ -33,6 +32,7 @@ #include "lib/evloop/evloop_sys.h" #include "feature/dirauth/dirauth_sys.h" +#include "feature/relay/relay_sys.h" #include <stddef.h> @@ -66,7 +66,9 @@ const subsys_fns_t *tor_subsystems[] = { &sys_mainloop, &sys_or, +#ifdef HAVE_MODULE_RELAY &sys_relay, +#endif #ifdef HAVE_MODULE_DIRAUTH &sys_dirauth, diff --git a/src/core/include.am b/src/core/include.am index 5cafc4121..868e3c49d 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -143,7 +143,6 @@ LIBTOR_APP_A_SOURCES = \ src/feature/relay/dns.c \ src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ - src/feature/relay/relay_sys.c \ src/feature/relay/router.c \ src/feature/relay/routerkeys.c \ src/feature/relay/selftest.c \ @@ -174,6 +173,7 @@ MODULE_RELAY_SOURCES = \ src/feature/relay/routermode.c \ src/feature/relay/relay_config.c \ src/feature/relay/relay_periodic.c \ + src/feature/relay/relay_sys.c \ src/feature/relay/transport_config.c # The Directory Authority module. diff --git a/src/feature/dirauth/dirauth_sys.h b/src/feature/dirauth/dirauth_sys.h index 2d5a0cb3e..86c8d8ba3 100644 --- a/src/feature/dirauth/dirauth_sys.h +++ b/src/feature/dirauth/dirauth_sys.h @@ -12,6 +12,10 @@ #ifndef DIRAUTH_SYS_H #define DIRAUTH_SYS_H +#ifdef HAVE_MODULE_DIRAUTH + extern const struct subsys_fns_t sys_dirauth; +#endif + #endif /* !defined(DIRAUTH_SYS_H) */ diff --git a/src/feature/relay/relay_sys.h b/src/feature/relay/relay_sys.h index 32e21d90d..aa387369b 100644 --- a/src/feature/relay/relay_sys.h +++ b/src/feature/relay/relay_sys.h @@ -12,6 +12,10 @@ #ifndef TOR_FEATURE_RELAY_RELAY_SYS_H #define TOR_FEATURE_RELAY_RELAY_SYS_H +#ifdef HAVE_MODULE_RELAY + extern const struct subsys_fns_t sys_relay; +#endif + #endif /* !defined(TOR_FEATURE_RELAY_RELAY_SYS_H) */

1 0

[tor/master] Run "make autostyle"
by teor＠torproject.org 15 Nov '19

15 Nov '19

commit d19f370aa2dbffe72587b6af9f7119a36ea7c25a Author: teor <teor(a)torproject.org> Date: Thu Nov 14 16:28:39 2019 +1000 Run "make autostyle" --- src/app/main/subsysmgr.c | 2 +- src/feature/relay/relay_periodic.h | 4 ++-- src/lib/conf/confdecl.h | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/main/subsysmgr.c b/src/app/main/subsysmgr.c index 8be4a7d75..ca23b5df9 100644 --- a/src/app/main/subsysmgr.c +++ b/src/app/main/subsysmgr.c @@ -385,7 +385,7 @@ subsystems_get_state_idx(const subsys_fns_t *sys) tor_assert(i >= 0); return sys_status[i].state_idx; } -#endif +#endif /* defined(TOR_UNIT_TESTS) */ /** * Call all appropriate set_options() methods to tell the various subsystems diff --git a/src/feature/relay/relay_periodic.h b/src/feature/relay/relay_periodic.h index 8da5b536a..84bc8a978 100644 --- a/src/feature/relay/relay_periodic.h +++ b/src/feature/relay/relay_periodic.h @@ -17,7 +17,7 @@ void relay_register_periodic_events(void); void reschedule_descriptor_update_check(void); -#else +#else /* !defined(HAVE_MODULE_RELAY) */ #include "lib/cc/compat_compiler.h" @@ -26,6 +26,6 @@ void reschedule_descriptor_update_check(void); #define reschedule_descriptor_update_check() \ STMT_NIL -#endif +#endif /* defined(HAVE_MODULE_RELAY) */ #endif /* !defined(TOR_FEATURE_RELAY_RELAY_PERIODIC_H) */ diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h index 26c71e1d4..294a1e717 100644 --- a/src/lib/conf/confdecl.h +++ b/src/lib/conf/confdecl.h @@ -134,7 +134,7 @@ .initvalue = initval \ }, /**@}*/ -#endif +#endif /* !defined(COCCI) */ /** Type aliases for the "commonly used" configuration types. * diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index 20c61696c..e867012f4 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -296,7 +296,7 @@ crypto_openssl_init_engines(const char *accelName, return -1; } return 0; -#else +#else /* !defined(DISABLE_ENGINES) */ ENGINE *e = NULL; log_info(LD_CRYPTO, "Initializing OpenSSL engine support.");

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1535'
by teor＠torproject.org 15 Nov '19

15 Nov '19

commit 825f52784d875ee580fe82619302a21c958d77ea Merge: b58e5091b d19f370aa Author: teor <teor(a)torproject.org> Date: Fri Nov 15 12:11:32 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1535' changes/ticket32244 | 3 +++ changes/ticket32245 | 3 +++ src/app/main/subsysmgr.c | 2 +- src/app/main/subsystem_list.c | 4 +++- src/core/include.am | 4 ++-- src/feature/dirauth/dirauth_sys.h | 4 ++++ src/feature/relay/relay_periodic.h | 13 +++++++++++++ src/feature/relay/relay_sys.h | 4 ++++ src/lib/conf/confdecl.h | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +- 10 files changed, 35 insertions(+), 6 deletions(-)

1 0

[tor/master] Avoid redundant typedef of or_options_t and smartlist_t in *_config.h
by teor＠torproject.org 15 Nov '19

15 Nov '19

commit d57a04b6481a0cccd475c31ed5547767c4b9df89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 14 10:52:21 2019 -0500 Avoid redundant typedef of or_options_t and smartlist_t in *_config.h Fixes bug 32495. --- src/feature/dirauth/dirauth_config.h | 28 +++++++------- src/feature/relay/relay_config.h | 72 ++++++++++++++++++------------------ src/feature/relay/transport_config.h | 18 ++++----- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/feature/dirauth/dirauth_config.h b/src/feature/dirauth/dirauth_config.h index 655ab0a7f..b494ca685 100644 --- a/src/feature/dirauth/dirauth_config.h +++ b/src/feature/dirauth/dirauth_config.h @@ -12,31 +12,31 @@ #ifndef TOR_FEATURE_DIRAUTH_DIRAUTH_CONFIG_H #define TOR_FEATURE_DIRAUTH_DIRAUTH_CONFIG_H -typedef struct or_options_t or_options_t; +struct or_options_t; #ifdef HAVE_MODULE_DIRAUTH #include "lib/cc/torint.h" -int options_validate_dirauth_mode(const or_options_t *old_options, - or_options_t *options, +int options_validate_dirauth_mode(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_validate_dirauth_bandwidth(const or_options_t *old_options, - or_options_t *options, +int options_validate_dirauth_bandwidth(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_validate_dirauth_schedule(const or_options_t *old_options, - or_options_t *options, +int options_validate_dirauth_schedule(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_validate_dirauth_testing(const or_options_t *old_options, - or_options_t *options, +int options_validate_dirauth_testing(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_act_dirauth(const or_options_t *old_options); -int options_act_dirauth_mtbf(const or_options_t *old_options); -int options_act_dirauth_stats(const or_options_t *old_options, +int options_act_dirauth(const struct or_options_t *old_options); +int options_act_dirauth_mtbf(const struct or_options_t *old_options); +int options_act_dirauth_stats(const struct or_options_t *old_options, bool *print_notice_out); #else /* !defined(HAVE_MODULE_DIRAUTH) */ @@ -47,8 +47,8 @@ int options_act_dirauth_stats(const or_options_t *old_options, * Returns -1 and sets msg to a newly allocated string, if AuthoritativeDir * is set in options. Otherwise returns 0. */ static inline int -options_validate_dirauth_mode(const or_options_t *old_options, - or_options_t *options, +options_validate_dirauth_mode(const struct or_options_t *old_options, + struct or_options_t *options, char **msg) { (void)old_options; diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h index 5c36b43bd..57e6ddf94 100644 --- a/src/feature/relay/relay_config.h +++ b/src/feature/relay/relay_config.h @@ -12,80 +12,80 @@ #ifndef TOR_FEATURE_RELAY_RELAY_CONFIG_H #define TOR_FEATURE_RELAY_RELAY_CONFIG_H -typedef struct or_options_t or_options_t; +struct or_options_t; #ifdef HAVE_MODULE_RELAY #include "lib/cc/torint.h" #include "lib/testsupport/testsupport.h" -typedef struct smartlist_t smartlist_t; +struct smartlist_t; -int options_validate_relay_mode(const or_options_t *old_options, - or_options_t *options, +int options_validate_relay_mode(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); MOCK_DECL(const char*, relay_get_dirportfrontpage, (void)); void relay_config_free_all(void); -uint32_t relay_get_effective_bwrate(const or_options_t *options); -uint32_t relay_get_effective_bwburst(const or_options_t *options); +uint32_t relay_get_effective_bwrate(const struct or_options_t *options); +uint32_t relay_get_effective_bwburst(const struct or_options_t *options); -void port_warn_nonlocal_ext_orports(const smartlist_t *ports, +void port_warn_nonlocal_ext_orports(const struct smartlist_t *ports, const char *portname); -int port_parse_ports_relay(or_options_t *options, +int port_parse_ports_relay(struct or_options_t *options, char **msg, - smartlist_t *ports_out, + struct smartlist_t *ports_out, int *have_low_ports_out); -void port_update_port_set_relay(or_options_t *options, - const smartlist_t *ports); +void port_update_port_set_relay(struct or_options_t *options, + const struct smartlist_t *ports); -int options_validate_relay_os(const or_options_t *old_options, - or_options_t *options, +int options_validate_relay_os(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_validate_relay_info(const or_options_t *old_options, - or_options_t *options, +int options_validate_relay_info(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_validate_publish_server(const or_options_t *old_options, - or_options_t *options, +int options_validate_publish_server(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_validate_relay_padding(const or_options_t *old_options, - or_options_t *options, +int options_validate_relay_padding(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_validate_relay_bandwidth(const or_options_t *old_options, - or_options_t *options, +int options_validate_relay_bandwidth(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_validate_relay_accounting(const or_options_t *old_options, - or_options_t *options, +int options_validate_relay_accounting(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_validate_relay_testing(const or_options_t *old_options, - or_options_t *options, +int options_validate_relay_testing(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); -int options_act_relay(const or_options_t *old_options); -int options_act_relay_accounting(const or_options_t *old_options); -int options_act_relay_bandwidth(const or_options_t *old_options); -int options_act_bridge_stats(const or_options_t *old_options); +int options_act_relay(const struct or_options_t *old_options); +int options_act_relay_accounting(const struct or_options_t *old_options); +int options_act_relay_bandwidth(const struct or_options_t *old_options); +int options_act_bridge_stats(const struct or_options_t *old_options); -int options_act_relay_stats(const or_options_t *old_options, +int options_act_relay_stats(const struct or_options_t *old_options, bool *print_notice_out); void options_act_relay_stats_msg(void); -int options_act_relay_desc(const or_options_t *old_options); -int options_act_relay_dos(const or_options_t *old_options); -int options_act_relay_dir(const or_options_t *old_options); +int options_act_relay_desc(const struct or_options_t *old_options); +int options_act_relay_dos(const struct or_options_t *old_options); +int options_act_relay_dir(const struct or_options_t *old_options); #ifdef RELAY_CONFIG_PRIVATE STATIC int check_bridge_distribution_setting(const char *bd); -STATIC int have_enough_mem_for_dircache(const or_options_t *options, +STATIC int have_enough_mem_for_dircache(const struct or_options_t *options, size_t total_mem, char **msg); #endif /* defined(RELAY_CONFIG_PRIVATE) */ @@ -102,8 +102,8 @@ STATIC int have_enough_mem_for_dircache(const or_options_t *options, * Returns -1 and sets msg to a newly allocated string, if ORPort, DirPort, * DirCache, or BridgeRelay are set in options. Otherwise returns 0. */ static inline int -options_validate_relay_mode(const or_options_t *old_options, - or_options_t *options, +options_validate_relay_mode(const struct or_options_t *old_options, + struct or_options_t *options, char **msg) { (void)old_options; diff --git a/src/feature/relay/transport_config.h b/src/feature/relay/transport_config.h index d3cceb369..38f804b4b 100644 --- a/src/feature/relay/transport_config.h +++ b/src/feature/relay/transport_config.h @@ -16,21 +16,21 @@ #include "lib/testsupport/testsupport.h" -typedef struct or_options_t or_options_t; -typedef struct smartlist_t smartlist_t; +struct or_options_t; +struct smartlist_t; -int options_validate_server_transport(const or_options_t *old_options, - or_options_t *options, +int options_validate_server_transport(const struct or_options_t *old_options, + struct or_options_t *options, char **msg); char *pt_get_bindaddr_from_config(const char *transport); -smartlist_t *pt_get_options_for_server_transport(const char *transport); +struct smartlist_t *pt_get_options_for_server_transport(const char *transport); -int options_act_server_transport(const or_options_t *old_options); +int options_act_server_transport(const struct or_options_t *old_options); #ifdef RELAY_TRANSPORT_CONFIG_PRIVATE -STATIC smartlist_t *get_options_from_transport_options_line( +STATIC struct smartlist_t *get_options_from_transport_options_line( const char *line, const char *transport); @@ -45,8 +45,8 @@ STATIC smartlist_t *get_options_from_transport_options_line( * ServerTransportPlugin, ServerTransportListenAddr, or * ServerTransportOptions are set in options. Otherwise returns 0. */ static inline int -options_validate_server_transport(const or_options_t *old_options, - or_options_t *options, +options_validate_server_transport(const struct or_options_t *old_options, + struct or_options_t *options, char **msg) { (void)old_options;

1 0