December 2016 - tor-commits - lists.torproject.org

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit a72fc128d389b71789d61b8a7062667a3b591582 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 16:46:39 2016 +0000 Update translations for tails-iuk --- fr.po | 52 ++++++++++++++++++++++++++-------------------------- fr_CA.po | 38 +++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/fr.po b/fr.po index 621b53f..6bf4a31 100644 --- a/fr.po +++ b/fr.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-… [View More]Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 16:55+0200\n" -"PO-Revision-Date: 2016-12-16 16:16+0000\n" +"PO-Revision-Date: 2016-12-16 16:33+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -89,7 +89,7 @@ msgstr "Cette version de Tails est obsolète et peut poser des problèmes de sé msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "La mise à niveau incrémentale proposée exige %{space_needed}s d'espace libre sur la partition système de Tails, mais il n'y a que %{free_space}s." +msgstr "La mise à niveau incrémentale proposée exige %{space_needed}s d'espace libre sur la partition système de Tails, mais il n'y en a que %{free_space}s." #: ../lib/Tails/IUK/Frontend.pm:335 #, perl-brace-format @@ -102,11 +102,11 @@ msgstr "La mise à niveau incrémentale proposée exige %{memory_needed}s de mé msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "Une mise à niveau incrémentale est proposée, mais aucune mise à niveau complète.\nCela ne devrait pas arriver. Veuillez signaler un bogue." +msgstr "Une mise à niveau incrémentale est proposée, mais aucune mise à niveau complète ne l'est.\nCela ne devrait pas arriver. Veuillez signaler un bogue." #: ../lib/Tails/IUK/Frontend.pm:361 msgid "Error while detecting available upgrades" -msgstr "Erreur lors de la vérification des mises à jour disponibles" +msgstr "Erreur de vérification des mises à niveau proposées" #: ../lib/Tails/IUK/Frontend.pm:371 #, perl-brace-format @@ -122,19 +122,19 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "Vous devriez mettre à niveau vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, allez sur %{details_url}s.\n\nIl est recommandé de fermer toutes les applications ouvertes pendant la mise à niveau. Le téléchargement de la mise à niveau pourrait prendre un long moment, de plusieurs minutes à quelques heures. Le réseau sera mis hors service après le téléchargement de la mise à niveau. \n\nTaille du téléchargement : %{size}s\n\nVoulez-vous mettre à niveau maintenant ?" +msgstr "Vous devriez mettre à niveau vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, visitez %{details_url}s\n\nIl est recommandé de fermer toutes les applications pendant la mise à niveau.\nLe téléchargement de la mise à niveau peut être long, de plusieurs minutes à quelques heures.\nLe réseau sera désactivé après le téléchargement de la mise à niveau.\n\nTaille du téléchargement : %{size}s\n\nVoulez-vous mettre à niveau maintenant ?" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade available" -msgstr "Mise à jour disponible" +msgstr "Un mise à niveau est proposée" #: ../lib/Tails/IUK/Frontend.pm:387 msgid "Upgrade now" -msgstr "Mettre à jour maintenant" +msgstr "Mettre à niveau maintenant" #: ../lib/Tails/IUK/Frontend.pm:388 msgid "Upgrade later" -msgstr "Mettre à jour plus tard" +msgstr "Mettre à niveau plus tard" #: ../lib/Tails/IUK/Frontend.pm:396 #, perl-brace-format @@ -146,15 +146,15 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "Vous devriez mettre à niveau manuellement vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, aller sur %{details_url}s.\n\nIl n'est pas possible de mettre automatiquement à niveau votre appareil vers cette nouvelle version : %{explanation}s.\n\nPour apprendre comment faire une mise à niveau manuelle, aller à https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "Vous devriez mettre à niveau manuellement vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, visitez %{details_url}s.\n\nIl n'est pas possible de mettre à niveau votre appareil automatiquement vers cette nouvelle version : %{explanation}s.\n\nPour apprendre à faire une mise à niveau manuelle, visitez https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available" -msgstr "Nouvelle version disponible" +msgstr "Une nouvelle version est proposée" #: ../lib/Tails/IUK/Frontend.pm:469 msgid "Downloading upgrade" -msgstr "Téléchargement de la mise à jour" +msgstr "Téléchargement de la mise à niveau" #: ../lib/Tails/IUK/Frontend.pm:472 #, perl-brace-format @@ -167,37 +167,37 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "La mise à niveau n'a pas pu être téléchargée.\\n\\nVérifiez votre connexion réseau et redémarrez Tails pour essayer de nouveau de mettre à niveau.\\n\\nSi le problème persiste, allez sur file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "La mise à niveau n'a pas pu être téléchargée.\\n\\nVérifiez votre connexion réseau et redémarrez Tails pour retenter de mettre à niveau.\\n\\nSi le problème persiste, consultez file:///usr/share/doc/tails/website/doc/upgrade/error/download.fr.html" #: ../lib/Tails/IUK/Frontend.pm:529 ../lib/Tails/IUK/Frontend.pm:548 msgid "Error while downloading the upgrade" -msgstr "Échec lors du téléchargement de la mise à jour" +msgstr "Échec de téléchargement de la mise à niveau" #: ../lib/Tails/IUK/Frontend.pm:541 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "Le fichier de sortie '%{output_file}s' n'existe pas, mais tails-iuk-get-target-file ne s'en est pas plaint. Veuillez rapporter un bogue." +msgstr "Le fichier de sortie « %{output_file}s » n'existe pas, mais tails-iuk-get-target-file ne s'en est pas plaint. Veuillez signaler un bogue." #: ../lib/Tails/IUK/Frontend.pm:560 msgid "Error while creating temporary downloading directory" -msgstr "Échec lors de la création du dossier de téléchargement temporaire" +msgstr "Erreur lors de la création du répertoire temporaire de téléchargement" #: ../lib/Tails/IUK/Frontend.pm:563 msgid "Failed to create temporary download directory" -msgstr "Échec lors de la création du dossier de téléchargement temporaire" +msgstr "Échec de création du répertoire temporaire de téléchargement" #: ../lib/Tails/IUK/Frontend.pm:587 msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "Impossible de choisir un serveur de téléchargement.\n\nCela ne devrait pas arriver. Merci de remonter un bug." +msgstr "Impossible de choisir un serveur de téléchargement.\n\nCela ne devrait pas arriver. Veuillez signaler un bogue." #: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while choosing a download server" -msgstr "Erreur lors du choix d'un serveur de téléchargement" +msgstr "Échec lors du choix d'un serveur de téléchargement" #: ../lib/Tails/IUK/Frontend.pm:608 msgid "" @@ -223,30 +223,30 @@ msgstr "Redémarrer plus tard" #: ../lib/Tails/IUK/Frontend.pm:626 msgid "Error while restarting the system" -msgstr "Échec lors du redémarrage du système" +msgstr "Erreur lors du redémarrage du système" #: ../lib/Tails/IUK/Frontend.pm:629 msgid "Failed to restart the system" -msgstr "Échec du redémarrage du système" +msgstr "Échec de redémarrage du système" #: ../lib/Tails/IUK/Frontend.pm:644 msgid "Error while shutting down the network" -msgstr "Échec lors de l'arrêt du réseau" +msgstr "Erreur lors de l'arrêt du réseau" #: ../lib/Tails/IUK/Frontend.pm:647 msgid "Failed to shutdown network" -msgstr "Échec de l'arrêt du réseau" +msgstr "Échec d'arrêt du réseau" #: ../lib/Tails/IUK/Frontend.pm:657 msgid "Upgrading the system" -msgstr "Mise à jour du système" +msgstr "Mise à niveau du système" #: ../lib/Tails/IUK/Frontend.pm:659 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." -msgstr "Votre dispositif Tails est en cours de mise à niveau...\n\nPour des raisons de sécurité, le réseau est actuellement hors service." +msgstr "Votre dispositif Tails est en cours de mise à niveau...\n\nPour des raisons de sécurité, le réseau est actuellement désactivé." #: ../lib/Tails/IUK/Frontend.pm:692 msgid "" @@ -254,8 +254,8 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "Une erreur est survenue durant l'installation de la mise à niveau.\\n\\nVotre dispositif Tails nécessite d'être réparé et pourrait être incapable de redémarrer.\\n\\nVeuillez suivre les instructions sur file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" +msgstr "Une erreur est survenue durant l'installation de la mise à niveau.\\n\\nVotre dispositif Tails doit être réparé et pourrait ne pas redémarrer.\\n\\nVeuillez suivre les instructions sur file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html" #: ../lib/Tails/IUK/Frontend.pm:702 msgid "Error while installing the upgrade" -msgstr "Erreur lors de l'installation des mises à jour" +msgstr "Erreur lors de l'installation de la mise à niveau" diff --git a/fr_CA.po b/fr_CA.po index 3fde251..decb46c 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 16:55+0200\n" -"PO-Revision-Date: 2016-12-16 16:16+0000\n" +"PO-Revision-Date: 2016-12-16 16:32+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -81,7 +81,7 @@ msgstr "Cette version de Tails est obsolète et peut poser des problèmes de sé msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "La mise à niveau incrémentale proposée exige %{space_needed}s d'espace libre sur la partition système de Tails, mais il n'y a que %{free_space}s." +msgstr "La mise à niveau incrémentale proposée exige %{space_needed}s d'espace libre sur la partition système de Tails, mais il n'y en a que %{free_space}s." #: ../lib/Tails/IUK/Frontend.pm:335 #, perl-brace-format @@ -94,11 +94,11 @@ msgstr "La mise à niveau incrémentale proposée exige %{memory_needed}s de mé msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "Une mise à niveau incrémentale est proposée, mais aucune mise à niveau complète.\nCela ne devrait pas arriver. Veuillez signaler un bogue." +msgstr "Une mise à niveau incrémentale est proposée, mais aucune mise à niveau complète ne l'est.\nCela ne devrait pas arriver. Veuillez signaler un bogue." #: ../lib/Tails/IUK/Frontend.pm:361 msgid "Error while detecting available upgrades" -msgstr "Erreur lors de la vérification de mises à niveau proposées" +msgstr "Erreur de vérification des mises à niveau proposées" #: ../lib/Tails/IUK/Frontend.pm:371 #, perl-brace-format @@ -114,11 +114,11 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "Vous devriez mettre à niveau vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, aller à %{details_url}s\n\nIl est recommandé de fermer toutes les applications durant la mise à niveau.\nLe téléchargement de la mise à niveau peut prendre longtemps, de plusieurs minutes à quelques heures.\nLe réseau sera désactivé après le téléchargement de la mise à niveau.\n\nTaille du téléchargements : %{size}s\n\nVoulez-vous mettre à niveau maintenant?" +msgstr "Vous devriez mettre à niveau vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, visitez %{details_url}s\n\nIl est recommandé de fermer toutes les applications pendant la mise à niveau.\nLe téléchargement de la mise à niveau peut être long, de plusieurs minutes à quelques heures.\nLe réseau sera désactivé après le téléchargement de la mise à niveau.\n\nTaille du téléchargement : %{size}s\n\nVoulez-vous mettre à niveau maintenant?" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade available" -msgstr "Mise à niveau proposée" +msgstr "Un mise à niveau est proposée" #: ../lib/Tails/IUK/Frontend.pm:387 msgid "Upgrade now" @@ -138,11 +138,11 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "Vous devriez mettre à niveau manuellement vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, aller sur %{details_url}s.\n\nIl n'est pas possible de mettre automatiquement à niveau votre appareil vers cette nouvelle version : %{explanation}s.\n\nPour apprendre comment faire une mise à niveau manuelle, aller à https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "Vous devriez mettre à niveau manuellement vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, visitez %{details_url}s.\n\nIl n'est pas possible de mettre à niveau votre appareil automatiquement vers cette nouvelle version : %{explanation}s.\n\nPour apprendre à faire une mise à niveau manuelle, visitez https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available" -msgstr "Nouvelle version proposée" +msgstr "Une nouvelle version est proposée" #: ../lib/Tails/IUK/Frontend.pm:469 msgid "Downloading upgrade" @@ -159,26 +159,26 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "La mise à niveau n'a pas pu être téléchargée.\\n\\nVérifier votre connexion réseau et redémarrer Tails pour ressayer de mettre à niveau.\\n\\nSi le problème persiste, aller sur file:///usr/share/doc/tails/website/doc/upgrade/error/download.fr.html" +msgstr "La mise à niveau n'a pas pu être téléchargée.\\n\\nVérifiez votre connexion réseau et redémarrez Tails pour retenter de mettre à niveau.\\n\\nSi le problème persiste, consultez file:///usr/share/doc/tails/website/doc/upgrade/error/download.fr.html" #: ../lib/Tails/IUK/Frontend.pm:529 ../lib/Tails/IUK/Frontend.pm:548 msgid "Error while downloading the upgrade" -msgstr "Échec lors du téléchargement de la mise à niveau" +msgstr "Échec de téléchargement de la mise à niveau" #: ../lib/Tails/IUK/Frontend.pm:541 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "Le fichier de sortie '%{output_file}s' n'existe pas, mais tails-iuk-get-target-file ne s'en est pas plaint. Veuillez rapporter un bogue." +msgstr "Le fichier de sortie « %{output_file}s » n'existe pas, mais tails-iuk-get-target-file ne s'en est pas plaint. Veuillez signaler un bogue." #: ../lib/Tails/IUK/Frontend.pm:560 msgid "Error while creating temporary downloading directory" -msgstr "Échec lors de la création du répertoire de téléchargement temporaire" +msgstr "Erreur lors de la création du répertoire temporaire de téléchargement" #: ../lib/Tails/IUK/Frontend.pm:563 msgid "Failed to create temporary download directory" -msgstr "Échec lors de la création du répertoire de téléchargement temporaire" +msgstr "Échec de création du répertoire temporaire de téléchargement" #: ../lib/Tails/IUK/Frontend.pm:587 msgid "" @@ -215,19 +215,19 @@ msgstr "Redémarrer plus tard" #: ../lib/Tails/IUK/Frontend.pm:626 msgid "Error while restarting the system" -msgstr "Échec lors du redémarrage du système" +msgstr "Erreur lors du redémarrage du système" #: ../lib/Tails/IUK/Frontend.pm:629 msgid "Failed to restart the system" -msgstr "Échec lors du redémarrage du système" +msgstr "Échec de redémarrage du système" #: ../lib/Tails/IUK/Frontend.pm:644 msgid "Error while shutting down the network" -msgstr "Échec lors de l'arrêt du réseau" +msgstr "Erreur lors de l'arrêt du réseau" #: ../lib/Tails/IUK/Frontend.pm:647 msgid "Failed to shutdown network" -msgstr "Échec lors de l'arrêt du réseau" +msgstr "Échec d'arrêt du réseau" #: ../lib/Tails/IUK/Frontend.pm:657 msgid "Upgrading the system" @@ -238,7 +238,7 @@ msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." -msgstr "Votre dispositif Tails est en cours de mise à niveau...\n\nPour des raisons de sécurité, le réseau est actuellement désactivé." +msgstr "Votre dispositif Tails est en cours de mise à niveau...\n\nPour des raisons de sécurité, le réseau est présentement désactivé." #: ../lib/Tails/IUK/Frontend.pm:692 msgid "" @@ -246,7 +246,7 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "Une erreur est survenue durant l'installation de la mise à niveau.\\n\\nVotre dispositif Tails doit être réparé et pourrait être incapable de redémarrer.\\n\\nVeuillez suivre les instructions sur file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html" +msgstr "Une erreur est survenue durant l'installation de la mise à niveau.\\n\\nVotre dispositif Tails doit être réparé et pourrait ne pas redémarrer.\\n\\nVeuillez suivre les instructions sur file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html" #: ../lib/Tails/IUK/Frontend.pm:702 msgid "Error while installing the upgrade" [View Less]

1 0

[tor/master] Disable the legacy guard algorithm. Code isn't removed yet.
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit c52c47ae6f0da5a94b0605fd84fd469a29db962c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 16 11:42:34 2016 -0500 Disable the legacy guard algorithm. Code isn't removed yet. (Keeping the code around in case I broke Tor in some unexpected way.) --- src/or/entrynodes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index c215c10..db84d59 100644 --- a/src/or/entrynodes.h +++ b/src/or/… [View More]

1 0

[tor/master] Make NumDirectoryGuards work with the new guard algorithm.
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit 506bd6d47c9c003a94eae7132e83b682a53f0bc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 12 10:32:25 2016 -0500 Make NumDirectoryGuards work with the new guard algorithm. Now that we support NumEntryGuards, NumDirectoryGuards is pretty easy to put back in. --- src/or/entrynodes.c | 39 ++++++++++++++++++-------- src/or/entrynodes.h | 15 +++++++++- src/test/test_entrynodes.c | 70 ++++++++++++++++++++++++++++------------------ 3 … [View More]files changed, 85 insertions(+), 39 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 9defd11..9416298 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -472,10 +472,11 @@ STATIC int get_n_primary_guards(void) { const int n = get_options()->NumEntryGuards; + const int n_dir = get_options()->NumDirectoryGuards; if (n > 5) { - return n + n / 2; - } else if (n > 1) { - return n * 2; + return MAX(n_dir, n + n / 2); + } else if (n >= 1) { + return MAX(n_dir, n * 2); } return networkstatus_get_param(NULL, @@ -487,14 +488,25 @@ get_n_primary_guards(void) * making a circuit. */ STATIC int -get_n_primary_guards_to_use(void) -{ - if (get_options()->NumEntryGuards > 1) { - return get_options()->NumEntryGuards; +get_n_primary_guards_to_use(guard_usage_t usage) +{ + int configured; + const char *param_name; + int param_default; + if (usage == GUARD_USAGE_DIRGUARD) { + configured = get_options()->NumDirectoryGuards; + param_name = "guard-n-primary-dir-guards-to-use"; + param_default = DFLT_N_PRIMARY_DIR_GUARDS_TO_USE; + } else { + configured = get_options()->NumEntryGuards; + param_name = "guard-n-primary-guards-to-use"; + param_default = DFLT_N_PRIMARY_GUARDS_TO_USE; + } + if (configured >= 1) { + return configured; } return networkstatus_get_param(NULL, - "guard-n-primary-guards-to-use", - DFLT_N_PRIMARY_GUARDS_TO_USE, 1, INT32_MAX); + param_name, param_default, 1, INT32_MAX); } /** * If we haven't successfully built or used a circuit in this long, then @@ -1807,6 +1819,7 @@ entry_guards_note_internet_connectivity(guard_selection_t *gs) */ STATIC entry_guard_t * select_entry_guard_for_circuit(guard_selection_t *gs, + guard_usage_t usage, const entry_guard_restriction_t *rst, unsigned *state_out) { @@ -1817,7 +1830,7 @@ select_entry_guard_for_circuit(guard_selection_t *gs, if (!gs->primary_guards_up_to_date) entry_guards_update_primary(gs); - int num_entry_guards = get_n_primary_guards_to_use(); + int num_entry_guards = get_n_primary_guards_to_use(usage); smartlist_t *usable_primary_guards = smartlist_new(); /* "If any entry in PRIMARY_GUARDS has {is_reachable} status of @@ -2080,6 +2093,7 @@ circuit_guard_state_free(circuit_guard_state_t *state) */ int entry_guard_pick_for_circuit(guard_selection_t *gs, + guard_usage_t usage, entry_guard_restriction_t *rst, const node_t **chosen_node_out, circuit_guard_state_t **guard_state_out) @@ -2091,7 +2105,8 @@ entry_guard_pick_for_circuit(guard_selection_t *gs, *guard_state_out = NULL; unsigned state = 0; - entry_guard_t *guard = select_entry_guard_for_circuit(gs, rst, &state); + entry_guard_t *guard = + select_entry_guard_for_circuit(gs, usage, rst, &state); if (! guard) goto fail; if (BUG(state == 0)) @@ -4986,6 +5001,7 @@ guards_choose_guard(cpath_build_state_t *state, memcpy(rst->exclude_id, exit_id, DIGEST_LEN); } if (entry_guard_pick_for_circuit(get_guard_selection_info(), + GUARD_USAGE_TRAFFIC, rst, &r, guard_state_out) < 0) { @@ -5018,6 +5034,7 @@ guards_choose_dirguard(dirinfo_type_t info, * microdescriptors. -NM */ const node_t *r = NULL; if (entry_guard_pick_for_circuit(get_guard_selection_info(), + GUARD_USAGE_DIRGUARD, NULL, &r, guard_state_out) < 0) { diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index e2ae256..c215c10 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -397,8 +397,16 @@ const char *entry_guard_get_rsa_id_digest(const entry_guard_t *guard); const char *entry_guard_describe(const entry_guard_t *guard); guard_pathbias_t *entry_guard_get_pathbias_state(entry_guard_t *guard); +/** Enum to specify how we're going to use a given guard, when we're picking + * one for immediate use. */ +typedef enum { + GUARD_USAGE_TRAFFIC = 0, + GUARD_USAGE_DIRGUARD = 1 +} guard_usage_t; + void circuit_guard_state_free(circuit_guard_state_t *state); int entry_guard_pick_for_circuit(guard_selection_t *gs, + guard_usage_t usage, entry_guard_restriction_t *rst, const node_t **chosen_node_out, circuit_guard_state_t **guard_state_out); @@ -477,6 +485,10 @@ int num_bridges_usable(void); */ #define DFLT_N_PRIMARY_GUARDS_TO_USE 1 /** + * As DFLT_N_PRIMARY_GUARDS, but for choosing which directory guard to use. + */ +#define DFLT_N_PRIMARY_DIR_GUARDS_TO_USE 3 +/** * If we haven't successfully built or used a circuit in this long, then * consider that the internet is probably down. */ @@ -511,7 +523,7 @@ STATIC int get_remove_unlisted_guards_after_days(void); STATIC int get_guard_lifetime(void); STATIC int get_guard_confirmed_min_lifetime(void); STATIC int get_n_primary_guards(void); -STATIC int get_n_primary_guards_to_use(void); +STATIC int get_n_primary_guards_to_use(guard_usage_t usage); STATIC int get_internet_likely_down_interval(void); STATIC int get_nonprimary_guard_connect_timeout(void); STATIC int get_nonprimary_guard_idle_timeout(void); @@ -590,6 +602,7 @@ STATIC void sampled_guards_update_from_consensus(guard_selection_t *gs); STATIC void entry_guards_note_guard_failure(guard_selection_t *gs, entry_guard_t *guard); STATIC entry_guard_t *select_entry_guard_for_circuit(guard_selection_t *gs, + guard_usage_t usage, const entry_guard_restriction_t *rst, unsigned *state_out); STATIC void mark_primary_guards_maybe_reachable(guard_selection_t *gs); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 594708a..0024113 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -2447,7 +2447,8 @@ test_entry_guard_select_for_circuit_no_confirmed(void *arg) entry_guards_update_primary(gs); unsigned state = 9999; - entry_guard_t *g = select_entry_guard_for_circuit(gs, NULL, &state); + entry_guard_t *g = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, + NULL, &state); tt_assert(g); tt_assert(g->is_primary); @@ -2457,7 +2458,8 @@ test_entry_guard_select_for_circuit_no_confirmed(void *arg) tt_i64_op(g->last_tried_to_connect, OP_EQ, approx_time()); // If we do that again, we should get the same guard. - entry_guard_t *g2 = select_entry_guard_for_circuit(gs, NULL, &state); + entry_guard_t *g2 = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, + NULL, &state); tt_ptr_op(g2, OP_EQ, g); // if we mark that guard down, we should get a different primary guard. @@ -2466,7 +2468,7 @@ test_entry_guard_select_for_circuit_no_confirmed(void *arg) g->failing_since = approx_time() - 10; g->last_tried_to_connect = approx_time() - 10; state = 9999; - g2 = select_entry_guard_for_circuit(gs, NULL, &state); + g2 = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, &state); tt_ptr_op(g2, OP_NE, g); tt_assert(g2); tt_assert(g2->is_primary); @@ -2480,7 +2482,7 @@ test_entry_guard_select_for_circuit_no_confirmed(void *arg) g->failing_since = approx_time() - 72*60*60; g->last_tried_to_connect = approx_time() - 72*60*60; state = 9999; - g2 = select_entry_guard_for_circuit(gs, NULL, &state); + g2 = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, &state); tt_ptr_op(g2, OP_EQ, g); tt_assert(g2); tt_uint_op(state, OP_EQ, GUARD_CIRC_STATE_USABLE_ON_COMPLETION); @@ -2495,7 +2497,7 @@ test_entry_guard_select_for_circuit_no_confirmed(void *arg) guard->failing_since = approx_time() - 30; }); state = 9999; - g2 = select_entry_guard_for_circuit(gs, NULL, &state); + g2 = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, &state); tt_assert(g2); tt_assert(!g2->is_primary); tt_int_op(g2->confirmed_idx, OP_EQ, -1); @@ -2515,16 +2517,16 @@ test_entry_guard_select_for_circuit_no_confirmed(void *arg) }); /* Let's try again and we should get the first primary guard again */ - g = select_entry_guard_for_circuit(gs, NULL, &state); + g = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, &state); tt_ptr_op(g, OP_EQ, smartlist_get(gs->primary_entry_guards, 0)); - g2 = select_entry_guard_for_circuit(gs, NULL, &state); + g2 = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, &state); tt_ptr_op(g2, OP_EQ, g); /* But if we impose a restriction, we don't get the same guard */ entry_guard_restriction_t rst; memset(&rst, 0, sizeof(rst)); memcpy(rst.exclude_id, g->identity, DIGEST_LEN); - g2 = select_entry_guard_for_circuit(gs, &rst, &state); + g2 = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, &rst, &state); tt_ptr_op(g2, OP_NE, g); done: @@ -2552,7 +2554,8 @@ test_entry_guard_select_for_circuit_confirmed(void *arg) unsigned state = 9999; // As above, this gives us a primary guard. - entry_guard_t *g = select_entry_guard_for_circuit(gs, NULL, &state); + entry_guard_t *g = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, + NULL, &state); tt_assert(g); tt_assert(g->is_primary); tt_int_op(g->confirmed_idx, OP_EQ, 0); @@ -2569,7 +2572,7 @@ test_entry_guard_select_for_circuit_confirmed(void *arg) // ... we should get a confirmed guard. state = 9999; - g = select_entry_guard_for_circuit(gs, NULL, &state); + g = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, &state); tt_assert(g); tt_assert(! g->is_primary); tt_int_op(g->confirmed_idx, OP_EQ, smartlist_len(gs->primary_entry_guards)); @@ -2580,7 +2583,8 @@ test_entry_guard_select_for_circuit_confirmed(void *arg) // And if we try again, we should get a different confirmed guard, since // that one is pending. state = 9999; - entry_guard_t *g2 = select_entry_guard_for_circuit(gs, NULL, &state); + entry_guard_t *g2 = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, + NULL, &state); tt_assert(g2); tt_assert(! g2->is_primary); tt_ptr_op(g2, OP_NE, g); @@ -2597,7 +2601,7 @@ test_entry_guard_select_for_circuit_confirmed(void *arg) entry_guard_restriction_t rst; memset(&rst, 0, sizeof(rst)); memcpy(rst.exclude_id, g->identity, DIGEST_LEN); - g2 = select_entry_guard_for_circuit(gs, &rst, &state); + g2 = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, &rst, &state); tt_ptr_op(g2, OP_NE, g); tt_int_op(g2->confirmed_idx, OP_EQ, smartlist_len(gs->primary_entry_guards)+3); @@ -2607,12 +2611,12 @@ test_entry_guard_select_for_circuit_confirmed(void *arg) const int n_remaining_confirmed = N_CONFIRMED - 3 - smartlist_len(gs->primary_entry_guards); for (i = 0; i < n_remaining_confirmed; ++i) { - g = select_entry_guard_for_circuit(gs, NULL, &state); + g = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, &state); tt_int_op(g->confirmed_idx, OP_GE, 0); tt_assert(g); } state = 9999; - g = select_entry_guard_for_circuit(gs, NULL, &state); + g = select_entry_guard_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, &state); tt_assert(g); tt_assert(g->is_pending); tt_int_op(g->confirmed_idx, OP_EQ, -1); @@ -2639,7 +2643,8 @@ test_entry_guard_select_for_circuit_highlevel_primary(void *arg) * Make sure that the pick-for-circuit API basically works. We'll get * a primary guard, so it'll be usable on completion. */ - int r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + int r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard); tt_assert(r == 0); tt_assert(node); @@ -2671,7 +2676,8 @@ test_entry_guard_select_for_circuit_highlevel_primary(void *arg) /* Try again. We'll also get a primary guard this time. (The same one, in fact.) But this time, we'll say the connection has failed. */ update_approx_time(start+35); - r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard); tt_assert(r == 0); tt_assert(node); tt_assert(guard); @@ -2706,7 +2712,8 @@ test_entry_guard_select_for_circuit_highlevel_primary(void *arg) * (still primary) guard. */ update_approx_time(start+60); - r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard); tt_assert(r == 0); tt_assert(node); tt_assert(guard); @@ -2758,7 +2765,8 @@ test_entry_guard_select_for_circuit_highlevel_confirm_other(void *arg) /* Primary guards are down! */ for (i = 0; i < N_PRIMARY; ++i) { - r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard); tt_assert(node); tt_assert(guard); tt_assert(r == 0); @@ -2771,7 +2779,8 @@ test_entry_guard_select_for_circuit_highlevel_confirm_other(void *arg) /* Next guard should be non-primary. */ node = NULL; - r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard); tt_assert(node); tt_assert(guard); tt_assert(r == 0); @@ -2823,7 +2832,8 @@ test_entry_guard_select_for_circuit_highlevel_primary_retry(void *arg) /* Make primary guards confirmed (so they won't be superseded by a later * guard), then mark them down. */ for (i = 0; i < N_PRIMARY; ++i) { - r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard); tt_assert(node); tt_assert(guard); tt_assert(r == 0); @@ -2839,7 +2849,8 @@ test_entry_guard_select_for_circuit_highlevel_primary_retry(void *arg) } /* Get another guard that we might try. */ - r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard); tt_assert(node); tt_assert(guard); tt_assert(r == 0); @@ -2866,7 +2877,8 @@ test_entry_guard_select_for_circuit_highlevel_primary_retry(void *arg) }); /* Have a circuit to a primary guard succeed. */ - r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard2); + r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard2); tt_assert(r == 0); tt_int_op(guard2->state, OP_EQ, GUARD_CIRC_STATE_USABLE_ON_COMPLETION); u = entry_guard_succeeded(&guard2); @@ -2895,7 +2907,8 @@ test_entry_guard_select_and_cancel(void *arg) /* Once more, we mark all the primary guards down. */ entry_guards_note_internet_connectivity(gs); for (i = 0; i < N_PRIMARY; ++i) { - r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard); tt_int_op(guard->state, OP_EQ, GUARD_CIRC_STATE_USABLE_ON_COMPLETION); g = entry_guard_handle_get(guard->guard); tt_int_op(g->is_primary, OP_EQ, 1); @@ -2910,7 +2923,8 @@ test_entry_guard_select_and_cancel(void *arg) tt_assert(entry_guards_all_primary_guards_are_down(gs)); /* Now get another guard we could try... */ - r = entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + r = entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &guard); tt_assert(node); tt_assert(guard); tt_assert(r == 0); @@ -2969,7 +2983,7 @@ upgrade_circuits_setup(const struct testcase_t *testcase) data->start = approx_time(); entry_guards_note_internet_connectivity(gs); for (i = 0; i < N_PRIMARY; ++i) { - entry_guard_pick_for_circuit(gs, NULL, &node, &guard); + entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, &node, &guard); g = entry_guard_handle_get(guard->guard); make_guard_confirmed(gs, g); entry_guard_failed(&guard); @@ -2980,7 +2994,8 @@ upgrade_circuits_setup(const struct testcase_t *testcase) data->all_origin_circuits = smartlist_new(); update_approx_time(data->start + 27); - entry_guard_pick_for_circuit(gs, NULL, &node, &data->guard1_state); + entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &data->guard1_state); origin_circuit_t *circ; data->circ1 = circ = origin_circuit_new(); circ->base_.purpose = CIRCUIT_PURPOSE_C_GENERAL; @@ -2988,7 +3003,8 @@ upgrade_circuits_setup(const struct testcase_t *testcase) smartlist_add(data->all_origin_circuits, circ); update_approx_time(data->start + 30); - entry_guard_pick_for_circuit(gs, NULL, &node, &data->guard2_state); + entry_guard_pick_for_circuit(gs, GUARD_USAGE_TRAFFIC, NULL, + &node, &data->guard2_state); data->circ2 = circ = origin_circuit_new(); circ->base_.purpose = CIRCUIT_PURPOSE_C_GENERAL; circ->guard_state = data->guard2_state; [View Less]

1 0

[tor/master] Remove UseDirectoryGuards
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit 3902a18a6976af2ceb2d6ca43266bf6154881621 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 12:35:55 2016 -0500 Remove UseDirectoryGuards It is obsoleted in an always-on direction by prop271. --- changes/ticket20831 | 6 ++++++ doc/tor.1.txt | 9 --------- src/or/config.c | 2 +- src/or/directory.c | 5 ++--- src/or/or.h | 2 -- src/test/test_dir.c | 14 ++++---------- 6 files changed, 13 insertions(+), 25 deletions(-) diff --… [View More]git a/changes/ticket20831 b/changes/ticket20831 new file mode 100644 index 0000000..cb4a3a3 --- /dev/null +++ b/changes/ticket20831 @@ -0,0 +1,6 @@ + o Removed features: + - The NumDirectoryGuards and UseDirectoryGuards torrc options are + no longer present: all users that use entry guards will also use + directory guards. Related to proposal 271; implements part of + ticket 20831. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 670c75d..6b59f08 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1208,15 +1208,6 @@ The following options are useful only for clients (that is, if Authorities, Single Onion Services, and Tor2web clients. In these cases, the this option is ignored. (Default: 1) -[[UseEntryGuardsAsDirGuards]] **UseEntryGuardsAsDirGuards** **0**|**1**:: - If this option is set to 1, and UseEntryGuards is also set to 1, - we try to use our entry guards as directory - guards, and failing that, pick more nodes to act as our directory guards. - This helps prevent an adversary from enumerating clients. It's only - available for clients (non-relay, non-bridge) that aren't configured to - download any non-default directory material. It doesn't currently - do anything when we lack a live consensus. (Default: 1) - [[GuardfractionFile]] **GuardfractionFile** __FILENAME__:: V3 authoritative directories only. Configures the location of the guardfraction file which contains information about how long relays diff --git a/src/or/config.c b/src/or/config.c index 2ec96d3..e45ad94 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -495,7 +495,7 @@ static config_var_t option_vars_[] = { V(UpdateBridgesFromAuthority, BOOL, "0"), V(UseBridges, BOOL, "0"), VAR("UseEntryGuards", BOOL, UseEntryGuards_option, "1"), - V(UseEntryGuardsAsDirGuards, BOOL, "1"), + OBSOLETE("UseEntryGuardsAsDirGuards"), V(UseGuardFraction, AUTOBOOL, "auto"), V(UseMicrodescriptors, AUTOBOOL, "auto"), OBSOLETE("UseNTorHandshake"), diff --git a/src/or/directory.c b/src/or/directory.c index 9c039a0..acae5de 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -442,10 +442,9 @@ should_use_directory_guards(const or_options_t *options) /* Public (non-bridge) servers never use directory guards. */ if (public_server_mode(options)) return 0; - /* If guards are disabled, or directory guards are disabled, we can't - * use directory guards. + /* If guards are disabled, we can't use directory guards. */ - if (!options->UseEntryGuards || !options->UseEntryGuardsAsDirGuards) + if (!options->UseEntryGuards) return 0; /* If we're configured to fetch directory info aggressively or of a * nonstandard type, don't use directory guards. */ diff --git a/src/or/or.h b/src/or/or.h index 04ff548..ceeaff5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4070,8 +4070,6 @@ typedef struct { int UseEntryGuards; int NumEntryGuards; /**< How many entry guards do we try to establish? */ - int UseEntryGuardsAsDirGuards; /** Boolean: Do we try to get directory info - * from a smallish number of fixed nodes? */ /** If 1, we use any guardfraction information we see in the * consensus. If 0, we don't. If -1, let the consensus parameter diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 4ef421f..ed58ba5 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4354,7 +4354,6 @@ test_dir_should_use_directory_guards(void *data) tt_int_op(should_use_directory_guards(options), OP_EQ, 0); tt_int_op(CALLED(public_server_mode), OP_EQ, 1); - options->UseEntryGuardsAsDirGuards = 1; options->UseEntryGuards = 1; options->DownloadExtraInfo = 0; options->FetchDirInfoEarly = 0; @@ -4368,29 +4367,24 @@ test_dir_should_use_directory_guards(void *data) tt_int_op(CALLED(public_server_mode), OP_EQ, 3); options->UseEntryGuards = 1; - options->UseEntryGuardsAsDirGuards = 0; - tt_int_op(should_use_directory_guards(options), OP_EQ, 0); - tt_int_op(CALLED(public_server_mode), OP_EQ, 4); - options->UseEntryGuardsAsDirGuards = 1; - options->DownloadExtraInfo = 1; tt_int_op(should_use_directory_guards(options), OP_EQ, 0); - tt_int_op(CALLED(public_server_mode), OP_EQ, 5); + tt_int_op(CALLED(public_server_mode), OP_EQ, 4); options->DownloadExtraInfo = 0; options->FetchDirInfoEarly = 1; tt_int_op(should_use_directory_guards(options), OP_EQ, 0); - tt_int_op(CALLED(public_server_mode), OP_EQ, 6); + tt_int_op(CALLED(public_server_mode), OP_EQ, 5); options->FetchDirInfoEarly = 0; options->FetchDirInfoExtraEarly = 1; tt_int_op(should_use_directory_guards(options), OP_EQ, 0); - tt_int_op(CALLED(public_server_mode), OP_EQ, 7); + tt_int_op(CALLED(public_server_mode), OP_EQ, 6); options->FetchDirInfoExtraEarly = 0; options->FetchUselessDescriptors = 1; tt_int_op(should_use_directory_guards(options), OP_EQ, 0); - tt_int_op(CALLED(public_server_mode), OP_EQ, 8); + tt_int_op(CALLED(public_server_mode), OP_EQ, 7); options->FetchUselessDescriptors = 0; done: [View Less]

1 0

[tor/master] Make NumEntryGuards work as expected again.
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit d9200d853d5b9125ebcb47ae5a02ef0cd52f436a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 12:59:58 2016 -0500 Make NumEntryGuards work as expected again. Further, add a "guard-n-primary-guards-to-use" parameter, defaulting to 1, for NumEntryGuards to override. --- src/or/entrynodes.c | 26 ++++++++++++++++++++++++-- src/or/entrynodes.h | 6 ++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/… [View More]entrynodes.c index 5c64dfd..9defd11 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -471,10 +471,32 @@ get_guard_confirmed_min_lifetime(void) STATIC int get_n_primary_guards(void) { - return networkstatus_get_param(NULL, "guard-n-primary-guards", + const int n = get_options()->NumEntryGuards; + if (n > 5) { + return n + n / 2; + } else if (n > 1) { + return n * 2; + } + + return networkstatus_get_param(NULL, + "guard-n-primary-guards", DFLT_N_PRIMARY_GUARDS, 1, INT32_MAX); } /** + * Return the number of the live primary guards we should look at when + * making a circuit. + */ +STATIC int +get_n_primary_guards_to_use(void) +{ + if (get_options()->NumEntryGuards > 1) { + return get_options()->NumEntryGuards; + } + return networkstatus_get_param(NULL, + "guard-n-primary-guards-to-use", + DFLT_N_PRIMARY_GUARDS_TO_USE, 1, INT32_MAX); +} +/** * If we haven't successfully built or used a circuit in this long, then * consider that the internet is probably down. */ @@ -1795,7 +1817,7 @@ select_entry_guard_for_circuit(guard_selection_t *gs, if (!gs->primary_guards_up_to_date) entry_guards_update_primary(gs); - int num_entry_guards = 1; + int num_entry_guards = get_n_primary_guards_to_use(); smartlist_t *usable_primary_guards = smartlist_new(); /* "If any entry in PRIMARY_GUARDS has {is_reachable} status of diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 827755a..e2ae256 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -472,6 +472,11 @@ int num_bridges_usable(void); */ #define DFLT_N_PRIMARY_GUARDS 3 /** + * Of the live guards on the primary guard list, how many do we consider when + * choosing a guard to use? + */ +#define DFLT_N_PRIMARY_GUARDS_TO_USE 1 +/** * If we haven't successfully built or used a circuit in this long, then * consider that the internet is probably down. */ @@ -506,6 +511,7 @@ STATIC int get_remove_unlisted_guards_after_days(void); STATIC int get_guard_lifetime(void); STATIC int get_guard_confirmed_min_lifetime(void); STATIC int get_n_primary_guards(void); +STATIC int get_n_primary_guards_to_use(void); STATIC int get_internet_likely_down_interval(void); STATIC int get_nonprimary_guard_connect_timeout(void); STATIC int get_nonprimary_guard_idle_timeout(void); [View Less]

1 0

[tor/master] Respect GuardLifetime in prop271 code.
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit 385602e9826e79dbf0d8b51abfd925e59f275708 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 12:42:28 2016 -0500 Respect GuardLifetime in prop271 code. It overrides both the GUARD_LIFETIME and the GUARD_CONFIRMED_MIN_LIFETIME options. --- src/or/entrynodes.c | 30 +++++++++++++++++++----------- src/or/entrynodes.h | 4 ++-- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index ac5398f..… [View More]f89594b 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -440,22 +440,30 @@ get_remove_unlisted_guards_after_days(void) * regardless of whether they are listed or unlisted. */ STATIC int -get_guard_lifetime_days(void) +get_guard_lifetime(void) { - return networkstatus_get_param(NULL, + if (get_options()->GuardLifetime >= 86400) + return get_options()->GuardLifetime; + int32_t days; + days = networkstatus_get_param(NULL, "guard-lifetime-days", DFLT_GUARD_LIFETIME_DAYS, 1, 365*10); + return days * 86400; } /** * We remove confirmed guards from the sample if they were sampled * GUARD_LIFETIME_DAYS ago and confirmed this many days ago. */ STATIC int -get_guard_confirmed_min_lifetime_days(void) +get_guard_confirmed_min_lifetime(void) { - return networkstatus_get_param(NULL, "guard-confirmed-min-lifetime-days", + if (get_options()->GuardLifetime >= 86400) + return get_options()->GuardLifetime; + int32_t days; + days = networkstatus_get_param(NULL, "guard-confirmed-min-lifetime-days", DFLT_GUARD_CONFIRMED_MIN_LIFETIME_DAYS, 1, 365*10); + return days * 86400; } /** * How many guards do we try to keep on our primary guard list? @@ -793,7 +801,7 @@ entry_guard_add_to_sample_impl(guard_selection_t *gs, const char *nickname, const tor_addr_port_t *bridge_addrport) { - const int GUARD_LIFETIME = get_guard_lifetime_days() * 86400; + const int GUARD_LIFETIME = get_guard_lifetime(); tor_assert(gs); // XXXX prop271 take ed25519 identity here too. @@ -1228,9 +1236,9 @@ sampled_guards_update_from_consensus(guard_selection_t *gs) const time_t remove_if_unlisted_since = approx_time() - REMOVE_UNLISTED_GUARDS_AFTER; const time_t maybe_remove_if_sampled_before = - approx_time() - (get_guard_lifetime_days() * 86400); + approx_time() - get_guard_lifetime(); const time_t remove_if_confirmed_before = - approx_time() - (get_guard_confirmed_min_lifetime_days() * 86400); + approx_time() - get_guard_confirmed_min_lifetime(); /* Then: remove the ones that have been junk for too long */ SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { @@ -1257,14 +1265,14 @@ sampled_guards_update_from_consensus(guard_selection_t *gs) log_info(LD_GUARD, "Removing sampled guard %s: it was sampled " "over %d days ago, but never confirmed.", entry_guard_describe(guard), - get_guard_lifetime_days()); + get_guard_lifetime() / 86400); } else if (guard->confirmed_on_date < remove_if_confirmed_before) { remove = 1; log_info(LD_GUARD, "Removing sampled guard %s: it was sampled " "over %d days ago, and confirmed over %d days ago.", entry_guard_describe(guard), - get_guard_lifetime_days(), - get_guard_confirmed_min_lifetime_days()); + get_guard_lifetime() / 86400, + get_guard_confirmed_min_lifetime() / 86400); } } @@ -1559,7 +1567,7 @@ make_guard_confirmed(guard_selection_t *gs, entry_guard_t *guard) if (BUG(smartlist_contains(gs->confirmed_entry_guards, guard))) return; // LCOV_EXCL_LINE - const int GUARD_LIFETIME = get_guard_lifetime_days() * 86400; + const int GUARD_LIFETIME = get_guard_lifetime(); guard->confirmed_on_date = randomize_time(approx_time(), GUARD_LIFETIME/10); log_info(LD_GUARD, "Marking %s as a confirmed guard (index %d)", diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index d7dc014..827755a 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -503,8 +503,8 @@ STATIC double get_max_sample_threshold(void); STATIC int get_max_sample_size_absolute(void); STATIC int get_min_filtered_sample_size(void); STATIC int get_remove_unlisted_guards_after_days(void); -STATIC int get_guard_lifetime_days(void); -STATIC int get_guard_confirmed_min_lifetime_days(void); +STATIC int get_guard_lifetime(void); +STATIC int get_guard_confirmed_min_lifetime(void); STATIC int get_n_primary_guards(void); STATIC int get_internet_likely_down_interval(void); STATIC int get_nonprimary_guard_connect_timeout(void); [View Less]

1 0

[tor/master] 271: Algorithm tweak to allow multiple entry guards.
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit deb8bcadced3c54d986c526662444a46e630621d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 12:47:29 2016 -0500 271: Algorithm tweak to allow multiple entry guards. Previously, we had NumEntryGuards kind of hardwired to 1. Now we have the code (but not the configuarability) to choose randomly from among the first N primary guards that would work, where N defaults to 1. Part of 20831 support for making NumEntryGuards work again. --- … [View More]

1 0

[tor/master] fixup! Remove UseDirectoryGuards
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit a752ccd24f78838c7c1b6e245d09485459d28942 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 16 11:34:22 2016 -0500 fixup! Remove UseDirectoryGuards --- changes/ticket20831 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/ticket20831 b/changes/ticket20831 index cb4a3a3..c5be243 100644 --- a/changes/ticket20831 +++ b/changes/ticket20831 @@ -1,5 +1,5 @@ o Removed features: - - The NumDirectoryGuards and UseDirectoryGuards torrc … [View More]

1 0

[tor/master] Merge branch 'ticket20831_v2'
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit 990a863d7ca74c84238791607b6515813b3b5633 Merge: 988b0af 506bd6d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 16 11:40:19 2016 -0500 Merge branch 'ticket20831_v2' changes/ticket20831 | 6 +++ doc/tor.1.txt | 9 ----- src/or/config.c | 2 +- src/or/directory.c | 5 +-- src/or/entrynodes.c | 91 ++++++++++++++++++++++++++++++++++++++-------- src/or/entrynodes.h | 23 +++++++++++- src/or/or.h … [View More]

1 0

[tor/master] Merge branch 'ticket20826_v2'
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit 988b0afbd6bbb97e3ca796a608a4087888f162aa Merge: 4ec9751 e044b4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 16 11:29:02 2016 -0500 Merge branch 'ticket20826_v2' src/or/entrynodes.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)

1 0