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

[tor/master] Annotate subsystem list with their levels.
by nickm＠torproject.org 10 Nov '18

10 Nov '18

commit 91355c0fac0f90ba286edb3d3f12d71d250be16d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 9 22:17:18 2018 -0500 Annotate subsystem list with their levels. --- src/app/main/subsystem_list.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 190e6579d..8640329e9 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -26,15 +26,15 @@ **/ const subsys_fns_t *tor_subsystems[] = { &sys_winprocess, /* -100 */ - &sys_torerr, - &sys_wallclock, - &sys_threads, - &sys_logging, - &sys_time, - &sys_network, - &sys_compress, - &sys_crypto, - &sys_tortls, + &sys_torerr, /* -100 */ + &sys_wallclock, /* -99 */ + &sys_threads, /* -95 */ + &sys_logging, /* -90 */ + &sys_time, /* -90 */ + &sys_network, /* -90 */ + &sys_compress, /* -70 */ + &sys_crypto, /* -60 */ + &sys_tortls, /* -50 */ }; const unsigned n_tor_subsystems = ARRAY_LENGTH(tor_subsystems);

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit a69cfd7f24c60e851bba3437214560b33475c578 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:19:14 2018 +0000 Update translations for support-portal --- contents+fr.po | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 67e041f50..c64baf973 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1592,9 +1592,8 @@ msgid "" "That said, Tor is much faster than it used to be and you may not actually " "notice any change in speed from other browsers." msgstr "" -"Cela dit, Tor est beaucoup plus rapide qu’auparavant, et en pratique, vous " -"ne remarquerez peut-être aucun ralentissement par rapport aux autres " -"navigateurs." +"Cela dit, Tor est beaucoup plus rapide qu’auparavant et vous ne remarquerez " +"peut-être aucun ralentissement par rapport aux autres navigateurs." #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -1637,8 +1636,7 @@ msgstr "" "lanceurs d’alerte, des représentants des forces de l’ordre et bien d’autres." " Malheureusement, la protection que nos logiciels peut fournir à ces groupes" " de personnes peut aussi être détournée par des criminels et des auteurs de " -"programmes malveillants. Le Projet Tor n’appuie ni ne cautionne " -"l’utilisation de nos logiciels à des fins malveillantes." +"programmes malveillants." #: http//localhost/misc/misc-8/ #: (content/misc/misc-8/contents+en.lrquestion.seo_slug) @@ -1657,8 +1655,8 @@ msgid "" "together these relays provide the full privacy protections of Tor." msgstr "" "Le reste de votre circuit change pour chaque nouveau site Web que vous " -"visitez. Ensemble, ces relais fournissent la protection complète de la " -"confidentialité offerte par Tor." +"visitez. Ensemble, ces relais fournissent la protection complète des données" +" personnelles offerte par Tor." #: http//localhost/tbb/tbb-2/ #: (content/tbb/tbb-2/contents+en.lrquestion.seo_slug) @@ -1697,8 +1695,8 @@ msgid "" msgstr "" "Le Navigateur Tor est développé à partir de <mark><a " "href=\"https://www.mozilla.org/en-US/firefox/organizations/\">Firefox " -"ESR</a></mark> (en anglais), et il est donc possible que des erreurs " -"concernant Firefox surviennent." +"ESR</a></mark> et il est donc possible que des erreurs concernant Firefox " +"surviennent." #: http//localhost/tbb/tbb-33/ #: (content/tbb/tbb-33/contents+en.lrquestion.description) @@ -1709,7 +1707,7 @@ msgid "" msgstr "" "Si vous souhaitez devenir un relais, veuillez consulter notre <mark><a " "href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">guide " -"sur les relais Tor</a></mark> (en anglais)." +"sur les relais Tor</a></mark>." #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.seo_slug) @@ -1746,7 +1744,7 @@ msgid "" " experiencing." msgstr "" "Si votre problème n’est pas listé, veuillez remplir un <mark><a " -"href=\"https://trac.torproject.org\">rapport de bogue</a></mark> sur le " +"href=\"https://trac.torproject.org\">relevé de bogue</a></mark> sur le " "problème que vous rencontrez." #: http//localhost/misc/misc-5/ @@ -2068,7 +2066,7 @@ msgstr "* Pour Windows" #: http//localhost/tbb/tbb-26/ #: (content/tbb/tbb-26/contents+en.lrquestion.title) msgid "I'm having a problem with HTTPS Everywhere." -msgstr "J’ai un problème avec HTTPS partout." +msgstr "Je rencontre un problème avec HTTPS partout." #: http//localhost/tbb/tbb-39/ #: (content/tbb/tbb-39/contents+en.lrquestion.seo_slug) @@ -2186,9 +2184,9 @@ msgid "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">volunteer " "page</a></mark> for how to get involved!" msgstr "" -"Notre page <mark><a " -"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">Devenir " -"bénévole</a></mark> (en anglais) explique comment s’impliquer." +"Notre <mark><a " +"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">page sur " +"le bénévolat</a></mark> explique comment s’impliquer." #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.title) @@ -2287,7 +2285,7 @@ msgid "" msgstr "" "De plus amples renseignements sur les dons se trouvent dans notre <mark><a " "href=\"https://donate.torproject.org/donor-faq\">FAQ pour les " -"donateurs</a></mark> (en anglais)." +"donateurs</a></mark>." #: http//localhost/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.seo_slug) @@ -3555,10 +3553,10 @@ msgid "" msgstr "" "Pour de plus amples renseignements sur le fonctionnement des relais de " "garde, consultez cet <mark><a href=\"https://blog.torproject.org/improving-" -"tors-anonymity-changing-guard-parameters\">article de blogue</a></mark> (en " -"anglais) et cet <mark><a href=\"https://www-" -"users.cs.umn.edu/~hoppernj/single_guard.pdf\">article</a></mark>(en anglais)" -" sur les gardes d’entrée." +"tors-anonymity-changing-guard-parameters\">article de blogue</a></mark> et " +"cet <mark><a href=\"https://www-" +"users.cs.umn.edu/~hoppernj/single_guard.pdf\">article</a></mark> sur les " +"gardes d’entrée." #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.title) @@ -3808,9 +3806,9 @@ msgid "" "href=\"https://www.torproject.org/projects/projects.html.en\">projects " "page</a></mark>." msgstr "" -"Une liste (en anglais) de tous nos projets de logiciels se trouve sur notre " -"<mark><a href=\"https://www.torproject.org/projects/projects.html.en\">page " -"de projets</a></mark>." +"Une liste de tous nos projets de logiciels se trouve sur notre <mark><a " +"href=\"https://www.torproject.org/projects/projects.html.en\">page de " +"projets</a></mark>." #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -4378,10 +4376,10 @@ msgid "" "Browser</a></mark> document further explains the thinking behind this " "design." msgstr "" -"Vous trouverez de plus amples renseignements à ce sujet dans le document " +"Les réflexions liées à cette conception sont expliquées dans le document " "<mark><a href=\"https://www.torproject.org/projects/torbrowser/design" -"/#identifier-linkability\">La conception et la mise en œuvre du " -"Navigateur</a></mark> Tor (en anglais)." +"/#identifier-linkability\">La conception et la mise en œuvre du Navigateur " +"Tor</a></mark>." #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description)

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit 754ae4e98b9a729550a8a07f9b6075203f8ac10c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:19:08 2018 +0000 Update translations for whisperback_completed --- fr/fr.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index af47eb2c4..47729531f 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,22 +3,23 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# AO <ao(a)localizationlab.org>, 2018 # arpalord <inactive+arpalord(a)transifex.com>, 2012 # Brendan Abolivier <transifex(a)brendanabolivier.com>, 2018 -# AO French coordinator <ao(a)localizationlab.org>, 2017-2018 -# AO French coordinator <ao(a)localizationlab.org>, 2016-2017 +# AO <ao(a)localizationlab.org>, 2017-2018 +# AO <ao(a)localizationlab.org>, 2016-2017 # MaK <>, 2012 # Onizuka, 2013 # Onizuka, 2013 # Tails developpers <amnesia(a)boum.org>, 2011 -# AO French coordinator <ao(a)localizationlab.org>, 2015 +# AO <ao(a)localizationlab.org>, 2015 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2018-08-07 12:34+0000\n" -"Last-Translator: AO French coordinator <ao(a)localizationlab.org>\n" +"PO-Revision-Date: 2018-11-09 20:09+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,7 +105,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "\n\nLe rapport de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau. Veuillez essayer de vous reconnecter au réseau et recliquer sur envoyer.\n\nSi cela ne fonctionne pas, l’on vous proposera d’enregistrer le rapport de bogue." +msgstr "\n\nLe relevé de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau. Veuillez essayer de vous reconnecter au réseau et recliquer sur envoyer.\n\nSi cela ne fonctionne pas, l’on vous proposera d’enregistrer le relevé de bogue." #: ../whisperBack/gui.py:222 msgid "Your message has been sent." @@ -127,7 +128,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "Le rapport de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau.\n\nPour contourner le problème, vous pouvez enregistrer le rapport de bogue sous forme de fichier sur une clé USB et essayer de nous l’envoyer à %s à partir de votre compte de courriel en utilisant un autre système. Prenez note que votre rapport de bogue ne sera pas anonyme de cette façon, à moins que vous ne preniez des précautions supplémentaires (p. ex. en utilisant Tor avec un compte de courriel jetable).\n\nVoulez-vous enregistrer le rapport de bogue dans un fichier ?" +msgstr "Le relevé de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau.\n\nPour contourner le problème, vous pouvez enregistrer le relevé de bogue sous forme de fichier sur une clé USB et essayer de nous l’envoyer à %s à partir de votre compte de courriel en utilisant un autre système. Prenez note que votre relevé de bogue ne sera pas anonyme de cette façon, à moins que vous ne preniez des précautions supplémentaires (p. ex. en utilisant Tor avec un compte de courriel jetable).\n\nVoulez-vous enregistrer le relevé de bogue dans un fichier ?" #: ../whisperBack/gui.py:332 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -200,7 +201,7 @@ msgstr "Aide :" #: ../data/whisperback.ui.h:25 msgid "Read our bug reporting guidelines." -msgstr "Lire nos directives concernant les rapports de bogue." +msgstr "Lire nos directives concernant les relevés de bogue." #: ../data/whisperback.ui.h:26 msgid "Email address (if you want an answer from us)"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit c569e63a776adace737c67f21f87cb3a0e11a078 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:19:03 2018 +0000 Update translations for whisperback --- fr/fr.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index af47eb2c4..47729531f 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,22 +3,23 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# AO <ao(a)localizationlab.org>, 2018 # arpalord <inactive+arpalord(a)transifex.com>, 2012 # Brendan Abolivier <transifex(a)brendanabolivier.com>, 2018 -# AO French coordinator <ao(a)localizationlab.org>, 2017-2018 -# AO French coordinator <ao(a)localizationlab.org>, 2016-2017 +# AO <ao(a)localizationlab.org>, 2017-2018 +# AO <ao(a)localizationlab.org>, 2016-2017 # MaK <>, 2012 # Onizuka, 2013 # Onizuka, 2013 # Tails developpers <amnesia(a)boum.org>, 2011 -# AO French coordinator <ao(a)localizationlab.org>, 2015 +# AO <ao(a)localizationlab.org>, 2015 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2018-08-07 12:34+0000\n" -"Last-Translator: AO French coordinator <ao(a)localizationlab.org>\n" +"PO-Revision-Date: 2018-11-09 20:09+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,7 +105,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "\n\nLe rapport de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau. Veuillez essayer de vous reconnecter au réseau et recliquer sur envoyer.\n\nSi cela ne fonctionne pas, l’on vous proposera d’enregistrer le rapport de bogue." +msgstr "\n\nLe relevé de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau. Veuillez essayer de vous reconnecter au réseau et recliquer sur envoyer.\n\nSi cela ne fonctionne pas, l’on vous proposera d’enregistrer le relevé de bogue." #: ../whisperBack/gui.py:222 msgid "Your message has been sent." @@ -127,7 +128,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "Le rapport de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau.\n\nPour contourner le problème, vous pouvez enregistrer le rapport de bogue sous forme de fichier sur une clé USB et essayer de nous l’envoyer à %s à partir de votre compte de courriel en utilisant un autre système. Prenez note que votre rapport de bogue ne sera pas anonyme de cette façon, à moins que vous ne preniez des précautions supplémentaires (p. ex. en utilisant Tor avec un compte de courriel jetable).\n\nVoulez-vous enregistrer le rapport de bogue dans un fichier ?" +msgstr "Le relevé de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau.\n\nPour contourner le problème, vous pouvez enregistrer le relevé de bogue sous forme de fichier sur une clé USB et essayer de nous l’envoyer à %s à partir de votre compte de courriel en utilisant un autre système. Prenez note que votre relevé de bogue ne sera pas anonyme de cette façon, à moins que vous ne preniez des précautions supplémentaires (p. ex. en utilisant Tor avec un compte de courriel jetable).\n\nVoulez-vous enregistrer le relevé de bogue dans un fichier ?" #: ../whisperBack/gui.py:332 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -200,7 +201,7 @@ msgstr "Aide :" #: ../data/whisperback.ui.h:25 msgid "Read our bug reporting guidelines." -msgstr "Lire nos directives concernant les rapports de bogue." +msgstr "Lire nos directives concernant les relevés de bogue." #: ../data/whisperback.ui.h:26 msgid "Email address (if you want an answer from us)"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit b80d6216284ff2871f96e8eac51442b0f5fa4752 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:16:09 2018 +0000 Update translations for tails-misc_completed --- fr.po | 90 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/fr.po b/fr.po index 849df3399..de916f2ef 100644 --- a/fr.po +++ b/fr.po @@ -29,8 +29,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-15 14:47+0200\n" -"PO-Revision-Date: 2018-10-25 16:58+0000\n" +"POT-Creation-Date: 2018-10-31 16:04+0100\n" +"PO-Revision-Date: 2018-11-09 20:08+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -62,7 +62,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\n<p>Lisez <a href=\"%s\">nos instructions de rapport de bogue</a>.</p>\n<p><strong>N’incluez pas plus d’informations personnelles que nécessaire !</strong></p>\n<h2>Nous donner une adresse courriel</h2>\n<p>\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n</p>\n" +msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\n<p>Lisez <a href=\"%s\">nos instructions de relevé de bogue</a>.</p>\n<p><strong>N’incluez pas plus d’informations personnelles que nécessaire !</strong></p>\n<h2>Nous donner une adresse courriel</h2>\n<p>\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n</p>\n" #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51 msgid "" @@ -166,91 +166,91 @@ msgstr "Informations de version :\n%s" msgid "not available" msgstr "non disponible" -#. Translators: Don't translate {details}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:144 +#. Translators: Don't translate {details}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 #, python-brace-format msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." msgstr "{details} Veuillez consulter votre liste de logiciels supplémentaires ou lire le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:149 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 msgid "" "Please check your list of additional software or read the system log to " "understand the problem." msgstr "Veuillez consulter votre liste de logiciels supplémentaires ou lire le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Show Log" msgstr "Afficher le journal" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Configure" msgstr "Configurer" -#. Translators: Don't translate {beginning} or {last}, they are placeholders -#. and will be replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:218 +#. Translators: Don't translate {beginning} or {last}, they are +#. placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:222 #, python-brace-format msgid "{beginning} and {last}" msgstr "{beginning} et {last}" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:219 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223 msgid ", " msgstr ", " -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:284 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313 +#. Translators: Don't translate {packages}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 #, python-brace-format msgid "Add {packages} to your additional software?" msgstr "Ajouter {packages} à vos logiciels supplémentaire ?" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291 msgid "" "To install it automatically from your persistent storage when starting " "Tails." msgstr "Pour l’installer automatiquement à partir de votre espace de stockage persistant lors du démarrage de Tails." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:288 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293 msgid "Install Every Time" msgstr "Installer toutes les fois" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325 msgid "Install Only Once" msgstr "Installer une seul fois seulement" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371 msgid "The configuration of your additional software failed." msgstr "Échec de configuration de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321 msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the <b>Additional Software</b> feature." msgstr "Pour l’installer automatiquement lors du démarrage de Tails, vous pouvez créer un espace de stockage persistant et activer la fonction <b> Logiciels supplémentaires</b>." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:318 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 msgid "Create Persistent Storage" msgstr "Créer un espace de stockage persistant" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:326 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:332 msgid "Creating your persistent storage failed." msgstr "Échec de création de votre espace de stockage persistant. " -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:334 +#. Translators: Don't translate {packages}, it's a placeholder and +#. will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:341 #, python-brace-format msgid "You could install {packages} automatically when starting Tails" msgstr "Vous pourriez installer {packages} automatiquement lors du démarrage de Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:337 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344 msgid "" "To do so, you need to run Tails from a USB stick installed using <i>Tails " "Installer</i>." @@ -258,56 +258,56 @@ msgstr "Pour ce faire, vous devez exécuter Tails à partir d’une clé USB ins #. Translators: Don't translate {packages}, it's a placeholder and will be #. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:351 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359 #, python-brace-format msgid "Remove {packages} from your additional software?" msgstr "Supprimer {packages} de vos logiciels supplémentaires ?" -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:354 +#. Translators: Don't translate {packages}, it's a placeholder +#. and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363 #, python-brace-format msgid "This will stop installing {packages} automatically." msgstr "Cela arrêtera l’installation automatique de {packages}." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:356 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365 msgid "Remove" msgstr "Supprimer" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:357 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" msgstr "Annuler" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:531 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544 msgid "Installing your additional software from persistent storage..." msgstr "Installation de vos logiciels supplémentaires à partir de votre espace de stockage persistant…" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:533 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546 msgid "This can take several minutes." msgstr "Cela peut prendre plusieurs minutes." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:545 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559 msgid "The installation of your additional software failed" msgstr "Échec d’installation de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:560 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:574 msgid "Additional software installed successfully" msgstr "Les logiciels supplémentaires ont été installés avec succès" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:580 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594 msgid "The check for upgrades of your additional software failed" msgstr "Échec de recherche de mises à niveau de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:582 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:590 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:596 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604 msgid "" "Please check your network connection, restart Tails, or read the system log " "to understand the problem." msgstr "Veuillez vérifier votre connexion réseau, redémarrer Tails, ou consulter le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:589 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603 msgid "The upgrade of your additional software failed" msgstr "Échec de mise à niveau de vos logiciels supplémentaires."

1 0

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

09 Nov '18

commit 0f65a3f9c3bd0efcbaec58bdaba2a0d66ad26ac4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:16:04 2018 +0000 Update translations for tails-misc --- fr.po | 90 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/fr.po b/fr.po index 849df3399..de916f2ef 100644 --- a/fr.po +++ b/fr.po @@ -29,8 +29,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-15 14:47+0200\n" -"PO-Revision-Date: 2018-10-25 16:58+0000\n" +"POT-Creation-Date: 2018-10-31 16:04+0100\n" +"PO-Revision-Date: 2018-11-09 20:08+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -62,7 +62,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\n<p>Lisez <a href=\"%s\">nos instructions de rapport de bogue</a>.</p>\n<p><strong>N’incluez pas plus d’informations personnelles que nécessaire !</strong></p>\n<h2>Nous donner une adresse courriel</h2>\n<p>\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n</p>\n" +msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\n<p>Lisez <a href=\"%s\">nos instructions de relevé de bogue</a>.</p>\n<p><strong>N’incluez pas plus d’informations personnelles que nécessaire !</strong></p>\n<h2>Nous donner une adresse courriel</h2>\n<p>\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n</p>\n" #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51 msgid "" @@ -166,91 +166,91 @@ msgstr "Informations de version :\n%s" msgid "not available" msgstr "non disponible" -#. Translators: Don't translate {details}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:144 +#. Translators: Don't translate {details}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 #, python-brace-format msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." msgstr "{details} Veuillez consulter votre liste de logiciels supplémentaires ou lire le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:149 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 msgid "" "Please check your list of additional software or read the system log to " "understand the problem." msgstr "Veuillez consulter votre liste de logiciels supplémentaires ou lire le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Show Log" msgstr "Afficher le journal" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Configure" msgstr "Configurer" -#. Translators: Don't translate {beginning} or {last}, they are placeholders -#. and will be replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:218 +#. Translators: Don't translate {beginning} or {last}, they are +#. placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:222 #, python-brace-format msgid "{beginning} and {last}" msgstr "{beginning} et {last}" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:219 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223 msgid ", " msgstr ", " -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:284 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313 +#. Translators: Don't translate {packages}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 #, python-brace-format msgid "Add {packages} to your additional software?" msgstr "Ajouter {packages} à vos logiciels supplémentaire ?" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291 msgid "" "To install it automatically from your persistent storage when starting " "Tails." msgstr "Pour l’installer automatiquement à partir de votre espace de stockage persistant lors du démarrage de Tails." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:288 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293 msgid "Install Every Time" msgstr "Installer toutes les fois" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325 msgid "Install Only Once" msgstr "Installer une seul fois seulement" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371 msgid "The configuration of your additional software failed." msgstr "Échec de configuration de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321 msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the <b>Additional Software</b> feature." msgstr "Pour l’installer automatiquement lors du démarrage de Tails, vous pouvez créer un espace de stockage persistant et activer la fonction <b> Logiciels supplémentaires</b>." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:318 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 msgid "Create Persistent Storage" msgstr "Créer un espace de stockage persistant" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:326 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:332 msgid "Creating your persistent storage failed." msgstr "Échec de création de votre espace de stockage persistant. " -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:334 +#. Translators: Don't translate {packages}, it's a placeholder and +#. will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:341 #, python-brace-format msgid "You could install {packages} automatically when starting Tails" msgstr "Vous pourriez installer {packages} automatiquement lors du démarrage de Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:337 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344 msgid "" "To do so, you need to run Tails from a USB stick installed using <i>Tails " "Installer</i>." @@ -258,56 +258,56 @@ msgstr "Pour ce faire, vous devez exécuter Tails à partir d’une clé USB ins #. Translators: Don't translate {packages}, it's a placeholder and will be #. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:351 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359 #, python-brace-format msgid "Remove {packages} from your additional software?" msgstr "Supprimer {packages} de vos logiciels supplémentaires ?" -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:354 +#. Translators: Don't translate {packages}, it's a placeholder +#. and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363 #, python-brace-format msgid "This will stop installing {packages} automatically." msgstr "Cela arrêtera l’installation automatique de {packages}." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:356 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365 msgid "Remove" msgstr "Supprimer" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:357 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" msgstr "Annuler" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:531 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544 msgid "Installing your additional software from persistent storage..." msgstr "Installation de vos logiciels supplémentaires à partir de votre espace de stockage persistant…" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:533 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546 msgid "This can take several minutes." msgstr "Cela peut prendre plusieurs minutes." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:545 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559 msgid "The installation of your additional software failed" msgstr "Échec d’installation de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:560 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:574 msgid "Additional software installed successfully" msgstr "Les logiciels supplémentaires ont été installés avec succès" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:580 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594 msgid "The check for upgrades of your additional software failed" msgstr "Échec de recherche de mises à niveau de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:582 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:590 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:596 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604 msgid "" "Please check your network connection, restart Tails, or read the system log " "to understand the problem." msgstr "Veuillez vérifier votre connexion réseau, redémarrer Tails, ou consulter le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:589 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603 msgid "The upgrade of your additional software failed" msgstr "Échec de mise à niveau de vos logiciels supplémentaires."

1 0

[tor/master] Move the code that knows our tor version into a lowest-level lib
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 6e7ff8cba0efaf803e3ef5b5aba4123633fe0658 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 1 12:33:22 2018 -0400 Move the code that knows our tor version into a lowest-level lib --- .gitignore | 2 ++ Makefile.am | 2 ++ src/app/config/config.c | 41 +------------------------ src/app/config/config.h | 2 -- src/app/config/statefile.c | 1 + src/app/main/main.c | 1 + src/feature/control/control.c | 1 + src/feature/dirauth/shared_random_state.c | 1 + src/feature/relay/router.c | 1 + src/include.am | 1 + src/lib/log/.may_include | 3 +- src/lib/log/include.am | 8 ----- src/lib/log/log.c | 2 +- src/lib/version/.may_include | 3 ++ src/lib/{log => version}/git_revision.c | 2 +- src/lib/{log => version}/git_revision.h | 0 src/lib/version/include.am | 25 ++++++++++++++++ src/lib/version/torversion.h | 12 ++++++++ src/lib/version/version.c | 50 +++++++++++++++++++++++++++++++ src/rust/build.rs | 1 + src/test/fuzz/fuzzing_common.c | 1 + src/test/testing_common.c | 1 + 22 files changed, 107 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index cedff8fb3..ee2de376a 100644 --- a/.gitignore +++ b/.gitignore @@ -210,6 +210,8 @@ uptime-*.json /src/lib/libtor-tls.a /src/lib/libtor-tls-testing.a /src/lib/libtor-trace.a +/src/lib/libtor-version.a +/src/lib/libtor-version-testing.a /src/lib/libtor-wallclock.a /src/lib/libtor-wallclock-testing.a diff --git a/Makefile.am b/Makefile.am index e5c1be31b..cb76edfa2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,6 +62,7 @@ TOR_UTIL_LIBS = \ src/lib/libtor-malloc.a \ src/lib/libtor-wallclock.a \ src/lib/libtor-err.a \ + src/lib/libtor-version.a \ src/lib/libtor-intmath.a \ src/lib/libtor-ctime.a @@ -91,6 +92,7 @@ TOR_UTIL_TESTING_LIBS = \ src/lib/libtor-malloc-testing.a \ src/lib/libtor-wallclock-testing.a \ src/lib/libtor-err-testing.a \ + src/lib/libtor-version-testing.a \ src/lib/libtor-intmath.a \ src/lib/libtor-ctime-testing.a endif diff --git a/src/app/config/config.c b/src/app/config/config.c index 6e7e13105..7b49387bc 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -112,9 +112,9 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/encoding/confline.h" -#include "lib/log/git_revision.h" #include "lib/net/resolve.h" #include "lib/sandbox/sandbox.h" +#include "lib/version/torversion.h" #ifdef ENABLE_NSS #include "lib/crypt_ops/crypto_nss_mgt.h" @@ -972,42 +972,6 @@ set_options(or_options_t *new_val, char **msg) return 0; } -/** The version of this Tor process, as parsed. */ -static char *the_tor_version = NULL; -/** A shorter version of this Tor process's version, for export in our router - * descriptor. (Does not include the git version, if any.) */ -static char *the_short_tor_version = NULL; - -/** Return the current Tor version. */ -const char * -get_version(void) -{ - if (the_tor_version == NULL) { - if (strlen(tor_git_revision)) { - tor_asprintf(&the_tor_version, "%s (git-%s)", get_short_version(), - tor_git_revision); - } else { - the_tor_version = tor_strdup(get_short_version()); - } - } - return the_tor_version; -} - -/** Return the current Tor version, without any git tag. */ -const char * -get_short_version(void) -{ - - if (the_short_tor_version == NULL) { -#ifdef TOR_BUILD_TAG - tor_asprintf(&the_short_tor_version, "%s (%s)", VERSION, TOR_BUILD_TAG); -#else - the_short_tor_version = tor_strdup(VERSION); -#endif - } - return the_short_tor_version; -} - /** Release additional memory allocated in options */ STATIC void @@ -1067,9 +1031,6 @@ config_free_all(void) tor_free(torrc_defaults_fname); tor_free(global_dirfrontpagecontents); - tor_free(the_short_tor_version); - tor_free(the_tor_version); - cleanup_protocol_warning_severity_level(); have_parsed_cmdline = 0; diff --git a/src/app/config/config.h b/src/app/config/config.h index a169cfd45..4c497b83a 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -41,8 +41,6 @@ const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); void init_protocol_warning_severity_level(void); int get_protocol_warning_severity_level(void); -const char *get_version(void); -const char *get_short_version(void); /** An error from options_trial_assign() or options_init_from_string(). */ typedef enum setopt_err_t { diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index 8a8b7ced0..4ba7be151 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -45,6 +45,7 @@ #include "app/config/statefile.h" #include "lib/encoding/confline.h" #include "lib/net/resolve.h" +#include "lib/version/torversion.h" #include "app/config/or_state_st.h" diff --git a/src/app/main/main.c b/src/app/main/main.c index 444d6ea7e..031f57009 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -84,6 +84,7 @@ #include "lib/encoding/confline.h" #include "lib/evloop/timers.h" #include "lib/crypt_ops/crypto_init.h" +#include "lib/version/torversion.h" #include <event2/event.h> diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 3fa47747e..b31b448e9 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -92,6 +92,7 @@ #include "lib/crypt_ops/crypto_util.h" #include "lib/encoding/confline.h" #include "lib/evloop/compat_libevent.h" +#include "lib/version/torversion.h" #include "feature/dircache/cached_dir_st.h" #include "feature/control/control_connection_st.h" diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 38c7fd76d..1ce06744d 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -22,6 +22,7 @@ #include "feature/dirauth/shared_random_state.h" #include "feature/dircommon/voting_schedule.h" #include "lib/encoding/confline.h" +#include "lib/version/torversion.h" #include "app/config/or_state_st.h" diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 3a819f592..9d61ced11 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -49,6 +49,7 @@ #include "lib/encoding/confline.h" #include "lib/osinfo/uname.h" #include "lib/tls/tortls.h" +#include "lib/version/torversion.h" #include "feature/dirauth/authmode.h" diff --git a/src/include.am b/src/include.am index 247b0db8d..827949993 100644 --- a/src/include.am +++ b/src/include.am @@ -33,6 +33,7 @@ include src/lib/thread/include.am include src/lib/time/include.am include src/lib/tls/include.am include src/lib/trace/include.am +include src/lib/version/include.am include src/lib/wallclock/include.am include src/trunnel/include.am diff --git a/src/lib/log/.may_include b/src/lib/log/.may_include index 852173aab..7ca1863a5 100644 --- a/src/lib/log/.may_include +++ b/src/lib/log/.may_include @@ -10,6 +10,5 @@ lib/log/*.h lib/malloc/*.h lib/string/*.h lib/testsupport/*.h +lib/version/*.h lib/wallclock/*.h - -micro-revision.i \ No newline at end of file diff --git a/src/lib/log/include.am b/src/lib/log/include.am index 4a6c9b368..c6f404e26 100644 --- a/src/lib/log/include.am +++ b/src/lib/log/include.am @@ -7,7 +7,6 @@ endif src_lib_libtor_log_a_SOURCES = \ src/lib/log/escape.c \ - src/lib/log/git_revision.c \ src/lib/log/ratelim.c \ src/lib/log/log.c \ src/lib/log/util_bug.c @@ -21,15 +20,8 @@ src_lib_libtor_log_testing_a_SOURCES = \ src_lib_libtor_log_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_log_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -# Declare that these object files depend on micro-revision.i. Without this -# rule, we could try to build them before micro-revision.i was created. -src/lib/log/git_revision.$(OBJEXT) \ - src/lib/log/src_lib_libtor_log_testing_a-git_revision.$(OBJEXT): \ - micro-revision.i - noinst_HEADERS += \ src/lib/log/escape.h \ - src/lib/log/git_revision.h \ src/lib/log/ratelim.h \ src/lib/log/log.h \ src/lib/log/util_bug.h \ diff --git a/src/lib/log/log.c b/src/lib/log/log.c index d60ce6308..bc7b36dcb 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -32,7 +32,7 @@ #define LOG_PRIVATE #include "lib/log/log.h" -#include "lib/log/git_revision.h" +#include "lib/version/git_revision.h" #include "lib/log/ratelim.h" #include "lib/lock/compat_mutex.h" #include "lib/smartlist_core/smartlist_core.h" diff --git a/src/lib/version/.may_include b/src/lib/version/.may_include new file mode 100644 index 000000000..d159ceb41 --- /dev/null +++ b/src/lib/version/.may_include @@ -0,0 +1,3 @@ +orconfig.h +micro-revision.i +lib/version/*.h \ No newline at end of file diff --git a/src/lib/log/git_revision.c b/src/lib/version/git_revision.c similarity index 94% rename from src/lib/log/git_revision.c rename to src/lib/version/git_revision.c index 9d29ecd2a..e5b2ff534 100644 --- a/src/lib/log/git_revision.c +++ b/src/lib/version/git_revision.c @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "lib/log/git_revision.h" +#include "lib/version/git_revision.h" /** String describing which Tor Git repository version the source was * built from. This string is generated by a bit of shell kludging in diff --git a/src/lib/log/git_revision.h b/src/lib/version/git_revision.h similarity index 100% rename from src/lib/log/git_revision.h rename to src/lib/version/git_revision.h diff --git a/src/lib/version/include.am b/src/lib/version/include.am new file mode 100644 index 000000000..6944eb05e --- /dev/null +++ b/src/lib/version/include.am @@ -0,0 +1,25 @@ + +noinst_LIBRARIES += src/lib/libtor-version.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-version-testing.a +endif + +src_lib_libtor_version_a_SOURCES = \ + src/lib/version/git_revision.c \ + src/lib/version/version.c + +src_lib_libtor_version_testing_a_SOURCES = \ + $(src_lib_libtor_version_a_SOURCES) +src_lib_libtor_version_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_lib_libtor_version_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) + +# Declare that these object files depend on micro-revision.i. Without this +# rule, we could try to build them before micro-revision.i was created. +src/lib/version/git_revision.$(OBJEXT) \ + src/lib/version/src_lib_libtor_version_testing_a-git_revision.$(OBJEXT): \ + micro-revision.i + +noinst_HEADERS += \ + src/lib/version/git_revision.h \ + src/lib/version/torversion.h diff --git a/src/lib/version/torversion.h b/src/lib/version/torversion.h new file mode 100644 index 000000000..761d6f25a --- /dev/null +++ b/src/lib/version/torversion.h @@ -0,0 +1,12 @@ +/* Copyright 2001-2004 Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_VERSION_H +#define TOR_VERSION_H + +const char *get_version(void); +const char *get_short_version(void); + +#endif /* !defined(TOR_VERSION_H) */ diff --git a/src/lib/version/version.c b/src/lib/version/version.c new file mode 100644 index 000000000..29ada39c9 --- /dev/null +++ b/src/lib/version/version.c @@ -0,0 +1,50 @@ +/* Copyright 2001-2004 Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#include "lib/version/torversion.h" +#include "lib/version/git_revision.h" + +#include <stdio.h> +#include <string.h> + +/** A shorter version of this Tor process's version, for export in our router + * descriptor. (Does not include the git version, if any.) */ +static const char the_short_tor_version[] = + VERSION +#ifdef TOR_BUILD_TAG + " ("TOR_BUILD_TAG")" +#endif + ""; + +#define MAX_VERSION_LEN 128 + +/** The version of this Tor process, possibly including git version */ +static char the_tor_version[MAX_VERSION_LEN] = ""; + +/** Return the current Tor version. */ +const char * +get_version(void) +{ + if (the_tor_version[0] == 0) { + if (strlen(tor_git_revision)) { + snprintf(the_tor_version, sizeof(the_tor_version), + "%s (git-%s)", the_short_tor_version, tor_git_revision); + } else { + snprintf(the_tor_version, sizeof(the_tor_version), + "%s", the_short_tor_version); + } + the_tor_version[sizeof(the_tor_version)-1] = 0; + } + + return the_tor_version; +} + +/** Return the current Tor version, without any git tag. */ +const char * +get_short_version(void) +{ + return the_short_tor_version; +} diff --git a/src/rust/build.rs b/src/rust/build.rs index 123d5c068..bf566c56b 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -162,6 +162,7 @@ pub fn main() { cfg.component("tor-malloc"); cfg.component("tor-wallclock"); cfg.component("tor-err-testing"); + cfg.component("tor-version-testing"); cfg.component("tor-intmath-testing"); cfg.component("tor-ctime-testing"); cfg.component("curve25519_donna"); diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index 1401e4c28..879f9e74d 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -9,6 +9,7 @@ #include "lib/compress/compress.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_init.h" +#include "lib/version/torversion.h" static or_options_t *mock_options = NULL; static const or_options_t * diff --git a/src/test/testing_common.c b/src/test/testing_common.c index c52683afc..8d648ee17 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -25,6 +25,7 @@ #include "lib/compress/compress.h" #include "lib/evloop/compat_libevent.h" #include "lib/crypt_ops/crypto_init.h" +#include "lib/version/torversion.h" #include <stdio.h> #ifdef HAVE_FCNTL_H

1 0

[tor/master] Make initialization for the "err" library into a subsystem.
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 175153a3290b3987faacac9d5390e87e1ad4a457 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 1 12:40:55 2018 -0400 Make initialization for the "err" library into a subsystem. --- src/app/main/main.c | 10 ---------- src/app/main/subsystem_list.c | 4 +++- src/lib/err/.may_include | 2 ++ src/lib/err/include.am | 8 +++++--- src/lib/err/torerr.c | 10 ++++++++++ src/lib/err/torerr.h | 1 + src/lib/err/torerr_sys.c | 39 +++++++++++++++++++++++++++++++++++++++ src/lib/err/torerr_sys.h | 14 ++++++++++++++ 8 files changed, 74 insertions(+), 14 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index 031f57009..e3d7610c8 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -69,7 +69,6 @@ #include "lib/container/buffers.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_s2k.h" -#include "lib/err/backtrace.h" #include "lib/geoip/geoip.h" #include "lib/process/waitpid.h" @@ -822,7 +821,6 @@ tor_free_all(int postfork) if (!postfork) { escaped(NULL); esc_router_info(NULL); - clean_up_backtrace_handler(); logs_free_all(); /* free log strings. do this last so logs keep working. */ } } @@ -1419,14 +1417,6 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) #endif /* !defined(_WIN64) */ #endif /* defined(_WIN32) */ - { - int bt_err = configure_backtrace_handler(get_version()); - if (bt_err < 0) { - log_warn(LD_BUG, "Unable to install backtrace handler: %s", - strerror(-bt_err)); - } - } - #ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED event_set_mem_functions(tor_malloc_, tor_realloc_, tor_free_); #endif diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index fc1249e1c..244dbadbd 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -8,13 +8,15 @@ #include "lib/cc/compat_compiler.h" #include "lib/cc/torint.h" +#include "lib/err/torerr_sys.h" + #include <stddef.h> /** * Global list of the subsystems in Tor, in the order of their initialization. **/ const subsys_fns_t *tor_subsystems[] = { - NULL // placeholder. + &sys_torerr, }; const unsigned n_tor_subsystems = ARRAY_LENGTH(tor_subsystems); diff --git a/src/lib/err/.may_include b/src/lib/err/.may_include index 48cc0ef08..daa1b6e4c 100644 --- a/src/lib/err/.may_include +++ b/src/lib/err/.may_include @@ -1,3 +1,5 @@ orconfig.h lib/cc/*.h lib/err/*.h +lib/subsys/*.h +lib/version/*.h \ No newline at end of file diff --git a/src/lib/err/include.am b/src/lib/err/include.am index f2a409c51..43adcd269 100644 --- a/src/lib/err/include.am +++ b/src/lib/err/include.am @@ -6,8 +6,9 @@ noinst_LIBRARIES += src/lib/libtor-err-testing.a endif src_lib_libtor_err_a_SOURCES = \ - src/lib/err/backtrace.c \ - src/lib/err/torerr.c + src/lib/err/backtrace.c \ + src/lib/err/torerr.c \ + src/lib/err/torerr_sys.c src_lib_libtor_err_testing_a_SOURCES = \ $(src_lib_libtor_err_a_SOURCES) @@ -16,4 +17,5 @@ src_lib_libtor_err_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/err/backtrace.h \ - src/lib/err/torerr.h + src/lib/err/torerr.h \ + src/lib/err/torerr_sys.h diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c index f9e139f96..e9de86837 100644 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@ -123,6 +123,16 @@ tor_log_set_sigsafe_err_fds(const int *fds, int n) } /** + * Reset the list of emergency error fds to its default. + */ +void +tor_log_reset_sigsafe_err_fds(void) +{ + int fds[] = { STDERR_FILENO }; + tor_log_set_sigsafe_err_fds(fds, 1); +} + +/** * Set the granularity (in ms) to use when reporting fatal errors outside * the logging system. */ diff --git a/src/lib/err/torerr.h b/src/lib/err/torerr.h index d4bba6916..b415ef73e 100644 --- a/src/lib/err/torerr.h +++ b/src/lib/err/torerr.h @@ -39,6 +39,7 @@ void tor_raw_assertion_failed_msg_(const char *file, int line, void tor_log_err_sigsafe(const char *m, ...); int tor_log_get_sigsafe_err_fds(const int **out); void tor_log_set_sigsafe_err_fds(const int *fds, int n); +void tor_log_reset_sigsafe_err_fds(void); void tor_log_sigsafe_err_set_granularity(int ms); int format_hex_number_sigsafe(unsigned long x, char *buf, int max_len); diff --git a/src/lib/err/torerr_sys.c b/src/lib/err/torerr_sys.c new file mode 100644 index 000000000..54666f410 --- /dev/null +++ b/src/lib/err/torerr_sys.c @@ -0,0 +1,39 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file torerr_sys.c + * \brief Subsystem object for the error handling subsystem. + **/ + +#include "orconfig.h" +#include "lib/err/backtrace.h" +#include "lib/err/torerr.h" +#include "lib/err/torerr_sys.h" +#include "lib/subsys/subsys.h" +#include "lib/version/torversion.h" + +#include <stddef.h> + +static int +torerr_subsys_init(void) +{ + configure_backtrace_handler(get_version()); + tor_log_reset_sigsafe_err_fds(); + + return 0; +} +static void +torerr_subsys_shutdown(void) +{ + tor_log_reset_sigsafe_err_fds(); + clean_up_backtrace_handler(); +} + +const subsys_fns_t sys_torerr = { + .name = "err", + .level = -100, + .supported = true, + .initialize = torerr_subsys_init, + .shutdown = torerr_subsys_shutdown +}; diff --git a/src/lib/err/torerr_sys.h b/src/lib/err/torerr_sys.h new file mode 100644 index 000000000..b56270d53 --- /dev/null +++ b/src/lib/err/torerr_sys.h @@ -0,0 +1,14 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file torerr_sys.h + * \brief Declare subsystem object for torerr.c + **/ + +#ifndef TOR_TORERR_SYS_H +#define TOR_TORERR_SYS_H + +extern const struct subsys_fns_t sys_torerr; + +#endif /* !defined(TOR_TORERR_SYS_H) */

1 0

[tor/master] Make the windows process parameter initialization a subsystem
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 178c1821b2115972ce3c3f194d1fcbd0d75ca364 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 1 12:55:10 2018 -0400 Make the windows process parameter initialization a subsystem Also, move it from "main" into lib/process --- src/app/main/main.c | 29 ------------------ src/app/main/subsystem_list.c | 2 ++ src/lib/process/.may_include | 1 + src/lib/process/include.am | 6 ++-- src/lib/process/winprocess_sys.c | 64 ++++++++++++++++++++++++++++++++++++++++ src/lib/process/winprocess_sys.h | 14 +++++++++ 6 files changed, 85 insertions(+), 31 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index e3d7610c8..1e4cd37fe 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1388,35 +1388,6 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) { int result = 0; -#ifdef _WIN32 -#ifndef HeapEnableTerminationOnCorruption -#define HeapEnableTerminationOnCorruption 1 -#endif - /* On heap corruption, just give up; don't try to play along. */ - HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); - - /* SetProcessDEPPolicy is only supported on 32-bit Windows. - * (On 64-bit Windows it always fails, and some compilers don't like the - * PSETDEP cast.) - * 32-bit Windows defines _WIN32. - * 64-bit Windows defines _WIN32 and _WIN64. */ -#ifndef _WIN64 - /* Call SetProcessDEPPolicy to permanently enable DEP. - The function will not resolve on earlier versions of Windows, - and failure is not dangerous. */ - HMODULE hMod = GetModuleHandleA("Kernel32.dll"); - if (hMod) { - typedef BOOL (WINAPI *PSETDEP)(DWORD); - PSETDEP setdeppolicy = (PSETDEP)GetProcAddress(hMod, - "SetProcessDEPPolicy"); - if (setdeppolicy) { - /* PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION */ - setdeppolicy(3); - } - } -#endif /* !defined(_WIN64) */ -#endif /* defined(_WIN32) */ - #ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED event_set_mem_functions(tor_malloc_, tor_realloc_, tor_free_); #endif diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 244dbadbd..0f7d5d2cc 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -9,6 +9,7 @@ #include "lib/cc/torint.h" #include "lib/err/torerr_sys.h" +#include "lib/process/winprocess_sys.h" #include <stddef.h> @@ -16,6 +17,7 @@ * Global list of the subsystems in Tor, in the order of their initialization. **/ const subsys_fns_t *tor_subsystems[] = { + &sys_winprocess, &sys_torerr, }; diff --git a/src/lib/process/.may_include b/src/lib/process/.may_include index 05414d2a9..a2d57a52f 100644 --- a/src/lib/process/.may_include +++ b/src/lib/process/.may_include @@ -11,6 +11,7 @@ lib/malloc/*.h lib/net/*.h lib/process/*.h lib/string/*.h +lib/subsys/*.h lib/testsupport/*.h lib/thread/*.h diff --git a/src/lib/process/include.am b/src/lib/process/include.am index c6cc3a669..2aa30cc3c 100644 --- a/src/lib/process/include.am +++ b/src/lib/process/include.am @@ -12,7 +12,8 @@ src_lib_libtor_process_a_SOURCES = \ src/lib/process/restrict.c \ src/lib/process/setuid.c \ src/lib/process/subprocess.c \ - src/lib/process/waitpid.c + src/lib/process/waitpid.c \ + src/lib/process/winprocess_sys.c src_lib_libtor_process_testing_a_SOURCES = \ $(src_lib_libtor_process_a_SOURCES) @@ -26,4 +27,5 @@ noinst_HEADERS += \ src/lib/process/restrict.h \ src/lib/process/setuid.h \ src/lib/process/subprocess.h \ - src/lib/process/waitpid.h + src/lib/process/waitpid.h \ + src/lib/process/winprocess_sys.h diff --git a/src/lib/process/winprocess_sys.c b/src/lib/process/winprocess_sys.c new file mode 100644 index 000000000..e00f94c91 --- /dev/null +++ b/src/lib/process/winprocess_sys.c @@ -0,0 +1,64 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file winprocess_sys.c + * \brief Subsystem object for windows process setup. + **/ + +#include "orconfig.h" +#include "lib/subsys/subsys.h" +#include "lib/process/winprocess_sys.h" + +#include <stdbool.h> +#include <stddef.h> + +#ifdef _WIN32 +#include <windows.h> + +#define WINPROCESS_SYS_ENABLED true + +static int +init_windows_process_params(void) +{ +#ifndef HeapEnableTerminationOnCorruption +#define HeapEnableTerminationOnCorruption 1 +#endif + + /* On heap corruption, just give up; don't try to play along. */ + HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); + + /* SetProcessDEPPolicy is only supported on 32-bit Windows. + * (On 64-bit Windows it always fails, and some compilers don't like the + * PSETDEP cast.) + * 32-bit Windows defines _WIN32. + * 64-bit Windows defines _WIN32 and _WIN64. */ +#ifndef _WIN64 + /* Call SetProcessDEPPolicy to permanently enable DEP. + The function will not resolve on earlier versions of Windows, + and failure is not dangerous. */ + HMODULE hMod = GetModuleHandleA("Kernel32.dll"); + if (hMod) { + typedef BOOL (WINAPI *PSETDEP)(DWORD); + PSETDEP setdeppolicy = (PSETDEP)GetProcAddress(hMod, + "SetProcessDEPPolicy"); + if (setdeppolicy) { + /* PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION */ + setdeppolicy(3); + } + } +#endif /* !defined(_WIN64) */ + + return 0; +} +#else /* !defined(_WIN32) */ +#define WINPROCESS_SYS_ENABLED false +#define init_windows_process_params NULL +#endif /* defined(_WIN32) */ + +const subsys_fns_t sys_winprocess = { + .name = "winprocess", + .level = -100, + .supported = WINPROCESS_SYS_ENABLED, + .initialize = init_windows_process_params, +}; diff --git a/src/lib/process/winprocess_sys.h b/src/lib/process/winprocess_sys.h new file mode 100644 index 000000000..cb096e0c9 --- /dev/null +++ b/src/lib/process/winprocess_sys.h @@ -0,0 +1,14 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file winprocess_sys.h + * \brief Declare subsystem object for winprocess.c + **/ + +#ifndef TOR_WINPROCESS_SYS_H +#define TOR_WINPROCESS_SYS_H + +extern const struct subsys_fns_t sys_winprocess; + +#endif /* !defined(TOR_WINPROCESS_SYS_H) */

1 0

[tor/master] Use subsystems manager for subsystems used in tests.
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 05b54f6a6a24ebdb47de4f7e41cf94f2f6be93bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 1 14:13:36 2018 -0400 Use subsystems manager for subsystems used in tests. --- src/lib/subsys/subsys.h | 4 ++++ src/test/bench.c | 7 ++++--- src/test/fuzz/fuzzing_common.c | 9 ++++----- src/test/testing_common.c | 8 +++----- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/lib/subsys/subsys.h b/src/lib/subsys/subsys.h index 012b218da..25451bc45 100644 --- a/src/lib/subsys/subsys.h +++ b/src/lib/subsys/subsys.h @@ -65,4 +65,8 @@ typedef struct subsys_fns_t { #define MIN_SUBSYS_LEVEL -100 #define MAX_SUBSYS_LEVEL 100 +/* All tor "libraries" (in src/libs) should have a subsystem level equal to or + * less than this value. */ +#define SUBSYS_LEVEL_LIBS -10 + #endif diff --git a/src/test/bench.c b/src/test/bench.c index 9da1b46a1..ff8707d41 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -24,6 +24,7 @@ #include "core/or/circuitlist.h" #include "app/config/config.h" +#include "app/main/subsysmgr.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_dh.h" #include "core/crypto/onion_ntor.h" @@ -690,9 +691,10 @@ main(int argc, const char **argv) char *errmsg; or_options_t *options; - tor_threads_init(); + subsystems_init_upto(SUBSYS_LEVEL_LIBS); + flush_log_messages_from_startup(); + tor_compress_init(); - init_logging(1); if (argc == 4 && !strcmp(argv[1], "diff")) { const int N = 200; @@ -739,7 +741,6 @@ main(int argc, const char **argv) init_protocol_warning_severity_level(); options = options_new(); - init_logging(1); options->command = CMD_RUN_UNITTESTS; options->DataDirectory = tor_strdup(""); options->KeyDirectory = tor_strdup(""); diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index 879f9e74d..21aa07cfe 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -3,6 +3,7 @@ #define CRYPTO_ED25519_PRIVATE #include "orconfig.h" #include "core/or/or.h" +#include "app/main/subsysmgr.h" #include "lib/err/backtrace.h" #include "app/config/config.h" #include "test/fuzz/fuzzing.h" @@ -95,12 +96,10 @@ disable_signature_checking(void) static void global_init(void) { - tor_threads_init(); - tor_compress_init(); + subsystems_init_upto(SUBSYS_LEVEL_LIBS); + flush_log_messages_from_startup(); - /* Initialise logging first */ - init_logging(1); - configure_backtrace_handler(get_version()); + tor_compress_init(); if (crypto_global_init(0, NULL, NULL) < 0) abort(); diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 8d648ee17..eef393d3a 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -26,6 +26,7 @@ #include "lib/evloop/compat_libevent.h" #include "lib/crypt_ops/crypto_init.h" #include "lib/version/torversion.h" +#include "app/main/subsysmgr.h" #include <stdio.h> #ifdef HAVE_FCNTL_H @@ -251,12 +252,9 @@ main(int c, const char **v) int loglevel = LOG_ERR; int accel_crypto = 0; - /* We must initialise logs before we call tor_assert() */ - init_logging(1); + subsystems_init_upto(SUBSYS_LEVEL_LIBS); - update_approx_time(time(NULL)); options = options_new(); - tor_threads_init(); tor_compress_init(); network_init(); @@ -268,7 +266,6 @@ main(int c, const char **v) tor_libevent_initialize(&cfg); control_initialize_event_queue(); - configure_backtrace_handler(get_version()); for (i_out = i = 1; i < c; ++i) { if (!strcmp(v[i], "--warn")) { @@ -295,6 +292,7 @@ main(int c, const char **v) s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; add_stream_log(&s, "", fileno(stdout)); } + flush_log_messages_from_startup(); init_protocol_warning_severity_level(); options->command = CMD_RUN_UNITTESTS;

1 0