August 2013 - tor-commits - lists.torproject.org

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit bacc2746b9eaa21bc1139e805d2be7671cb6d722 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 18:46:44 2013 +0000 Update translations for tails-misc --- ru.po | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/ru.po b/ru.po index 582acbb..a234626 100644 --- a/ru.po +++ b/ru.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-30 19:08+0200\n" -"PO-Revision-Date: 2013-08-01 10:40+0000\n" +"PO-Revision-Date: 2013-08-02 18:40+0000\n" "Last-Translator: Арефьев Денис <jujjer(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -93,7 +93,7 @@ msgstr "Имя" #: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Key ID" -msgstr "" +msgstr "ID ключ" #: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Status" @@ -101,7 +101,7 @@ msgstr "Статус" #: config/chroot_local-includes/usr/local/bin/gpgApplet:391 msgid "Fingerprint:" -msgstr "" +msgstr "Отпечаток:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" @@ -112,15 +112,15 @@ msgstr[2] "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" -msgstr "" +msgstr "Ничего (не подписывать)" #: config/chroot_local-includes/usr/local/bin/gpgApplet:487 msgid "Select recipients:" -msgstr "" +msgstr "Выбать получателей:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:495 msgid "Hide recipients" -msgstr "" +msgstr "Скрыть получателей" #: config/chroot_local-includes/usr/local/bin/gpgApplet:498 msgid "" @@ -258,7 +258,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" -msgstr "" +msgstr "Не удалось синхронизировать часы!" #: config/chroot_local-includes/usr/local/bin/tails-security-check:86 #, perl-format @@ -283,18 +283,18 @@ msgstr "Запуск I2P..." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63 msgid "The I2P router console will be opened on start." -msgstr "" +msgstr "I2P консоль роутера будет открыта для работы." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82 #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124 msgid "I2P failed to start" -msgstr "" +msgstr "I2P не удалось запустить" #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83 msgid "" "Make sure that you have a working Internet connection, then try to start I2P" " again." -msgstr "" +msgstr "Убедитесь, что у вас есть соединение с Интернетом, затем попробуйте запустить I2P снова." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125 msgid "" @@ -348,11 +348,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 msgid "_Launch" -msgstr "" +msgstr "_Launch" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 msgid "_Exit" -msgstr "" +msgstr "_Exit" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 msgid "Starting the Unsafe Browser..." @@ -364,7 +364,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:112 msgid "Failed to setup chroot." -msgstr "" +msgstr "Не удалось установить chroot." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:181 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 @@ -373,7 +373,7 @@ msgstr "Небезопасный Браузер" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:221 msgid "Shutting down the Unsafe Browser..." -msgstr "" +msgstr "Выключение небезопасного браузера..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 msgid "" @@ -417,7 +417,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network " -msgstr "" +msgstr "Анонимная оверлей сеть" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2 msgid "i2p" @@ -425,11 +425,11 @@ msgstr "i2p" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3 msgid "Anonymous overlay network" -msgstr "" +msgstr "Анонимная оверлей сеть" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot" -msgstr "" +msgstr "Перезагрузка" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:2 msgid "Immediately reboot computer" @@ -437,15 +437,15 @@ msgstr "немедленно перезагрузить компьютер" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 msgid "Power Off" -msgstr "" +msgstr "Выключение" #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 msgid "Immediately shut down computer" -msgstr "" +msgstr "Немедленно выключить компьютер" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity" -msgstr "" +msgstr "Обзор Всемирной Паутины без анонимности" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3 msgid "Unsafe Web Browser" @@ -453,4 +453,4 @@ msgstr "Небезопасный Веб Браузер" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools" -msgstr "" +msgstr "Tails конкретные инструменты"

1 0

[tor/master] Unit test for smartlist_ints_eq
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit 9ac0a681ced764b34ee1d926f077f3dd988a8562 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 13:44:22 2013 -0400 Unit test for smartlist_ints_eq (This was the only wholly untested function in containers.c) --- src/test/test_containers.c | 53 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 005e102..6858fa4 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -469,6 +469,51 @@ test_container_smartlist_join(void) tor_free(joined); } +static void +test_container_smartlist_ints_eq(void *arg) +{ + smartlist_t *sl1 = NULL, *sl2 = NULL; + int x; + (void)arg; + + tt_assert(smartlist_ints_eq(NULL, NULL)); + + sl1 = smartlist_new(); + tt_assert(!smartlist_ints_eq(sl1, NULL)); + tt_assert(!smartlist_ints_eq(NULL, sl1)); + + sl2 = smartlist_new(); + tt_assert(smartlist_ints_eq(sl1, sl2)); + + x = 5; + smartlist_add(sl1, tor_memdup(&x, sizeof(int))); + smartlist_add(sl2, tor_memdup(&x, sizeof(int))); + x = 90; + smartlist_add(sl1, tor_memdup(&x, sizeof(int))); + smartlist_add(sl2, tor_memdup(&x, sizeof(int))); + tt_assert(smartlist_ints_eq(sl1, sl2)); + + x = -50; + smartlist_add(sl1, tor_memdup(&x, sizeof(int))); + tt_assert(! smartlist_ints_eq(sl1, sl2)); + tt_assert(! smartlist_ints_eq(sl2, sl1)); + smartlist_add(sl2, tor_memdup(&x, sizeof(int))); + tt_assert(smartlist_ints_eq(sl1, sl2)); + + *(int*)smartlist_get(sl1, 1) = 101010; + tt_assert(! smartlist_ints_eq(sl2, sl1)); + *(int*)smartlist_get(sl2, 1) = 101010; + tt_assert(smartlist_ints_eq(sl1, sl2)); + + done: + if (sl1) + SMARTLIST_FOREACH(sl1, int *, ip, tor_free(ip)); + if (sl2) + SMARTLIST_FOREACH(sl2, int *, ip, tor_free(ip)); + smartlist_free(sl1); + smartlist_free(sl2); +} + /** Run unit tests for bitarray code */ static void test_container_bitarray(void) @@ -784,7 +829,7 @@ test_container_order_functions(void) } static void -test_di_map(void *arg) +test_container_di_map(void *arg) { di_digest256_map_t *map = NULL; const uint8_t key1[] = "In view of the fact that it was "; @@ -912,18 +957,22 @@ test_container_fp_pair_map(void) #define CONTAINER_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_container_ ## name } +#define CONTAINER(name, flags) \ + { #name, test_container_ ## name, (flags), NULL, NULL } + struct testcase_t container_tests[] = { CONTAINER_LEGACY(smartlist_basic), CONTAINER_LEGACY(smartlist_strings), CONTAINER_LEGACY(smartlist_overlap), CONTAINER_LEGACY(smartlist_digests), CONTAINER_LEGACY(smartlist_join), + CONTAINER(smartlist_ints_eq, 0), CONTAINER_LEGACY(bitarray), CONTAINER_LEGACY(digestset), CONTAINER_LEGACY(strmap), CONTAINER_LEGACY(pqueue), CONTAINER_LEGACY(order_functions), - { "di_map", test_di_map, 0, NULL, NULL }, + CONTAINER(di_map, 0), CONTAINER_LEGACY(fp_pair_map), END_OF_TESTCASES };

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit 97e697acd888b19f145ffea5f9e3abebd27717c4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 15:16:20 2013 +0000 Update translations for liveusb-creator_completed --- es/es.po | 206 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 111 insertions(+), 95 deletions(-) diff --git a/es/es.po b/es/es.po index 461e981..5df52af 100644 --- a/es/es.po +++ b/es/es.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-04-29 09:00+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2013-08-01 15:27+0200\n" +"PO-Revision-Date: 2013-08-02 15:00+0000\n" +"Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,12 +26,12 @@ msgstr "" msgid "%(distribution)s LiveUSB Creator" msgstr "Creador de USB autoarrancable de %(distribution)s" -#: ../liveusb/gui.py:758 +#: ../liveusb/gui.py:776 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s seleccionado(s)" -#: ../liveusb/creator.py:1018 +#: ../liveusb/creator.py:1004 #, python-format msgid "%s already bootable" msgstr "%s ya es arrancable" @@ -88,16 +88,16 @@ msgid "" "persist after a reboot." msgstr "Con la asignación de espacio extra para un área persistente en su memoria USB, será capaz de almacenar datos y hacer modificaciones persistentes a su sistema operativo autoarrancable. Sin ello, no será capaz de guardar datos que persistan después de un reinicio." -#: ../liveusb/creator.py:1120 ../liveusb/creator.py:1383 +#: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Calculando el checksum SHA1 de %s " -#: ../liveusb/creator.py:1331 +#: ../liveusb/creator.py:1317 msgid "Cannot find" msgstr "No se pudo encontrar" -#: ../liveusb/creator.py:574 +#: ../liveusb/creator.py:545 #, python-format msgid "Cannot find device %s" msgstr "No se pudo encontrar el dispositivo %s" @@ -120,74 +120,73 @@ msgstr "Clonar\n&&\nactualizar" msgid "Create Live USB" msgstr "Crear USB autoarrancable" -#: ../liveusb/creator.py:429 +#: ../liveusb/creator.py:400 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Creando sistema de archivos persistente de %s MB" -#: ../liveusb/gui.py:534 +#: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -" Setting a maximum limit of 8G for the persistent storage." -msgstr "El dispositivo no está montado aún, por lo que no se puede determinar el espacio libre. Se establece un límite máximo de 8G para el almacenamiento persistente." - -#: ../liveusb/gui.py:197 -#, python-format -msgid "Device is too small: it must be at least %s MiB." -msgstr "El dispositivo es demasiado pequeño: debe ser al menos de %s MiB." +msgstr "El dispositivo no está montado aún, por lo que no se pudo determinar la cantidad de espacio libre." #: ../liveusb/dialog.py:157 #, python-format msgid "Download %(distribution)s" msgstr "Descargar %(distribution)s" -#: ../liveusb/gui.py:732 +#: ../liveusb/gui.py:750 msgid "Download complete!" msgstr "¡Descarga completa!" -#: ../liveusb/gui.py:736 +#: ../liveusb/gui.py:754 msgid "Download failed: " msgstr "Fallo de la descarga: " -#: ../liveusb/gui.py:84 +#: ../liveusb/gui.py:88 #, python-format msgid "Downloading %s..." msgstr "Descargando %s..." -#: ../liveusb/creator.py:1116 +#: ../liveusb/creator.py:1102 msgid "Drive is a loopback, skipping MBR reset" msgstr "La unidad es de tipo loopback (virtual, de bucle), omitiendo el restablecimiento del MBR..." -#: ../liveusb/creator.py:1196 +#: ../liveusb/creator.py:808 +#, python-format +msgid "Entering unmount_device for '%(device)s'" +msgstr "Ejecutando unmount_device para '%(device)s'" + +#: ../liveusb/creator.py:1182 msgid "Error probing device" msgstr "Error probando el dispositivo " -#: ../liveusb/gui.py:226 +#: ../liveusb/gui.py:227 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "Error: No se pudo establecer u obtener el UUID de su dispositivo. No se pudo continuar." -#: ../liveusb/creator.py:405 +#: ../liveusb/creator.py:376 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 "Error: El checksum SHA1 de su CD autoarrancable (Live CD) no es válido. Puede ejecutar este programa con el modificador --noverify para evitar este chequeo de verificación." -#: ../liveusb/creator.py:144 +#: ../liveusb/creator.py:145 msgid "Extracting live image to USB device..." msgstr "Extrayendo la imagen autoarrancable (live image) del dispositivo USB..." -#: ../liveusb/creator.py:1061 +#: ../liveusb/creator.py:1047 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formateando %(device)s como FAT32" -#: ../liveusb/creator.py:139 +#: ../liveusb/creator.py:140 msgid "ISO MD5 checksum passed" msgstr "El checksum MD5 de la ISO es correcto" -#: ../liveusb/creator.py:137 +#: ../liveusb/creator.py:138 msgid "ISO MD5 checksum verification failed" msgstr "Error en la verificación del checksum MD5 de la ISO" @@ -197,65 +196,77 @@ msgid "" "downloaded for you." msgstr "Si no selecciona una imagen ISO autoarrancable existente, la versión seleccionada se descargará para usted." -#: ../liveusb/gui.py:601 +#: ../liveusb/gui.py:619 msgid "Installation complete!" msgstr "¡Instalación completa!" -#: ../liveusb/gui.py:276 +#: ../liveusb/gui.py:279 #, python-format msgid "Installation complete! (%s)" msgstr "¡Instalación completa! (%s)" -#: ../liveusb/gui.py:602 +#: ../liveusb/gui.py:620 msgid "Installation was completed. Press OK to close this program." msgstr "Instalación completa. Pulse Aceptar para cerrar este programa." -#: ../liveusb/creator.py:913 ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:900 ../liveusb/creator.py:1223 msgid "Installing bootloader..." msgstr "Instalando gestor de arranque (bootloader)... " -#: ../liveusb/gui.py:281 +#: ../liveusb/gui.py:284 msgid "LiveUSB creation failed!" msgstr "¡La creación del USB de arranque (LiveUSB) falló!" -#: ../liveusb/creator.py:1332 +#: ../liveusb/creator.py:1318 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Asegúrese de extraer el archivo zip liveusb-creator completamente antes de ejecutar este programa." -#: ../liveusb/creator.py:1208 +#: ../liveusb/creator.py:1194 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Asegúrese de que su memoria USB está conectada, y formateada con el sistema de archivos FAT" -#: ../liveusb/creator.py:847 +#: ../liveusb/creator.py:830 #, python-format msgid "Mount %s exists after unmounting" msgstr "El punto de montaje %s sigue existiendo tras desmontar " -#: ../liveusb/gui.py:663 ../liveusb/gui.py:680 +#: ../liveusb/gui.py:681 ../liveusb/gui.py:698 msgid "Next" msgstr "Siguiente" -#: ../liveusb/gui.py:541 +#: ../liveusb/gui.py:562 #, python-format msgid "No free space on device %(device)s" msgstr "No hay espacio libre en el dispositivo %(device)s" -#: ../liveusb/creator.py:824 +#: ../liveusb/creator.py:797 msgid "No mount points found" msgstr "No se encontraron puntos de montaje" -#: ../liveusb/creator.py:422 -msgid "Not enough free space on device." -msgstr "No hay suficiente espacio libre en el dispositivo." +#: ../liveusb/creator.py:393 +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "No hay suficiente espacio libre en el dispositivo.\n%dMB ISO + %dMB partición de datos persistentes (overlay) > %dMB espacio libre" -#: ../liveusb/gui.py:546 +#: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "La partición es FAT16; Restringiendo el tamaño del sistema de archivos a 2G" -#: ../liveusb/gui.py:592 +#: ../liveusb/gui.py:539 +msgid "Partition is FAT32; Restricting overlay size to 4G" +msgstr "La partición es FAT32; restringiendo el tamaño de la partición de datos persistentes (overlay) a 4G" + +#: ../liveusb/creator.py:226 ../liveusb/creator.py:837 +#, python-format +msgid "Partitioning device %(device)s" +msgstr "Particionando el dispositivo %(device)s" + +#: ../liveusb/gui.py:610 msgid "Persistent Storage" msgstr "Almacenamiento persistente" @@ -263,53 +274,53 @@ msgstr "Almacenamiento persistente" msgid "Persistent Storage (0 MB)" msgstr "Almacenamiento persistente (0 MB)" -#: ../liveusb/gui.py:661 ../liveusb/gui.py:678 +#: ../liveusb/gui.py:679 ../liveusb/gui.py:696 msgid "Press 'Next' if you wish to continue." msgstr "Pulse 'Siguiente' si quiere continuar." -#: ../liveusb/gui.py:452 +#: ../liveusb/gui.py:456 msgid "Refreshing releases..." msgstr "Comprobando nuevas versiones..." -#: ../liveusb/gui.py:457 +#: ../liveusb/gui.py:461 msgid "Releases updated!" msgstr "¡Nuevas versiones comprobadas!" -#: ../liveusb/creator.py:936 ../liveusb/creator.py:1255 +#: ../liveusb/creator.py:923 ../liveusb/creator.py:1241 #, python-format msgid "Removing %(file)s" msgstr "Eliminando %(file)s" -#: ../liveusb/creator.py:498 +#: ../liveusb/creator.py:469 msgid "Removing existing Live OS" msgstr "Eliminando el sistema operativo autoarrancable (Live OS) existente" -#: ../liveusb/creator.py:1110 +#: ../liveusb/creator.py:1096 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Restableciendo Master Boot Record de %s" -#: ../liveusb/gui.py:743 +#: ../liveusb/gui.py:761 msgid "Select Live ISO" msgstr "Seleccione una ISO autoarrancable (Live ISO)" -#: ../liveusb/creator.py:181 +#: ../liveusb/creator.py:182 msgid "Setting up OLPC boot file..." msgstr "Configurando un archivo de arranque OLPC (One Laptop Per Child)..." -#: ../liveusb/creator.py:738 +#: ../liveusb/creator.py:711 #, python-format msgid "" "Some partitions of USB device %(device)s are mounted. They will be unmounted" " before starting the installation process." msgstr "Algunas particiones del dispositivo USB %(device)s están montadas. Serán desmontadas antes de comenzar el proceso de instalación." -#: ../liveusb/creator.py:130 +#: ../liveusb/creator.py:131 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "La fuente no soporta la verificación del checksum MD5 de la ISO, omitiendo..." -#: ../liveusb/creator.py:1144 +#: ../liveusb/creator.py:1130 msgid "Synchronizing data on disk..." msgstr "Sincronizando datos en el disco... " @@ -317,19 +328,19 @@ msgstr "Sincronizando datos en el disco... " msgid "Target Device" msgstr "Dispositivo destino" -#: ../liveusb/gui.py:625 +#: ../liveusb/gui.py:643 msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." msgstr "El Master Boot Record (registro de arranque maestro) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se restablecerá el MBR de este dispositivo." -#: ../liveusb/gui.py:746 +#: ../liveusb/gui.py:764 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "El archivo seleccionado no se pudo leer. Ajuste sus permisos o seleccione otro archivo." -#: ../liveusb/creator.py:366 +#: ../liveusb/creator.py:337 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" @@ -367,109 +378,114 @@ msgstr "Esta es la barra de progreso que indicará en qué punto, a largo del pr msgid "This is the status console, where all messages get written to." msgstr "Esta es la consola de estado, donde salen escritos todos los mensajes." -#: ../liveusb/creator.py:908 +#: ../liveusb/creator.py:895 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "No se pudo cambiar la etiqueta del volumen: %(message)s" -#: ../liveusb/creator.py:507 ../liveusb/creator.py:518 +#: ../liveusb/creator.py:478 ../liveusb/creator.py:489 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "No se pudo completar chmod %(file)s: %(message)s" -#: ../liveusb/creator.py:488 +#: ../liveusb/creator.py:459 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "No se pudo copiar %(infile)s en %(outfile)s: %(message)s" -#: ../liveusb/gui.py:414 +#: ../liveusb/gui.py:418 msgid "Unable to find any USB drive" msgstr "No fue posible encontrar alguna unidad USB" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1184 msgid "Unable to find any removable device" msgstr "No se pudo encontrar dispositivo extraíble alguno" -#: ../liveusb/creator.py:1038 +#: ../liveusb/creator.py:1024 msgid "Unable to find partition" msgstr "No se pudo encontrar la partición" -#: ../liveusb/creator.py:1278 +#: ../liveusb/creator.py:1264 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "No fue posible obtener Win32_LogicalDisk; la petición win32com no devolvió resultados" -#: ../liveusb/gui.py:653 +#: ../liveusb/gui.py:671 msgid "Unable to mount device" msgstr "No se pudo montar el dispositivo" -#: ../liveusb/creator.py:812 +#: ../liveusb/creator.py:785 #, python-format msgid "Unable to mount device: %(message)s" msgstr "No se pudo montar el dispositivo: %(message)s" -#: ../liveusb/creator.py:523 +#: ../liveusb/creator.py:494 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "No se pudo eliminar la carpeta del anterior sistema operativo autoarracable (LiveOS): %(message)s" -#: ../liveusb/creator.py:511 +#: ../liveusb/creator.py:482 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "No se pudo eliminar el archivo del anterior sistema operativo autoarrancable (LiveOS): %(message)s" -#: ../liveusb/creator.py:1113 +#: ../liveusb/creator.py:1099 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "No se pudo restablecer el MBR. Podría no tener instalado el paquete `syslinux`" -#: ../liveusb/gui.py:752 +#: ../liveusb/gui.py:770 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 "No se pudo utilizar el fichero seleccionado. Puede que tenga más suerte si mueve su ISO a la carpeta raíz de su unidad (ej. C:\\)" -#: ../liveusb/creator.py:719 +#: ../liveusb/creator.py:692 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "No se pudo escribir en %(device)s, omitiendo... " -#: ../liveusb/creator.py:411 +#: ../liveusb/creator.py:382 msgid "Unknown ISO, skipping checksum verification" msgstr "ISO desconocida, omitiendo la verificación del checksum" -#: ../liveusb/creator.py:808 +#: ../liveusb/creator.py:781 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Excepción dbus desconocida al intentar montar el dispositivo: %(message)s" -#: ../liveusb/creator.py:787 ../liveusb/creator.py:887 +#: ../liveusb/creator.py:760 ../liveusb/creator.py:874 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Sistema de ficheros desconocido. Su dispositivo podría tener que ser formateado." -#: ../liveusb/gui.py:80 +#: ../liveusb/gui.py:84 #, python-format msgid "Unknown release: %s" msgstr "Versión desconocida: %s" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:822 +#, python-format +msgid "Unmounting '%(udi)s' on '%(device)s'" +msgstr "Desmontando '%(udi)s' en '%(device)s'" + +#: ../liveusb/creator.py:818 #, python-format -msgid "Unmounting %(device)s" -msgstr "Desmontando %(device)s" +msgid "Unmounting mounted filesystems on '%(device)s'" +msgstr "Desmontando los sistemas de ficheros montados en '%(device)s'" -#: ../liveusb/creator.py:792 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:765 ../liveusb/creator.py:877 #, python-format msgid "Unsupported filesystem: %s" msgstr "Sistema de archivos no soportado: %s" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:763 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Sistema de archivos no soportado: %s\nEn caso de que esté intentando actualizar un sistema Tails instalado manualmente (esto es, si fue instalado sin este instalador), esta opción no está soportada: necesita instalarlo de nuevo para comenzar con ello, ej.: escogiendo la acción \"Clonar & Instalar\" en su lugar." -#: ../liveusb/creator.py:1211 +#: ../liveusb/creator.py:1197 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -484,65 +500,65 @@ msgstr "Actualizar desde ISO" msgid "Use existing Live system ISO" msgstr "Usar una ISO de sistema autoarrancable existente" -#: ../liveusb/creator.py:132 +#: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" msgstr "Verificando el checksum MD5 de la ISO" -#: ../liveusb/creator.py:385 +#: ../liveusb/creator.py:356 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Verificando el checksum SHA1 de la imagen del CD autoarrancable (LiveCD)... " -#: ../liveusb/creator.py:389 +#: ../liveusb/creator.py:360 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verificando el checksum SHA256 de la imagen del CD autoarrancable (LiveCD)... " -#: ../liveusb/creator.py:884 ../liveusb/creator.py:1204 +#: ../liveusb/creator.py:871 ../liveusb/creator.py:1190 msgid "Verifying filesystem..." msgstr "Verificando el sistema de archivos... " -#: ../liveusb/gui.py:659 +#: ../liveusb/gui.py:677 msgid "Warning: All data on the selected drive will be lost." msgstr "Advertencia: Se perderán todos los datos de la unidad seleccionada." -#: ../liveusb/gui.py:676 +#: ../liveusb/gui.py:694 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Advertencia: La creación de un nuevo sistema de archivos persistente borrará el suyo existente." -#: ../liveusb/gui.py:639 +#: ../liveusb/gui.py:657 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." msgstr "Advertencia: El Master Boot Record (registro de arranque maestro) de su dispositivo no concuerda con el MBR syslinux de su sistema. Si tiene problemas arrancando desde esta memoria, pruebe a ejecutar el liveusb-creator con la opción --reset-mbr" -#: ../liveusb/gui.py:389 +#: ../liveusb/gui.py:392 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Advertencia: Esta herramienta debe ser ejecutada como un Administrador. Para hacer esto, haga clic con el botón secundario del ratón sobre el icono, y abra las Propiedades. Bajo la pestaña Compatibilidad, marque la casilla \"Ejecutar este programa como un administrador\"." -#: ../liveusb/creator.py:151 +#: ../liveusb/creator.py:152 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Escrito al dispositivo a %(speed)d MB/sec" -#: ../liveusb/creator.py:636 +#: ../liveusb/creator.py:607 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "Está usando una versión antigua de syslinux-extlinux que no soporta el sistema de archivos ext4." -#: ../liveusb/gui.py:737 +#: ../liveusb/gui.py:755 msgid "You can try again to resume your download" msgstr "Puede intentar continuar con la descarga de nuevo donde la dejó" -#: ../liveusb/creator.py:91 +#: ../liveusb/creator.py:92 msgid "You must run this application as root" msgstr "Debe ejecutar esta aplicación como root (superusuario)" -#: ../liveusb/gui.py:673 +#: ../liveusb/gui.py:691 msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit 484f389b04df3016d118c4467c1667437b76cb5b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 15:16:17 2013 +0000 Update translations for liveusb-creator --- es/es.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/es/es.po b/es/es.po index 3d181ed..5df52af 100644 --- a/es/es.po +++ b/es/es.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:27+0200\n" -"PO-Revision-Date: 2013-08-02 14:41+0000\n" +"PO-Revision-Date: 2013-08-02 15:00+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgstr "Creando sistema de archivos persistente de %s MB" #: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "El dispositivo no está montado aún, por lo que no podemos determinar la cantidad de espacio libre." +msgstr "El dispositivo no está montado aún, por lo que no se pudo determinar la cantidad de espacio libre." #: ../liveusb/dialog.py:157 #, python-format @@ -155,7 +155,7 @@ msgstr "La unidad es de tipo loopback (virtual, de bucle), omitiendo el restable #: ../liveusb/creator.py:808 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "Ejecutando unmount_device para '%(device)s'" #: ../liveusb/creator.py:1182 msgid "Error probing device" @@ -251,7 +251,7 @@ msgstr "No se encontraron puntos de montaje" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "No hay suficiente espacio libre en el dispositivo.\n%dMB ISO + %dMB overlay (espacio extra de almacenamiento persistente) > %dMB espacio libre" +msgstr "No hay suficiente espacio libre en el dispositivo.\n%dMB ISO + %dMB partición de datos persistentes (overlay) > %dMB espacio libre" #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G" @@ -259,12 +259,12 @@ msgstr "La partición es FAT16; Restringiendo el tamaño del sistema de archivos #: ../liveusb/gui.py:539 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "" +msgstr "La partición es FAT32; restringiendo el tamaño de la partición de datos persistentes (overlay) a 4G" #: ../liveusb/creator.py:226 ../liveusb/creator.py:837 #, python-format msgid "Partitioning device %(device)s" -msgstr "" +msgstr "Particionando el dispositivo %(device)s" #: ../liveusb/gui.py:610 msgid "Persistent Storage" @@ -466,12 +466,12 @@ msgstr "Versión desconocida: %s" #: ../liveusb/creator.py:822 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr "Desmontando '%(udi)s' en '%(device)s'" #: ../liveusb/creator.py:818 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "Desmontando los sistemas de ficheros montados en '%(device)s'" #: ../liveusb/creator.py:765 ../liveusb/creator.py:877 #, python-format

1 0

[tor/master] Try to make the win32 ersatz_socketpair pass.
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit 362f60e2d4dddb09c3b456732ac272b0e55374f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 11:04:30 2013 -0400 Try to make the win32 ersatz_socketpair pass. --- src/test/test_util.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 213751e..05d28d7 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3426,11 +3426,7 @@ test_util_socketpair(void *arg) ersatz ? tor_ersatz_socketpair : tor_socketpair; int n = get_n_open_sockets(); tor_socket_t fds[2] = {TOR_INVALID_SOCKET, TOR_INVALID_SOCKET}; -#ifdef _WIN32 - const int family = AF_INET; -#else const int family = AF_UNIX; -#endif tt_int_op(0, ==, tor_socketpair_fn(family, SOCK_STREAM, 0, fds)); tt_assert(SOCKET_OK(fds[0]));

1 0

[tor/master] Fixed "unused parameter cloexec" warnings on windows
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit 48a4ef3f6ab88c48ac391989f2ee38de9dd4dbdf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 10:52:57 2013 -0400 Fixed "unused parameter cloexec" warnings on windows --- src/common/compat.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/compat.c b/src/common/compat.c index d69e3b0..3768933 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1092,6 +1092,8 @@ tor_open_socket_with_extensions(int domain, int type, int protocol, return TOR_INVALID_SOCKET; } } +#else + (void)cloexec; #endif if (nonblock) { @@ -1162,6 +1164,8 @@ tor_accept_socket_with_extensions(tor_socket_t sockfd, struct sockaddr *addr, return TOR_INVALID_SOCKET; } } +#else + (void)cloexec; #endif if (nonblock) {

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit 1cf90c92b62ad5fbb9421a2c44dc26530a8e0f20 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 14:46:14 2013 +0000 Update translations for liveusb-creator --- es/es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index 358365c..3d181ed 100644 --- a/es/es.po +++ b/es/es.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:27+0200\n" -"PO-Revision-Date: 2013-08-02 09:27+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-08-02 14:41+0000\n" +"Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -128,7 +128,7 @@ msgstr "Creando sistema de archivos persistente de %s MB" #: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "" +msgstr "El dispositivo no está montado aún, por lo que no podemos determinar la cantidad de espacio libre." #: ../liveusb/dialog.py:157 #, python-format @@ -251,7 +251,7 @@ msgstr "No se encontraron puntos de montaje" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "No hay suficiente espacio libre en el dispositivo.\n%dMB ISO + %dMB overlay (espacio extra de almacenamiento persistente) > %dMB espacio libre" #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G"

1 0

[tor/master] Split the socketpair replacement code into its own function for testing
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit d6adf055828283dda2ca9c0c77a80348778c45df Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 10:36:01 2013 -0400 Split the socketpair replacement code into its own function for testing --- src/common/compat.c | 17 +++++++++++++++-- src/common/compat.h | 9 +++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 8aab12a..d69e3b0 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -23,6 +23,7 @@ * we can also take out the configure check. */ #define _GNU_SOURCE +#define COMPAT_PRIVATE #include "compat.h" #ifdef _WIN32 @@ -1291,6 +1292,18 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) return 0; #else + return tor_ersatz_socketpair(family, type, protocol, fd); +#endif +} + +#ifdef NEED_ERSATZ_SOCKETPAIR +/** + * Helper used to implement socketpair on systems that lack it, by + * making a direct connection to localhost. + */ +STATIC int +tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) +{ /* This socketpair does not work when localhost is down. So * it's really not the same thing at all. But it's close enough * for now, and really, when localhost is down sometimes, we @@ -1301,7 +1314,7 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) tor_socket_t acceptor = -1; struct sockaddr_in listen_addr; struct sockaddr_in connect_addr; - int size; + socklen_t size; int saved_errno = -1; if (protocol @@ -1384,8 +1397,8 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) if (acceptor != -1) tor_close_socket(acceptor); return -saved_errno; -#endif } +#endif /** Number of extra file descriptors to keep in reserve beyond those that we * tell Tor it's allowed to use. */ diff --git a/src/common/compat.h b/src/common/compat.h index 89a5d7f..8e700a9 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -8,6 +8,7 @@ #include "orconfig.h" #include "torint.h" +#include "testsupport.h" #ifdef _WIN32 #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0501 @@ -738,5 +739,13 @@ char *format_win32_error(DWORD err); #endif +#ifdef COMPAT_PRIVATE +#if !defined(HAVE_SOCKETPAIR) || defined(_WIN32) || defined(TOR_UNIT_TESTS) +#define NEED_ERSATZ_SOCKETPAIR +STATIC int tor_ersatz_socketpair(int family, int type, int protocol, + tor_socket_t fd[2]); +#endif +#endif + #endif

1 0

[tor/master] Prepare patch for ticket 5129 for merging.
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit ebd4ab1506517b32ee3bd5bd1597b4373aa56ee7 Author: Peter Retzlaff <peter.retzlaff(a)student.hpi.uni-potsdam.de> Date: Mon May 27 19:16:43 2013 +0000 Prepare patch for ticket 5129 for merging. - Preserve old eventdns code. - Add function to close sockets cross-platform, without accounting. - Add changes/ file. --- changes/ticket5129 | 3 ++ src/common/compat.c | 141 ++++++++++++++++++++++++++++++++++++++------------- src/common/compat.h | 12 +++++ src/ext/eventdns.c | 9 ++++ src/or/connection.c | 21 ++------ 5 files changed, 133 insertions(+), 53 deletions(-) diff --git a/changes/ticket5129 b/changes/ticket5129 new file mode 100644 index 0000000..c05ca68 --- /dev/null +++ b/changes/ticket5129 @@ -0,0 +1,3 @@ + o Minor features: + - Use the SOCK_NONBLOCK socket type, if supported, to open nonblocking + sockets in a single system call. Implements ticket #5129. diff --git a/src/common/compat.c b/src/common/compat.c index 0e943f3..af8f288 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -948,24 +948,40 @@ socket_accounting_unlock(void) } /** As close(), but guaranteed to work for sockets across platforms (including - * Windows, where close()ing a socket doesn't work. Returns 0 on success, -1 - * on failure. */ + * Windows, where close()ing a socket doesn't work. Returns 0 on success and + * the socket error code on failure. */ int -tor_close_socket(tor_socket_t s) +tor_close_socket_simple(tor_socket_t s) { int r = 0; /* On Windows, you have to call close() on fds returned by open(), - * and closesocket() on fds returned by socket(). On Unix, everything - * gets close()'d. We abstract this difference by always using - * tor_close_socket to close sockets, and always using close() on - * files. - */ -#if defined(_WIN32) - r = closesocket(s); -#else - r = close(s); -#endif + * and closesocket() on fds returned by socket(). On Unix, everything + * gets close()'d. We abstract this difference by always using + * tor_close_socket to close sockets, and always using close() on + * files. + */ + #if defined(_WIN32) + r = closesocket(s); + #else + r = close(s); + #endif + + if (r != 0) { + int err = tor_socket_errno(-1); + log_info(LD_NET, "Close returned an error: %s", tor_socket_strerror(err)); + return err; + } + + return r; +} + +/** As tor_close_socket_simple(), but keeps track of the number + * of open sockets. Returns 0 on success, -1 on failure. */ +int +tor_close_socket(tor_socket_t s) +{ + int r = tor_close_socket_simple(s); socket_accounting_lock(); #ifdef DEBUG_SOCKET_COUNTING @@ -980,13 +996,11 @@ tor_close_socket(tor_socket_t s) if (r == 0) { --n_sockets_open; } else { - int err = tor_socket_errno(-1); - log_info(LD_NET, "Close returned an error: %s", tor_socket_strerror(err)); #ifdef _WIN32 - if (err != WSAENOTSOCK) + if (r != WSAENOTSOCK) --n_sockets_open; #else - if (err != EBADF) + if (r != EBADF) --n_sockets_open; #endif r = -1; @@ -1032,17 +1046,38 @@ mark_socket_open(tor_socket_t s) tor_socket_t tor_open_socket(int domain, int type, int protocol) { + return tor_open_socket_with_extensions(domain, type, protocol, 1, 0); +} + +/** As socket(), but creates a nonblocking socket and + * counts the number of open sockets. */ +tor_socket_t +tor_open_socket_nonblocking(int domain, int type, int protocol) +{ + return tor_open_socket_with_extensions(domain, type, protocol, 1, 1); +} + +/** As socket(), but counts the number of open sockets and handles + * socket creation with either of SOCK_CLOEXEC and SOCK_NONBLOCK specified. + * cloexec and nonblock should be either 0 or 1 to indicate + * if the corresponding extension should be used.*/ +tor_socket_t +tor_open_socket_with_extensions(int domain, int type, int protocol, + int cloexec, int nonblock) +{ tor_socket_t s; -#ifdef SOCK_CLOEXEC - s = socket(domain, type|SOCK_CLOEXEC, protocol); +#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK) + int ext_flags = (cloexec ? SOCK_CLOEXEC : 0) | + (nonblock ? SOCK_NONBLOCK : 0); + s = socket(domain, type|ext_flags, protocol); if (SOCKET_OK(s)) goto socket_ok; /* If we got an error, see if it is EINVAL. EINVAL might indicate that, - * even though we were built on a system with SOCK_CLOEXEC support, we - * are running on one without. */ + * even though we were built on a system with SOCK_CLOEXEC and SOCK_NONBLOCK + * support, we are running on one without. */ if (errno != EINVAL) return s; -#endif /* SOCK_CLOEXEC */ +#endif /* SOCK_CLOEXEC && SOCK_NONBLOCK */ s = socket(domain, type, protocol); if (! SOCKET_OK(s)) @@ -1051,15 +1086,18 @@ tor_open_socket(int domain, int type, int protocol) #if defined(FD_CLOEXEC) if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { log_warn(LD_FS,"Couldn't set FD_CLOEXEC: %s", strerror(errno)); -#if defined(_WIN32) - closesocket(s); -#else - close(s); -#endif - return -1; + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; } #endif + if (nonblock) { + if (set_socket_nonblocking(s) == -1) { + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; + } + } + goto socket_ok; /* So that socket_ok will not be unused. */ socket_ok: @@ -1070,19 +1108,41 @@ tor_open_socket(int domain, int type, int protocol) return s; } -/** As socket(), but counts the number of open sockets. */ +/** As accept(), but counts the number of open sockets. */ tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { + return tor_accept_socket_with_extensions(sockfd, addr, len, 1, 0); +} + +/** As accept(), but returns a nonblocking socket and + * counts the number of open sockets. */ +tor_socket_t +tor_accept_socket_nonblocking(tor_socket_t sockfd, struct sockaddr *addr, + socklen_t *len) +{ + return tor_accept_socket_with_extensions(sockfd, addr, len, 1, 1); +} + +/** As accept(), but counts the number of open sockets and handles + * socket creation with either of SOCK_CLOEXEC and SOCK_NONBLOCK specified. + * cloexec and nonblock should be either 0 or 1 to indicate + * if the corresponding extension should be used.*/ +tor_socket_t +tor_accept_socket_with_extensions(tor_socket_t sockfd, struct sockaddr *addr, + socklen_t *len, int cloexec, int nonblock) +{ tor_socket_t s; -#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) - s = accept4(sockfd, addr, len, SOCK_CLOEXEC); +#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK) + int ext_flags = (cloexec ? SOCK_CLOEXEC : 0) | + (nonblock ? SOCK_NONBLOCK : 0); + s = accept4(sockfd, addr, len, ext_flags); if (SOCKET_OK(s)) goto socket_ok; /* If we got an error, see if it is ENOSYS. ENOSYS indicates that, * even though we were built on a system with accept4 support, we * are running on one without. Also, check for EINVAL, which indicates that - * we are missing SOCK_CLOEXEC support. */ + * we are missing SOCK_CLOEXEC/SOCK_NONBLOCK support. */ if (errno != EINVAL && errno != ENOSYS) return s; #endif @@ -1092,13 +1152,22 @@ tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) return s; #if defined(FD_CLOEXEC) - if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { - log_warn(LD_NET, "Couldn't set FD_CLOEXEC: %s", strerror(errno)); - close(s); - return TOR_INVALID_SOCKET; + if (cloexec) { + if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { + log_warn(LD_NET, "Couldn't set FD_CLOEXEC: %s", strerror(errno)); + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; + } } #endif + if (nonblock) { + if (set_socket_nonblocking(s) == -1) { + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; + } + } + goto socket_ok; /* So that socket_ok will not be unused. */ socket_ok: diff --git a/src/common/compat.h b/src/common/compat.h index 258fc99..89a5d7f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -450,10 +450,22 @@ typedef int socklen_t; #define TOR_INVALID_SOCKET (-1) #endif +int tor_close_socket_simple(tor_socket_t s); int tor_close_socket(tor_socket_t s); +tor_socket_t tor_open_socket_with_extensions( + int domain, int type, int protocol, + int cloexec, int nonblock); tor_socket_t tor_open_socket(int domain, int type, int protocol); +tor_socket_t tor_open_socket_nonblocking(int domain, int type, int protocol); tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len); +tor_socket_t tor_accept_socket_nonblocking(tor_socket_t sockfd, + struct sockaddr *addr, + socklen_t *len); +tor_socket_t tor_accept_socket_with_extensions(tor_socket_t sockfd, + struct sockaddr *addr, + socklen_t *len, + int cloexec, int nonblock); int get_n_open_sockets(void); #define tor_socket_send(s, buf, len, flags) send(s, buf, len, flags) diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 66280cc..8b934c4 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -2298,6 +2298,10 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns); +#if 1 + ns->socket = tor_open_socket_nonblocking(address->sa_family, SOCK_DGRAM, 0); + if (!SOCKET_OK(ns->socket)) { err = 1; goto out1; } +#else ns->socket = tor_open_socket(address->sa_family, SOCK_DGRAM, 0); if (ns->socket < 0) { err = 1; goto out1; } #ifdef _WIN32 @@ -2314,6 +2318,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, } #endif +#endif /* 1 */ if (global_bind_addr_is_set && !sockaddr_is_loopback((struct sockaddr*)&global_bind_address)) { if (bind(ns->socket, (struct sockaddr *)&global_bind_address, @@ -3473,8 +3478,12 @@ main(int c, char **v) { if (servertest) { int sock; struct sockaddr_in my_addr; +#if 1 + sock = tor_open_socket_nonblocking(PF_INET, SOCK_DGRAM, 0) +#else sock = tor_open_socket(PF_INET, SOCK_DGRAM, 0); fcntl(sock, F_SETFL, O_NONBLOCK); +#endif my_addr.sin_family = AF_INET; my_addr.sin_port = htons(10053); my_addr.sin_addr.s_addr = INADDR_ANY; diff --git a/src/or/connection.c b/src/or/connection.c index 6a3cc7b..28de35b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -970,7 +970,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, log_notice(LD_NET, "Opening %s on %s", conn_type_to_string(type), fmt_addrport(&addr, usePort)); - s = tor_open_socket(tor_addr_family(&addr), + s = tor_open_socket_nonblocking(tor_addr_family(&addr), is_tcp ? SOCK_STREAM : SOCK_DGRAM, is_tcp ? IPPROTO_TCP: IPPROTO_UDP); if (!SOCKET_OK(s)) { @@ -1054,7 +1054,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, strerror(errno)); goto err; } - s = tor_open_socket(AF_UNIX, SOCK_STREAM, 0); + s = tor_open_socket_nonblocking(AF_UNIX, SOCK_STREAM, 0); if (! SOCKET_OK(s)) { log_warn(LD_NET,"Socket creation failed: %s.", strerror(errno)); goto err; @@ -1102,9 +1102,6 @@ connection_listener_new(const struct sockaddr *listensockaddr, tor_assert(0); } - if (set_socket_nonblocking(s) == -1) - goto err; - lis_conn = listener_connection_new(type, listensockaddr->sa_family); conn = TO_CONN(lis_conn); conn->socket_family = listensockaddr->sa_family; @@ -1252,7 +1249,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) tor_assert((size_t)remotelen >= sizeof(struct sockaddr_in)); memset(&addrbuf, 0, sizeof(addrbuf)); - news = tor_accept_socket(conn->s,remote,&remotelen); + news = tor_accept_socket_nonblocking(conn->s,remote,&remotelen); if (!SOCKET_OK(news)) { /* accept() error */ int e = tor_socket_errno(conn->s); if (ERRNO_IS_ACCEPT_EAGAIN(e)) { @@ -1272,10 +1269,6 @@ connection_handle_listener_read(connection_t *conn, int new_type) (int)news,(int)conn->s); make_socket_reuseable(news); - if (set_socket_nonblocking(news) == -1) { - tor_close_socket(news); - return 0; - } if (options->ConstrainedSockets) set_constrained_socket_buffers(news, (int)options->ConstrainedSockSize); @@ -1467,7 +1460,7 @@ connection_connect(connection_t *conn, const char *address, return -1; } - s = tor_open_socket(protocol_family,SOCK_STREAM,IPPROTO_TCP); + s = tor_open_socket_nonblocking(protocol_family,SOCK_STREAM,IPPROTO_TCP); if (! SOCKET_OK(s)) { *socket_error = tor_socket_errno(-1); log_warn(LD_NET,"Error creating network socket: %s", @@ -1509,12 +1502,6 @@ connection_connect(connection_t *conn, const char *address, } } - if (set_socket_nonblocking(s) == -1) { - *socket_error = tor_socket_errno(s); - tor_close_socket(s); - return -1; - } - if (options->ConstrainedSockets) set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize);

1 0

[tor/master] Actually use the cloexec argument in the !defined(SOCK_CLOEXEC) case
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit e25eb35f11b0419fe50791b3760f1d4016bf8a8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 10:04:21 2013 -0400 Actually use the cloexec argument in the !defined(SOCK_CLOEXEC) case --- src/common/compat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index af8f288..8aab12a 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1084,10 +1084,12 @@ tor_open_socket_with_extensions(int domain, int type, int protocol, return s; #if defined(FD_CLOEXEC) - if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { - log_warn(LD_FS,"Couldn't set FD_CLOEXEC: %s", strerror(errno)); - tor_close_socket_simple(s); - return TOR_INVALID_SOCKET; + if (cloexec) { + if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { + log_warn(LD_FS,"Couldn't set FD_CLOEXEC: %s", strerror(errno)); + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; + } } #endif

1 0