October 2017 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 03 Oct '17

03 Oct '17

commit a83b05ec069b8239568f952e2b582ab6bdc01d7b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 3 13:46:08 2017 +0000 Update translations for liveusb-creator --- ga/ga.po | 72 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/ga/ga.po b/ga/ga.po index 98d2e338a..0be7a890f 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-25 14:02+0200\n" -"PO-Revision-Date: 2017-10-03 13:15+0000\n" +"PO-Revision-Date: 2017-10-03 13:46+0000\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Suim sheiceála SHA256 den íomhá LiveCD á deimhniú..." msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "Earráid: Tá SHA1 an CD Bheo neamhbhailí. Is féidir leat an ríomhchlár a rith leis an argóint --noverify chun an tseiceáil seo a sheachaint." +msgstr "Earráid: Tá SHA1 an Dhlúthdhiosca Bheo neamhbhailí. Is féidir leat an ríomhchlár a rith leis an argóint --noverify chun an tseiceáil seo a sheachaint." #: ../tails_installer/creator.py:366 msgid "Unknown ISO, skipping checksum verification" @@ -89,12 +89,12 @@ msgstr "Níorbh fhéidir chmod a chur i bhfeidhm ar %(file)s: %(message)s" #: ../tails_installer/creator.py:472 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "Níorbh fhéidir comhad a bhaint den LiveOS roimhe seo: %(message)s" +msgstr "Níorbh fhéidir comhad a bhaint den LiveOS a bhí ann: %(message)s" #: ../tails_installer/creator.py:484 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "Níorbh fhéidir comhadlann a bhaint den LiveOS roimhe seo: %(message)s" +msgstr "Níorbh fhéidir comhadlann a bhaint den LiveOS a bhí ann: %(message)s" #: ../tails_installer/creator.py:532 #, python-format @@ -164,16 +164,16 @@ msgstr "Gléas %(device)s á dheighilt" #: ../tails_installer/creator.py:920 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "Airíonna dheighilt an chórais %(system_partition)s á nuashonrú" #: ../tails_installer/creator.py:976 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "" +msgstr "Ní thacaítear le gléas '%(device)s'; seol tuairisc chugainn faoi seo mar fhabht." #: ../tails_installer/creator.py:979 msgid "Trying to continue anyway." -msgstr "" +msgstr "Déan iarracht leanúint ar aghaidh mar sin féin." #: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381 msgid "Verifying filesystem..." @@ -214,26 +214,26 @@ msgstr "%(device)s á fhormáidiú mar FAT32" #: ../tails_installer/creator.py:1266 msgid "Could not find syslinux' gptmbr.bin" -msgstr "" +msgstr "Níor aimsíodh gptmbr.bin syslinux" #: ../tails_installer/creator.py:1279 #, python-format msgid "Reading extracted MBR from %s" -msgstr "" +msgstr "MBR asbhainte á léamh ó %s" #: ../tails_installer/creator.py:1283 #, python-format msgid "Could not read the extracted MBR from %(path)s" -msgstr "" +msgstr "Níorbh fhéidir an MBR asbhainte a léamh ó %(path)s" #: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "" +msgstr "Máistirthaifead Tosaithe %s á athshocrú" #: ../tails_installer/creator.py:1302 msgid "Drive is a loopback, skipping MBR reset" -msgstr "" +msgstr "Is gléas aislúbtha é an tiomántán; ní athshocrófar an MBR" #: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560 #, python-format @@ -246,7 +246,7 @@ msgstr "Sonraí á sioncronú ar an diosca..." #: ../tails_installer/creator.py:1373 msgid "Error probing device" -msgstr "" +msgstr "Earráid agus an gléas á thóraíocht" #: ../tails_installer/creator.py:1375 msgid "Unable to find any supported device" @@ -255,7 +255,7 @@ msgstr "Ní féidir aon ghléas tacaithe a aimsiú" #: ../tails_installer/creator.py:1385 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "" +msgstr "Deimhnigh go bhfuil an mhéaróg USB plugáilte isteach agus gur formáidíodh le córas comhad FAT é" #: ../tails_installer/creator.py:1388 #, python-format @@ -267,7 +267,7 @@ msgstr "Córas comhad nach dtacaítear leis: %s\nDéan cúltaca ar an méaróg U #: ../tails_installer/creator.py:1455 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "" +msgstr "Níl aon fháil ar Win32_LogicalDisk; ní bhfuarthas aon toradh ón iarratas win32com" #: ../tails_installer/creator.py:1508 msgid "Cannot find" @@ -277,7 +277,7 @@ msgstr "Ní féidir é a aimsiú" msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." -msgstr "" +msgstr "Deimhnigh gur dhíphacáil tú an comhad .zip iomlán tails-installer sula gcuirfidh tú an clár seo i bhfeidhm." #: ../tails_installer/gui.py:69 #, python-format @@ -293,12 +293,12 @@ msgstr "%s á íoslódáil..." msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "" +msgstr "Earráid: Ní féidir lipéad an ghléis a shocrú, ná UUID an ghléis a fháil. Ní féidir dul ar aghaidh." #: ../tails_installer/gui.py:258 #, python-format msgid "Installation complete! (%s)" -msgstr "" +msgstr "Críochnaíodh an tsuiteáil! (%s)" #: ../tails_installer/gui.py:263 msgid "Tails installation failed!" @@ -338,12 +338,12 @@ msgstr "Roghnaigh íomhá ISO Tails." #: ../tails_installer/gui.py:516 msgid "No device suitable to install Tails could be found" -msgstr "" +msgstr "Níor aimsíodh aon ghléas feiliúnach le Tails a shuiteáil" #: ../tails_installer/gui.py:518 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." -msgstr "" +msgstr "Cuir isteach méaróg chuimhne USB nó cárta SD ar a bhfuil ar a laghad %0.1f GB." #: ../tails_installer/gui.py:552 #, python-format @@ -351,14 +351,14 @@ msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " "manufacturer and Tails will fail to start on it. Please try installing on a " "different model." -msgstr "" +msgstr "Chumraigh an déantóir an mhéaróg USB \"%(pretty_name)s\" mar ghléas dobhainte, agus ní thosóidh Tails air. Déan iarracht Tails a shuiteáil ar mhéaróg eile." #: ../tails_installer/gui.py:562 #, python-format msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." -msgstr "" +msgstr "Tá an gléas \"%(pretty_name)s\" róbheag le Tails a shuiteáil (ar a laghad %(size)s GB de dhíth)." #: ../tails_installer/gui.py:584 msgid "An error happened while installing Tails" @@ -374,11 +374,11 @@ msgstr "Nuashonraíodh na leaganacha!" #: ../tails_installer/gui.py:643 msgid "Installation complete!" -msgstr "" +msgstr "Críochnaíodh an tsuiteáil!" #: ../tails_installer/gui.py:644 msgid "Installation was completed." -msgstr "" +msgstr "Críochnaíodh an tsuiteáil." #: ../tails_installer/gui.py:693 msgid "Unable to mount device" @@ -406,7 +406,7 @@ msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "" +msgstr "\n\nCaomhnófar an stóras seasmhach ar an méaróg USB seo." #: ../tails_installer/gui.py:726 #, python-format @@ -415,7 +415,7 @@ msgstr "%(description)s%(persistence_message)s" #: ../tails_installer/gui.py:776 msgid "Download complete!" -msgstr "" +msgstr "Íoslódáil curtha i gcrích!" #: ../tails_installer/gui.py:780 msgid "Download failed: " @@ -423,19 +423,19 @@ msgstr "Theip ar an íoslódáil:" #: ../tails_installer/gui.py:781 msgid "You can try again to resume your download" -msgstr "" +msgstr "Is féidir leat iarracht a dhéanamh an íoslódáil a atosú" #: ../tails_installer/gui.py:789 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "" +msgstr "Ní féidir an comhad roghnaithe a léamh. Ceartaigh na ceadanna nó roghnaigh comhad eile." #: ../tails_installer/gui.py:795 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "" +msgstr "Níorbh fhéidir an comhad roghnaithe a úsáid. Gheobhaidh tú torthaí níos fearr má bhogann tú an ISO go dtí fréamhchomhadlann an tiomántáin (.i. C:\\)" #: ../tails_installer/gui.py:801 #, python-format @@ -449,7 +449,7 @@ msgstr "Níorbh fhéidir LiveOS a aimsiú ar an ISO" #: ../tails_installer/source.py:34 #, python-format msgid "Could not guess underlying block device: %s" -msgstr "" +msgstr "Níorbh fhéidir an bunghléas bloc a dhéanamh amach: %s" #: ../tails_installer/source.py:49 #, python-format @@ -457,7 +457,7 @@ msgid "" "There was a problem executing `%s`.\n" "%s\n" "%s" -msgstr "" +msgstr "Tharla earráid agus '%s' á rith.\n%s\n%s" #: ../tails_installer/source.py:63 #, python-format @@ -472,18 +472,18 @@ msgstr "Ní comhadlann é '%s'" #: ../tails_installer/source.py:75 #, python-format msgid "Skipping '%(filename)s'" -msgstr "" +msgstr "Ag dul thar '%(filename)s'" #: ../tails_installer/utils.py:44 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" -msgstr "" +msgstr "Tharla earráid agus '%s'.%s á rith\n%s" #: ../tails_installer/utils.py:124 msgid "Could not open device for writing." -msgstr "" +msgstr "Níorbh fhéidir an gléas a oscailt le scríobh air." #: ../data/tails-installer.ui.h:1 msgid "Installation Instructions" @@ -495,11 +495,11 @@ msgstr "Cóipeáil an leagan reatha de Tails" #: ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" -msgstr "" +msgstr "Úsáid íomhá ISO Tails íoslódáilte" #: ../data/tails-installer.ui.h:4 msgid "Select a distribution to download:" -msgstr "" +msgstr "Roghnaigh dáileadh le híoslódáil:" #: ../data/tails-installer.ui.h:5 msgid "Target USB stick:"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 03 Oct '17

03 Oct '17

commit cb243e9727f4312d93467d0ff3968fa07ec7c25e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 3 13:46:01 2017 +0000 Update translations for https_everywhere_completed --- nb/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd index d7c253165..dd5b9a768 100644 --- a/nb/https-everywhere.dtd +++ b/nb/https-everywhere.dtd @@ -11,6 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "Vis teller"> <!ENTITY https-everywhere.menu.viewAllRules "Vis alle regler"> +<!ENTITY https-everywhere.options.generalSettings "Generelle innstillinger"> <!ENTITY https-everywhere.options.importSettings "Importer innstillinger"> <!ENTITY https-everywhere.options.import "Importer"> <!ENTITY https-everywhere.options.imported "Innstillingene dine har blitt importerte.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 Oct '17

03 Oct '17

commit 9d376326db52748914e3d9b1132ad0684ec08af5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 3 13:45:46 2017 +0000 Update translations for https_everywhere --- nb/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd index 38f47512c..dd5b9a768 100644 --- a/nb/https-everywhere.dtd +++ b/nb/https-everywhere.dtd @@ -11,7 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "Vis teller"> <!ENTITY https-everywhere.menu.viewAllRules "Vis alle regler"> -<!ENTITY https-everywhere.options.generalSettings "General Settings"> +<!ENTITY https-everywhere.options.generalSettings "Generelle innstillinger"> <!ENTITY https-everywhere.options.importSettings "Importer innstillinger"> <!ENTITY https-everywhere.options.import "Importer"> <!ENTITY https-everywhere.options.imported "Innstillingene dine har blitt importerte.">

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 03 Oct '17

03 Oct '17

commit 2c64ef2394d689eaef92d4b43d2369e243e3be28 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 3 13:16:11 2017 +0000 Update translations for liveusb-creator --- ga/ga.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ga/ga.po b/ga/ga.po index 88e858d38..98d2e338a 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-25 14:02+0200\n" -"PO-Revision-Date: 2017-09-28 22:44+0000\n" +"PO-Revision-Date: 2017-10-03 13:15+0000\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n" "MIME-Version: 1.0\n" @@ -54,23 +54,23 @@ msgstr "Suim sheiceála SHA256 den íomhá LiveCD á deimhniú..." msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "" +msgstr "Earráid: Tá SHA1 an CD Bheo neamhbhailí. Is féidir leat an ríomhchlár a rith leis an argóint --noverify chun an tseiceáil seo a sheachaint." #: ../tails_installer/creator.py:366 msgid "Unknown ISO, skipping checksum verification" -msgstr "" +msgstr "ISO anaithnid, ní dheimhneofar an tsuim seiceála" #: ../tails_installer/creator.py:377 #, python-format msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "Níl dóthain spáis ar an ngléas.\n%dMB ISO + %dMB forleagan > %dMB spás saor" #: ../tails_installer/creator.py:384 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "" +msgstr "Forleagan seasmhach %s MB á chruthú" #: ../tails_installer/creator.py:445 #, python-format @@ -79,7 +79,7 @@ msgstr "Níorbh fhéidir %(infile)s a chóipeáil go %(outfile)s: %(message)s" #: ../tails_installer/creator.py:459 msgid "Removing existing Live OS" -msgstr "" +msgstr "An LiveOS atá ann á bhaint" #: ../tails_installer/creator.py:468 ../tails_installer/creator.py:479 #, python-format @@ -89,12 +89,12 @@ msgstr "Níorbh fhéidir chmod a chur i bhfeidhm ar %(file)s: %(message)s" #: ../tails_installer/creator.py:472 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "Níorbh fhéidir comhad a bhaint den LiveOS roimhe seo: %(message)s" #: ../tails_installer/creator.py:484 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "Níorbh fhéidir comhadlann a bhaint den LiveOS roimhe seo: %(message)s" #: ../tails_installer/creator.py:532 #, python-format @@ -104,18 +104,18 @@ msgstr "Ní féidir gléas %s a aimsiú" #: ../tails_installer/creator.py:701 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "Níorbh fhéidir scríobh ar %(device)s, ag dul thart." #: ../tails_installer/creator.py:725 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "" +msgstr "Tá deighiltí áirithe ar an ngléas sprice %(device)s feistithe faoi láthair. Dífheisteofar iad sula dtosóidh an próiseas suiteála." #: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "Córas comhad anaithnid. Seans gur gá duit an gléas a fhormáidiú." #: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994 #, python-format @@ -125,7 +125,7 @@ msgstr "Córas comhad nach dtacaítear leis: %s" #: ../tails_installer/creator.py:788 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" -msgstr "" +msgstr "Earráid anaithnid GLib agus an gléas á fheistiú: %(message)s" #: ../tails_installer/creator.py:792 #, python-format @@ -134,17 +134,17 @@ msgstr "Níorbh fhéidir an gléas a fheistiú: %(message)s" #: ../tails_installer/creator.py:797 msgid "No mount points found" -msgstr "" +msgstr "Níor aimsíodh aon phointe feistithe" #: ../tails_installer/creator.py:808 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "Ag tosú unmount_device i gcomhair '%(device)s'" #: ../tails_installer/creator.py:818 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "Córais comhad feistithe ar '%(device)s' á ndífheistiú" #: ../tails_installer/creator.py:822 #, python-format

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 03 Oct '17

03 Oct '17

commit 204c580ce42eced25833ff1fb71db4a06624cbe3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 3 13:15:35 2017 +0000 Update translations for whisperback --- ga/ga.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/ga.po b/ga/ga.po index a45ecfe05..303aa929e 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-10-03 12:37+0000\n" +"PO-Revision-Date: 2017-10-03 12:46+0000\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] entrynodes: Error msg for missing guard descs is now more informative.
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit 5352785d0caec23f753ae7fcab4449b03f5643b8 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Oct 3 14:38:53 2017 +0300 entrynodes: Error msg for missing guard descs is now more informative. --- src/or/entrynodes.c | 21 ++++++++++++++------- src/or/entrynodes.h | 7 +++++-- src/or/nodelist.c | 7 ++++--- src/test/test_entrynodes.c | 11 ++++++----- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 1e96fc7f5..c71a93bea 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3442,9 +3442,13 @@ guards_retry_optimistic(const or_options_t *options) /** * Check if we are missing any crucial dirinfo for the guard subsystem to * work. Return NULL if everything went well, otherwise return a newly - * allocated string with an informative error message. */ + * allocated string with an informative error message. In the latter case, use + * the genreal descriptor information using_mds, num_present and + * num_usable to improve the error message. */ char * -guard_selection_get_dir_info_status_str(guard_selection_t *gs) +guard_selection_get_dir_info_status_str(guard_selection_t *gs, + int using_mds, + int num_present, int num_usable) { if (!gs->primary_guards_up_to_date) entry_guards_update_primary(gs); @@ -3478,8 +3482,9 @@ guard_selection_get_dir_info_status_str(guard_selection_t *gs) /* otherwise return a helpful error string */ tor_asprintf(&ret_str, "We're missing descriptors for %d/%d of our " - "primary entry guards", - n_missing_descriptors, num_primary_to_check); + "primary entry guards (total %sdescriptors: %d/%d).", + n_missing_descriptors, num_primary_to_check, + using_mds?"micro":"", num_present, num_usable); return ret_str; } @@ -3487,10 +3492,12 @@ guard_selection_get_dir_info_status_str(guard_selection_t *gs) /** As guard_selection_have_enough_dir_info_to_build_circuits, but uses * the default guard selection. */ char * -entry_guards_get_dir_info_status_str(void) +entry_guards_get_dir_info_status_str(int using_mds, + int num_present, int num_usable) { - return guard_selection_get_dir_info_status_str( - get_guard_selection_info()); + return guard_selection_get_dir_info_status_str(get_guard_selection_info(), + using_mds, + num_present, num_usable); } /** Free one guard selection context */ diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index d049a88cd..ca9fb489e 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -572,8 +572,11 @@ int getinfo_helper_entry_guards(control_connection_t *conn, int entries_known_but_down(const or_options_t *options); void entries_retry_all(const or_options_t *options); -char *entry_guards_get_dir_info_status_str(void); -char *guard_selection_get_dir_info_status_str(guard_selection_t *gs); +char *entry_guards_get_dir_info_status_str(int using_mds, + int num_present, int num_usable); +char *guard_selection_get_dir_info_status_str(guard_selection_t *gs, + int using_mds, + int num_present, int num_usable); void entry_guards_free_all(void); diff --git a/src/or/nodelist.c b/src/or/nodelist.c index ff26065ff..6ca9bd6d4 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -2282,6 +2282,7 @@ update_router_have_minimum_dir_info(void) { time_t now = time(NULL); int res; + int num_present=0, num_usable=0; const or_options_t *options = get_options(); const networkstatus_t *consensus = networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); @@ -2303,7 +2304,6 @@ update_router_have_minimum_dir_info(void) /* Check fraction of available paths */ { char *status = NULL; - int num_present=0, num_usable=0; double paths = compute_frac_paths_available(consensus, options, now, &num_present, &num_usable, &status); @@ -2325,7 +2325,9 @@ update_router_have_minimum_dir_info(void) } { /* Check entry guard dirinfo status */ - char *guard_error = entry_guards_get_dir_info_status_str(); + char *guard_error = entry_guards_get_dir_info_status_str(using_md, + num_present, + num_usable); if (guard_error) { strlcpy(dir_info_status, guard_error, sizeof(dir_info_status)); tor_free(guard_error); @@ -2334,7 +2336,6 @@ update_router_have_minimum_dir_info(void) } } - done: /* If paths have just become available in this update. */ diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 36e457bdf..472383f38 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -1641,9 +1641,9 @@ test_entry_guard_manage_primary(void *arg) /* Do some dirinfo checks */ { - /* Check that we have all required dirinfo for the primaries (that's done in - * big_fake_network_setup()) */ - char *dir_info_str = guard_selection_get_dir_info_status_str(gs); + /* Check that we have all required dirinfo for the primaries (that's done + * in big_fake_network_setup()) */ + char *dir_info_str = guard_selection_get_dir_info_status_str(gs, 0, 0, 0); tt_assert(!dir_info_str); /* Now artificially remove the first primary's descriptor and re-check */ @@ -1652,9 +1652,10 @@ test_entry_guard_manage_primary(void *arg) /* Change the first primary's identity digest so that the mocked functions * can't find its descriptor */ memset(first_primary->identity, 9, sizeof(first_primary->identity)); - dir_info_str = guard_selection_get_dir_info_status_str(gs); + dir_info_str = guard_selection_get_dir_info_status_str(gs, 1, 2, 3); tt_str_op(dir_info_str, OP_EQ, - "We're missing descriptors for 1/2 of our primary entry guards"); + "We're missing descriptors for 1/2 of our primary entry guards " + "(total microdescriptors: 2/3)."); tor_free(dir_info_str); }

1 0

[tor/master] entrynodes: Move guard dirinfo check below path dirinfo check.
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit f2231306ba58cc5d9a5addb41eb7f287e3802746 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Oct 3 14:16:49 2017 +0300 entrynodes: Move guard dirinfo check below path dirinfo check. We do that because we want to use the path fraction dirinfo data in case we are missing primary guard dirinfo. --- src/or/nodelist.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 93dd43f3c..ff26065ff 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -2300,16 +2300,6 @@ update_router_have_minimum_dir_info(void) using_md = consensus->flavor == FLAV_MICRODESC; - { /* Check entry guard dirinfo status */ - char *guard_error = entry_guards_get_dir_info_status_str(); - if (guard_error) { - strlcpy(dir_info_status, guard_error, sizeof(dir_info_status)); - tor_free(guard_error); - res = 0; - goto done; - } - } - /* Check fraction of available paths */ { char *status = NULL; @@ -2334,6 +2324,17 @@ update_router_have_minimum_dir_info(void) res = 1; } + { /* Check entry guard dirinfo status */ + char *guard_error = entry_guards_get_dir_info_status_str(); + if (guard_error) { + strlcpy(dir_info_status, guard_error, sizeof(dir_info_status)); + tor_free(guard_error); + res = 0; + goto done; + } + } + + done: /* If paths have just become available in this update. */

1 0

[tor/master] entrynodes: Better naming for dir info check functions.
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit f7306b16ecaeb07eb64d0fcbfcc43754533818c2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Oct 3 15:50:54 2017 +0300 entrynodes: Better naming for dir info check functions. --- src/or/entrynodes.c | 7 ++++--- src/or/entrynodes.h | 4 ++-- src/or/nodelist.c | 2 +- src/test/test_entrynodes.c | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index c71a93bea..9fbf42643 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3446,7 +3446,7 @@ guards_retry_optimistic(const or_options_t *options) * the genreal descriptor information using_mds, num_present and * num_usable to improve the error message. */ char * -guard_selection_get_dir_info_status_str(guard_selection_t *gs, +guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs, int using_mds, int num_present, int num_usable) { @@ -3492,10 +3492,11 @@ guard_selection_get_dir_info_status_str(guard_selection_t *gs, /** As guard_selection_have_enough_dir_info_to_build_circuits, but uses * the default guard selection. */ char * -entry_guards_get_dir_info_status_str(int using_mds, +entry_guards_get_err_str_if_dir_info_missing(int using_mds, int num_present, int num_usable) { - return guard_selection_get_dir_info_status_str(get_guard_selection_info(), + return guard_selection_get_err_str_if_dir_info_missing( + get_guard_selection_info(), using_mds, num_present, num_usable); } diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index ca9fb489e..9e1e72993 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -572,9 +572,9 @@ int getinfo_helper_entry_guards(control_connection_t *conn, int entries_known_but_down(const or_options_t *options); void entries_retry_all(const or_options_t *options); -char *entry_guards_get_dir_info_status_str(int using_mds, +char *entry_guards_get_err_str_if_dir_info_missing(int using_mds, int num_present, int num_usable); -char *guard_selection_get_dir_info_status_str(guard_selection_t *gs, +char *guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs, int using_mds, int num_present, int num_usable); diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 6ca9bd6d4..eae74e18b 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -2325,7 +2325,7 @@ update_router_have_minimum_dir_info(void) } { /* Check entry guard dirinfo status */ - char *guard_error = entry_guards_get_dir_info_status_str(using_md, + char *guard_error = entry_guards_get_err_str_if_dir_info_missing(using_md, num_present, num_usable); if (guard_error) { diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 472383f38..f9d981953 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -1643,7 +1643,8 @@ test_entry_guard_manage_primary(void *arg) { /* Check that we have all required dirinfo for the primaries (that's done * in big_fake_network_setup()) */ - char *dir_info_str = guard_selection_get_dir_info_status_str(gs, 0, 0, 0); + char *dir_info_str = + guard_selection_get_err_str_if_dir_info_missing(gs, 0, 0, 0); tt_assert(!dir_info_str); /* Now artificially remove the first primary's descriptor and re-check */ @@ -1652,7 +1653,7 @@ test_entry_guard_manage_primary(void *arg) /* Change the first primary's identity digest so that the mocked functions * can't find its descriptor */ memset(first_primary->identity, 9, sizeof(first_primary->identity)); - dir_info_str = guard_selection_get_dir_info_status_str(gs, 1, 2, 3); + dir_info_str =guard_selection_get_err_str_if_dir_info_missing(gs, 1, 2, 3); tt_str_op(dir_info_str, OP_EQ, "We're missing descriptors for 1/2 of our primary entry guards " "(total microdescriptors: 2/3).");

1 0

[tor/master] entrynodes: Add changes file.
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit d891faddc79c8cb58723edd431895927871d3803 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Oct 3 15:48:12 2017 +0300 entrynodes: Add changes file. --- changes/bug23670 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug23670 b/changes/bug23670 new file mode 100644 index 000000000..039bc3947 --- /dev/null +++ b/changes/bug23670 @@ -0,0 +1,3 @@ + o Minor features (entry guards): + - Improve logs issued when we are missing descriptors of primary guards. + Resolves ticket 23670.

1 0

[tor/master] entrynodes: Be specific about how many primary descriptors we miss.
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit c9729853a5ccfc15d206c43be8e15aea93ae19ee Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Oct 2 20:43:22 2017 +0300 entrynodes: Be specific about how many primary descriptors we miss. --- src/or/entrynodes.c | 29 ++++++++++++++++++++--------- src/or/entrynodes.h | 5 ++--- src/or/nodelist.c | 13 ++++++++----- src/test/test_entrynodes.c | 19 +++++++++++++++++++ 4 files changed, 49 insertions(+), 17 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 129b98333..1e96fc7f5 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3440,15 +3440,16 @@ guards_retry_optimistic(const or_options_t *options) } /** - * Return true iff we know enough directory information to construct - * circuits through all of the primary guards we'd currently use. - */ -int -guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) + * Check if we are missing any crucial dirinfo for the guard subsystem to + * work. Return NULL if everything went well, otherwise return a newly + * allocated string with an informative error message. */ +char * +guard_selection_get_dir_info_status_str(guard_selection_t *gs) { if (!gs->primary_guards_up_to_date) entry_guards_update_primary(gs); + char *ret_str = NULL; int n_missing_descriptors = 0; int n_considered = 0; int num_primary_to_check; @@ -3470,15 +3471,25 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) break; } SMARTLIST_FOREACH_END(guard); - return n_missing_descriptors == 0; + /* If we are not missing any descriptors, return NULL. */ + if (!n_missing_descriptors) { + return NULL; + } + + /* otherwise return a helpful error string */ + tor_asprintf(&ret_str, "We're missing descriptors for %d/%d of our " + "primary entry guards", + n_missing_descriptors, num_primary_to_check); + + return ret_str; } /** As guard_selection_have_enough_dir_info_to_build_circuits, but uses * the default guard selection. */ -int -entry_guards_have_enough_dir_info_to_build_circuits(void) +char * +entry_guards_get_dir_info_status_str(void) { - return guard_selection_have_enough_dir_info_to_build_circuits( + return guard_selection_get_dir_info_status_str( get_guard_selection_info()); } diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index f74ccd97f..d049a88cd 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -572,9 +572,8 @@ int getinfo_helper_entry_guards(control_connection_t *conn, int entries_known_but_down(const or_options_t *options); void entries_retry_all(const or_options_t *options); -int guard_selection_have_enough_dir_info_to_build_circuits( - guard_selection_t *gs); -int entry_guards_have_enough_dir_info_to_build_circuits(void); +char *entry_guards_get_dir_info_status_str(void); +char *guard_selection_get_dir_info_status_str(guard_selection_t *gs); void entry_guards_free_all(void); diff --git a/src/or/nodelist.c b/src/or/nodelist.c index df735a9d2..93dd43f3c 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -2300,11 +2300,14 @@ update_router_have_minimum_dir_info(void) using_md = consensus->flavor == FLAV_MICRODESC; - if (! entry_guards_have_enough_dir_info_to_build_circuits()) { - strlcpy(dir_info_status, "We're missing descriptors for some of our " - "primary entry guards", sizeof(dir_info_status)); - res = 0; - goto done; + { /* Check entry guard dirinfo status */ + char *guard_error = entry_guards_get_dir_info_status_str(); + if (guard_error) { + strlcpy(dir_info_status, guard_error, sizeof(dir_info_status)); + tor_free(guard_error); + res = 0; + goto done; + } } /* Check fraction of available paths */ diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 1e008c3a2..36e457bdf 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -1639,6 +1639,25 @@ test_entry_guard_manage_primary(void *arg) tt_ptr_op(g, OP_EQ, smartlist_get(prev_guards, g_sl_idx)); }); + /* Do some dirinfo checks */ + { + /* Check that we have all required dirinfo for the primaries (that's done in + * big_fake_network_setup()) */ + char *dir_info_str = guard_selection_get_dir_info_status_str(gs); + tt_assert(!dir_info_str); + + /* Now artificially remove the first primary's descriptor and re-check */ + entry_guard_t *first_primary; + first_primary = smartlist_get(gs->primary_entry_guards, 0); + /* Change the first primary's identity digest so that the mocked functions + * can't find its descriptor */ + memset(first_primary->identity, 9, sizeof(first_primary->identity)); + dir_info_str = guard_selection_get_dir_info_status_str(gs); + tt_str_op(dir_info_str, OP_EQ, + "We're missing descriptors for 1/2 of our primary entry guards"); + tor_free(dir_info_str); + } + done: guard_selection_free(gs); smartlist_free(prev_guards);

1 0