tor-commits January 2015

tor-commits@lists.torproject.org

20 participants
934 discussions

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 Jan '15

29 Jan '15

commit cf38fdbee720c6ccdea07f9c0997a89471a868ea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 29 13:15:03 2015 +0000 Update translations for bridgedb --- hr_HR/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index f313170..61064f1 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2015-01-29 10:06+0000\n" +"PO-Revision-Date: 2015-01-29 13:04+0000\n" "Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 29 Jan '15

29 Jan '15

commit ed2b05e186a46abf4eccf6cb1cb6d17c612d3adb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 29 10:15:28 2015 +0000 Update translations for https_everywhere_completed --- hr_HR/ssl-observatory.dtd | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/hr_HR/ssl-observatory.dtd b/hr_HR/ssl-observatory.dtd index d98da61..6011e3b 100644 --- a/hr_HR/ssl-observatory.dtd +++ b/hr_HR/ssl-observatory.dtd @@ -36,29 +36,28 @@ ometajuću korporativnu mrežu:"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable "Provjeri certifikate koristeći Tor za anonimnost (zahtijeva Tor)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -"Ova mogućnost zahtijeva instalirani Tor i Tortipku"> +"Ova mogućnost zahtijeva instalirani i pokrenut Tor"> <!ENTITY ssl-observatory.prefs.asn -"Kada vidite novi certifikat, recite Opservatoriju na koji ste ISP spojeni"> +"Kad vidite novi certifikat, recite Opservatoriju na koji ste ISP spojeni"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"Ovo će dohvatiti i poslati "Autonomni broj sustava" vaše mreže. To će nam pomoći u lociranju napada na HTTPS i u otkrivanju kada nas promatraju iz mreža sa mjesta poput Irana i Sirije odkuda stižu učestali napadi."> +"Ovo će dohvatiti i poslati "Autonomni broj sustava" vaše mreže. To će nam pomoći u lociranju napada na HTTPS i u otkrivanju kad nas promatraju iz mreža sa mjesta poput Irana i Sirije otkud stižu učestali napadi."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Prikaži upozorenje kad Observatory uoči opozvani certifikat koji vaš browser nije -uhvatio"> +"Prikaži upozorenje kad Opservatorij otkrije opozvani certifikat koji vaš preglednik nije uhvatio"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip "Ovo će provjeriti predane certifikate s poznatim listama opozvanih certifikata. -Nažalost, ne možemo garantirati da ćemo uočiti svaki opozvani certifikat, ali ako -vidite upozorenje, velika je šansa da nešto nije u redu."> +Nažalost, ne možemo garantirati da ćemo uočiti svaki opozvani certifikat, ali ako vidite upozorenje, velika je šansa da nešto nije u redu."> -<!ENTITY ssl-observatory.prefs.done "Učinjeno"> +<!ENTITY ssl-observatory.prefs.done "Gotovo"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere može koristiti EFF-ov SSL Opservatorij. Ovo čini dvije stvari: (1) -šalje kopije HTTPS certifikata Opservatoriju, da nam pomogne otkriti 'glavnog u sredini' napadača i poboljša Web sigurnost; i (2) -da vas upozorimo o nesigurnim vezama ili napadima na vaš preglednik."> +"HTTPS Everywhere može koristiti EFF-ov SSL Opservatorij. Ovo radi dvije stvari: (1) +šalje kopije HTTPS certifikata Opservatoriju, da nam pomogne +u otkrivanju 'čovjek u sredini' napada i poboljša sigurnost Web-a; i (2) +dopušta nam da Vas obavijestimo o nesigurnim vezama ili napadima na Vaš preglednik.">  <!ENTITY ssl-observatory.prefs.explanation2 -"Npr., kada posjetite https://www.something.com, certifikat +"Npr., kad posjetite https://www.something.com, certifikat primljen od Opservatorija će naznačiti da je netko posjetio www.something.com, ali ne tko je posjetio stranicu, ili koju su određenu stranicu tražili. Prelazak mišem preko "opcija" za daljnje pojedinosti:"> -<!ENTITY ssl-observatory.prefs.hide "Sakrij detaljnije opcije"> +<!ENTITY ssl-observatory.prefs.hide "Sakrij napredne opcije"> <!ENTITY ssl-observatory.prefs.nonanon "Provjeri certifikate iako Tor nije dostupan"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -"Mi ćemo još uvijek pokušati držati podatke anonimnim, ali ova mogućnost je manje sigurna"> +"Pokušati ćemo održati podatke anonimnima, ali ova mogućnost je manje sigurna"> <!ENTITY ssl-observatory.prefs.priv_dns "Prijavite i provjerite certifikate za ne-javne DNS nazive"> @@ -88,18 +87,16 @@ stranicu tražili. Prelazak mišem preko "opcija" za daljnje pojedino <!ENTITY ssl-observatory.prefs.show "Prikaži napredne mogućnosti "> -<!ENTITY ssl-observatory.prefs.title "Osobitosti SSL Opservatorija"> +<!ENTITY ssl-observatory.prefs.title "Postavke SSL Opservatorija"> <!ENTITY ssl-observatory.prefs.use "Koristi Opservatorij?"> <!ENTITY ssl-observatory.warning.title "UPOZORENJE iz EFF-ovog SSL Opservatorija"> -<!ENTITY ssl-observatory.warning.showcert "Prikaži podatak certifikata"> +<!ENTITY ssl-observatory.warning.showcert "Prikaži lanac certifikata"> <!ENTITY ssl-observatory.warning.okay "Razumijem"> <!ENTITY ssl-observatory.warning.text "EFF-ov SSL Opservatorij je izdao upozorenje o HTTPS certifikatu(ima) za ovu stranicu:"> -<!ENTITY ssl-observatory.warning.defense "Ako ste ulogirani na ovu stranicu, preporuča se da promijenite lozinku kad budete imali -sigurnu vezu. (Ova upozorenja se mogu isključiti u "SSL Observatory" tabu na -HTTPS Everywhere okviru za preference.)"> +<!ENTITY ssl-observatory.warning.defense "Ako ste ulogirani na ovu stranicu, preporuča se da promijenite lozinku kad budete imali sigurnu vezu. (Ova upozorenja se mogu isključiti u "SSL Observatory" kartici u postavkama HTTPS Everywhere.)"> <!ENTITY ssl-observatory.prefs.self_signed "Prijavite i provijerite samopotpisane certifikate"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -"To je preporučljivo; kriptografski problemi su naročito česti u samopotpisanim ugrađenim uređajima"> +"Ovo je preporučeno; kriptografski problemi su naročito česti u samopotpisanim ugrađenim uređajima">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 29 Jan '15

29 Jan '15

commit 65f2d85253915cc621941521d1a151b45712f3b2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 29 10:15:23 2015 +0000 Update translations for https_everywhere --- hr_HR/ssl-observatory.dtd | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/hr_HR/ssl-observatory.dtd b/hr_HR/ssl-observatory.dtd index d98da61..6011e3b 100644 --- a/hr_HR/ssl-observatory.dtd +++ b/hr_HR/ssl-observatory.dtd @@ -36,29 +36,28 @@ ometajuću korporativnu mrežu:"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable "Provjeri certifikate koristeći Tor za anonimnost (zahtijeva Tor)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -"Ova mogućnost zahtijeva instalirani Tor i Tortipku"> +"Ova mogućnost zahtijeva instalirani i pokrenut Tor"> <!ENTITY ssl-observatory.prefs.asn -"Kada vidite novi certifikat, recite Opservatoriju na koji ste ISP spojeni"> +"Kad vidite novi certifikat, recite Opservatoriju na koji ste ISP spojeni"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"Ovo će dohvatiti i poslati "Autonomni broj sustava" vaše mreže. To će nam pomoći u lociranju napada na HTTPS i u otkrivanju kada nas promatraju iz mreža sa mjesta poput Irana i Sirije odkuda stižu učestali napadi."> +"Ovo će dohvatiti i poslati "Autonomni broj sustava" vaše mreže. To će nam pomoći u lociranju napada na HTTPS i u otkrivanju kad nas promatraju iz mreža sa mjesta poput Irana i Sirije otkud stižu učestali napadi."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Prikaži upozorenje kad Observatory uoči opozvani certifikat koji vaš browser nije -uhvatio"> +"Prikaži upozorenje kad Opservatorij otkrije opozvani certifikat koji vaš preglednik nije uhvatio"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip "Ovo će provjeriti predane certifikate s poznatim listama opozvanih certifikata. -Nažalost, ne možemo garantirati da ćemo uočiti svaki opozvani certifikat, ali ako -vidite upozorenje, velika je šansa da nešto nije u redu."> +Nažalost, ne možemo garantirati da ćemo uočiti svaki opozvani certifikat, ali ako vidite upozorenje, velika je šansa da nešto nije u redu."> -<!ENTITY ssl-observatory.prefs.done "Učinjeno"> +<!ENTITY ssl-observatory.prefs.done "Gotovo"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere može koristiti EFF-ov SSL Opservatorij. Ovo čini dvije stvari: (1) -šalje kopije HTTPS certifikata Opservatoriju, da nam pomogne otkriti 'glavnog u sredini' napadača i poboljša Web sigurnost; i (2) -da vas upozorimo o nesigurnim vezama ili napadima na vaš preglednik."> +"HTTPS Everywhere može koristiti EFF-ov SSL Opservatorij. Ovo radi dvije stvari: (1) +šalje kopije HTTPS certifikata Opservatoriju, da nam pomogne +u otkrivanju 'čovjek u sredini' napada i poboljša sigurnost Web-a; i (2) +dopušta nam da Vas obavijestimo o nesigurnim vezama ili napadima na Vaš preglednik.">  <!ENTITY ssl-observatory.prefs.explanation2 -"Npr., kada posjetite https://www.something.com, certifikat +"Npr., kad posjetite https://www.something.com, certifikat primljen od Opservatorija će naznačiti da je netko posjetio www.something.com, ali ne tko je posjetio stranicu, ili koju su određenu stranicu tražili. Prelazak mišem preko "opcija" za daljnje pojedinosti:"> -<!ENTITY ssl-observatory.prefs.hide "Sakrij detaljnije opcije"> +<!ENTITY ssl-observatory.prefs.hide "Sakrij napredne opcije"> <!ENTITY ssl-observatory.prefs.nonanon "Provjeri certifikate iako Tor nije dostupan"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -"Mi ćemo još uvijek pokušati držati podatke anonimnim, ali ova mogućnost je manje sigurna"> +"Pokušati ćemo održati podatke anonimnima, ali ova mogućnost je manje sigurna"> <!ENTITY ssl-observatory.prefs.priv_dns "Prijavite i provjerite certifikate za ne-javne DNS nazive"> @@ -88,18 +87,16 @@ stranicu tražili. Prelazak mišem preko "opcija" za daljnje pojedino <!ENTITY ssl-observatory.prefs.show "Prikaži napredne mogućnosti "> -<!ENTITY ssl-observatory.prefs.title "Osobitosti SSL Opservatorija"> +<!ENTITY ssl-observatory.prefs.title "Postavke SSL Opservatorija"> <!ENTITY ssl-observatory.prefs.use "Koristi Opservatorij?"> <!ENTITY ssl-observatory.warning.title "UPOZORENJE iz EFF-ovog SSL Opservatorija"> -<!ENTITY ssl-observatory.warning.showcert "Prikaži podatak certifikata"> +<!ENTITY ssl-observatory.warning.showcert "Prikaži lanac certifikata"> <!ENTITY ssl-observatory.warning.okay "Razumijem"> <!ENTITY ssl-observatory.warning.text "EFF-ov SSL Opservatorij je izdao upozorenje o HTTPS certifikatu(ima) za ovu stranicu:"> -<!ENTITY ssl-observatory.warning.defense "Ako ste ulogirani na ovu stranicu, preporuča se da promijenite lozinku kad budete imali -sigurnu vezu. (Ova upozorenja se mogu isključiti u "SSL Observatory" tabu na -HTTPS Everywhere okviru za preference.)"> +<!ENTITY ssl-observatory.warning.defense "Ako ste ulogirani na ovu stranicu, preporuča se da promijenite lozinku kad budete imali sigurnu vezu. (Ova upozorenja se mogu isključiti u "SSL Observatory" kartici u postavkama HTTPS Everywhere.)"> <!ENTITY ssl-observatory.prefs.self_signed "Prijavite i provijerite samopotpisane certifikate"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -"To je preporučljivo; kriptografski problemi su naročito česti u samopotpisanim ugrađenim uređajima"> +"Ovo je preporučeno; kriptografski problemi su naročito česti u samopotpisanim ugrađenim uređajima">

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 29 Jan '15

29 Jan '15

commit f6b40646b30eb5d99489ef2d36d47a95e53aa62a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 29 10:15:10 2015 +0000 Update translations for bridgedb_completed --- hr_HR/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index de1a750..f313170 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -5,7 +5,7 @@ # Translators: # Ana B, 2013-2014 # Armando Vega <synaan(a)gmail.com>, 2012 -# skiddiep <lyricaltumor(a)gmail.com>, 2014 +# skiddiep <lyricaltumor(a)gmail.com>, 2014-2015 # Tomislav Siroglavić <tomsiro(a)gmail.com>, 2014 # gogo <trebelnik2(a)gmail.com>, 2012 msgid "" @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-11-13 09:21+0000\n" -"Last-Translator: Tomislav Siroglavić <tomsiro(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-29 10:06+0000\n" +"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +89,7 @@ msgstr "Javni ključevi" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Ovaj email sastavljen je s dugama, jednorozima i iskricama\nza %s na %s u %s." +msgstr "Ovaj email je sastavljen s dugama, jednorozima i iskricama\nza %s na %s u %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 Jan '15

29 Jan '15

commit 457ba956108020c7096b81cca468f8282ec15523 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 29 10:15:02 2015 +0000 Update translations for bridgedb --- hr_HR/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index de1a750..f313170 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -5,7 +5,7 @@ # Translators: # Ana B, 2013-2014 # Armando Vega <synaan(a)gmail.com>, 2012 -# skiddiep <lyricaltumor(a)gmail.com>, 2014 +# skiddiep <lyricaltumor(a)gmail.com>, 2014-2015 # Tomislav Siroglavić <tomsiro(a)gmail.com>, 2014 # gogo <trebelnik2(a)gmail.com>, 2012 msgid "" @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-11-13 09:21+0000\n" -"Last-Translator: Tomislav Siroglavić <tomsiro(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-29 10:06+0000\n" +"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +89,7 @@ msgstr "Javni ključevi" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Ovaj email sastavljen je s dugama, jednorozima i iskricama\nza %s na %s u %s." +msgstr "Ovaj email je sastavljen s dugama, jednorozima i iskricama\nza %s na %s u %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 28 Jan '15

28 Jan '15

commit 98a279d83b676f1a59121bea8f729dc0ba66a9ae Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 28 23:15:18 2015 +0000 Update translations for https_everywhere_completed --- hr_HR/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hr_HR/ssl-observatory.dtd b/hr_HR/ssl-observatory.dtd index 67e2810..d98da61 100644 --- a/hr_HR/ssl-observatory.dtd +++ b/hr_HR/ssl-observatory.dtd @@ -34,7 +34,7 @@ ometajuću korporativnu mrežu:"> <!ENTITY ssl-observatory.prefs.anonymous "Provjeri certifikate koristeći Tor za anonimnost"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"Provjeri certifikate koristeći Tor za anonimnost (zahtijeva Tortipku)"> +"Provjeri certifikate koristeći Tor za anonimnost (zahtijeva Tor)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip "Ova mogućnost zahtijeva instalirani Tor i Tortipku"> @@ -70,9 +70,9 @@ Mouseover the options for further details:">--> "Npr., kada posjetite https://www.something.com, certifikat primljen od Opservatorija će naznačiti da je netko posjetio www.something.com, ali ne tko je posjetio stranicu, ili koju su određenu -stranicu tražili. Prelazak mišem za daljnje pojedinosti:"> +stranicu tražili. Prelazak mišem preko "opcija" za daljnje pojedinosti:"> -<!ENTITY ssl-observatory.prefs.hide "Sakrij napredne mogućnpsti"> +<!ENTITY ssl-observatory.prefs.hide "Sakrij detaljnije opcije"> <!ENTITY ssl-observatory.prefs.nonanon "Provjeri certifikate iako Tor nije dostupan">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Jan '15

28 Jan '15

commit 10aee1800bca9739efa4aa92b0fb0e1112f2d49b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 28 23:15:13 2015 +0000 Update translations for https_everywhere --- hr_HR/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hr_HR/ssl-observatory.dtd b/hr_HR/ssl-observatory.dtd index 67e2810..d98da61 100644 --- a/hr_HR/ssl-observatory.dtd +++ b/hr_HR/ssl-observatory.dtd @@ -34,7 +34,7 @@ ometajuću korporativnu mrežu:"> <!ENTITY ssl-observatory.prefs.anonymous "Provjeri certifikate koristeći Tor za anonimnost"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"Provjeri certifikate koristeći Tor za anonimnost (zahtijeva Tortipku)"> +"Provjeri certifikate koristeći Tor za anonimnost (zahtijeva Tor)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip "Ova mogućnost zahtijeva instalirani Tor i Tortipku"> @@ -70,9 +70,9 @@ Mouseover the options for further details:">--> "Npr., kada posjetite https://www.something.com, certifikat primljen od Opservatorija će naznačiti da je netko posjetio www.something.com, ali ne tko je posjetio stranicu, ili koju su određenu -stranicu tražili. Prelazak mišem za daljnje pojedinosti:"> +stranicu tražili. Prelazak mišem preko "opcija" za daljnje pojedinosti:"> -<!ENTITY ssl-observatory.prefs.hide "Sakrij napredne mogućnpsti"> +<!ENTITY ssl-observatory.prefs.hide "Sakrij detaljnije opcije"> <!ENTITY ssl-observatory.prefs.nonanon "Provjeri certifikate iako Tor nije dostupan">

1 0

[tor/master] fixup! Refactor the use of ifdef HAVE_SYS_UN_H
by nickm＠torproject.org 28 Jan '15

28 Jan '15

commit fb523b543a95e6eeb85ee93dcad24e1aeb79328f Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Jan 28 13:11:21 2015 -0500 fixup! Refactor the use of ifdef HAVE_SYS_UN_H Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rendservice.c | 99 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 31 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 920a8cf..9f58bb1 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3471,6 +3471,56 @@ rend_service_dump_stats(int severity) } } +#ifdef HAVE_SYS_UN_H + +/** Given ports, a smarlist containing rend_service_port_config_t, + * add the given p, a AF_UNIX port to the list. Return 0 on success + * else return -ENOSYS if AF_UNIX is not supported (see function in the + * #else statement below). */ +static int +add_unix_port(smartlist_t *ports, rend_service_port_config_t *p) +{ + tor_assert(ports); + tor_assert(p); + tor_assert(p->is_unix_addr); + + smartlist_add(ports, p); + return 0; +} + +/** Given conn set it to use the given port p values. Return 0 + * on success else return -ENOSYS if AF_UNIX is not supported (see function + * in the #else statement below). */ +static int +set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p) +{ + tor_assert(conn); + tor_assert(p); + tor_assert(p->is_unix_addr); + + conn->base_.socket_family = AF_UNIX; + tor_addr_make_unspec(&conn->base_.addr); + conn->base_.port = 1; + conn->base_.address = tor_strdup(p->unix_addr); + return 0; +} + +#else /* defined(HAVE_SYS_UN_H) */ + +static int +set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p) +{ + return -ENOSYS; +} + +static int +add_unix_port(smartlist_t *ports, rend_service_port_config_t *p) +{ + return -ENOSYS; +} + +#endif /* HAVE_SYS_UN_H */ + /** Given conn, a rendezvous exit stream, look up the hidden service for * 'circ', and look up the port and address based on conn-\>port. * Assign the actual conn-\>addr and conn-\>port. Return -2 on failure @@ -3485,9 +3535,7 @@ rend_service_set_connection_addr_port(edge_connection_t *conn, char serviceid[REND_SERVICE_ID_LEN_BASE32+1]; smartlist_t *matching_ports; rend_service_port_config_t *chosen_port; -#ifndef HAVE_SYS_UN_H - int unix_addrs_rejected; -#endif /* !defined(HAVE_SYS_UN_H) */ + unsigned int warn_once = 0; tor_assert(circ->base_.purpose == CIRCUIT_PURPOSE_S_REND_JOINED); tor_assert(circ->rend_data); @@ -3503,51 +3551,40 @@ rend_service_set_connection_addr_port(edge_connection_t *conn, return -2; } matching_ports = smartlist_new(); -#ifndef HAVE_SYS_UN_H - unix_addrs_rejected = 0; -#endif /* !defined(HAVE_SYS_UN_H) */ SMARTLIST_FOREACH(service->ports, rend_service_port_config_t *, p, { - if (conn->base_.port == p->virtual_port) { -#ifdef HAVE_SYS_UN_H + if (conn->base_.port != p->virtual_port) { + continue; + } + if (!(p->is_unix_addr)) { smartlist_add(matching_ports, p); -#else - if (!(p->is_unix_addr)) { - smartlist_add(matching_ports, p); - } else { - if (unix_addrs_rejected == 0) { - /* If we have no support, bitch about it for just the first one */ + } else { + if (add_unix_port(matching_ports, p)) { + if (!warn_once) { + /* Unix port not supported so warn only once. */ log_warn(LD_REND, - "Saw AF_UNIX virtual port mapping for port %d on service " - "%s, which is unsupported on this platform. Ignoring it.", - conn->base_.port, serviceid); + "Saw AF_UNIX virtual port mapping for port %d on service " + "%s, which is unsupported on this platform. Ignoring it.", + conn->base_.port, serviceid); } - ++unix_addrs_rejected; + warn_once++; } -#endif /* defined(HAVE_SYS_UN_H) */ } }); chosen_port = smartlist_choose(matching_ports); smartlist_free(matching_ports); if (chosen_port) { -#ifdef HAVE_SYS_UN_H if (!(chosen_port->is_unix_addr)) { -#else - { -#endif /* defined(HAVE_SYS_UN_H) */ /* Get a non-AF_UNIX connection ready for connection_exit_connect() */ tor_addr_copy(&conn->base_.addr, &chosen_port->real_addr); conn->base_.port = chosen_port->real_port; -#ifdef HAVE_SYS_UN_H } else { - /* Get an AF_UNIX connection ready for connection_exit_connect() */ - conn->base_.socket_family = AF_UNIX; - tor_addr_make_unspec(&conn->base_.addr); - conn->base_.port = 1; - conn->base_.address = tor_strdup(chosen_port->unix_addr); -#endif /* defined(HAVE_SYS_UN_H) */ + if (set_unix_port(conn, chosen_port)) { + /* Simply impossible to end up here else we were able to add a Unix + * port without AF_UNIX support... ? */ + tor_assert(0); + } } - return 0; }

1 0

[tor/master] Merge branch 'bug11485_026_v2_squashed'
by nickm＠torproject.org 28 Jan '15

28 Jan '15

commit a3de2dfde6a92c0fe7ca755aa7bc1aa046c463a8 Merge: b63bf09 fb523b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 28 14:32:19 2015 -0500 Merge branch 'bug11485_026_v2_squashed' changes/ticket11485 | 3 + src/or/connection.c | 194 +++++++++++++++++++++++++++++++--------------- src/or/connection.h | 7 ++ src/or/connection_edge.c | 36 +++++++-- src/or/rendservice.c | 170 +++++++++++++++++++++++++++++++++++++--- 5 files changed, 329 insertions(+), 81 deletions(-)

1 0

[tor/master] Support connection_exit_connect() to AF_UNIX sockets
by nickm＠torproject.org 28 Jan '15

28 Jan '15

commit ca5ba2956bcd4b5ee1e526ccf5914f52fe6e6d51 Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Jan 24 17:31:12 2015 +0000 Support connection_exit_connect() to AF_UNIX sockets --- src/or/connection.c | 194 +++++++++++++++++++++++++++++++--------------- src/or/connection.h | 7 ++ src/or/connection_edge.c | 36 +++++++-- 3 files changed, 168 insertions(+), 69 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 97fdee7..f26ada0 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -56,6 +56,11 @@ #include <pwd.h> #endif +#ifdef HAVE_SYS_UN_H +#include <sys/socket.h> +#include <sys/un.h> +#endif + static connection_t *connection_listener_new( const struct sockaddr *listensockaddr, socklen_t listensocklen, int type, @@ -1585,37 +1590,31 @@ connection_init_accepted_conn(connection_t *conn, return 0; } -/** Take conn, make a nonblocking socket; try to connect to - * addr:port (they arrive in *host order*). If fail, return -1 and if - * applicable put your best guess about errno into *socket_error. - * Else assign s to conn-\>s: if connected return 1, if EAGAIN return 0. - * - * address is used to make the logs useful. - * - * On success, add conn to the list of polled connections. - */ -int -connection_connect(connection_t *conn, const char *address, - const tor_addr_t *addr, uint16_t port, int *socket_error) + +static int +connection_connect_sockaddr(connection_t *conn, + const struct sockaddr *sa, + socklen_t sa_len, + const struct sockaddr *bindaddr, + socklen_t bindaddr_len, + int *socket_error) { tor_socket_t s; int inprogress = 0; - struct sockaddr_storage addrbuf; - struct sockaddr *dest_addr; - int dest_addr_len; const or_options_t *options = get_options(); int protocol_family; + tor_assert(conn); + tor_assert(sa); + tor_assert(socket_error); + if (get_n_open_sockets() >= get_options()->ConnLimit_-1) { warn_too_many_conns(); *socket_error = SOCK_ERRNO(ENOBUFS); return -1; } - if (tor_addr_family(addr) == AF_INET6) - protocol_family = PF_INET6; - else - protocol_family = PF_INET; + protocol_family = sa->sa_family; if (get_options()->DisableNetwork) { /* We should never even try to connect anyplace if DisableNetwork is set. @@ -1628,7 +1627,7 @@ connection_connect(connection_t *conn, const char *address, return -1; } - s = tor_open_socket_nonblocking(protocol_family,SOCK_STREAM,IPPROTO_TCP); + s = tor_open_socket_nonblocking(protocol_family, SOCK_STREAM, 0); if (! SOCKET_OK(s)) { *socket_error = tor_socket_errno(-1); log_warn(LD_NET,"Error creating network socket: %s", @@ -1641,6 +1640,74 @@ connection_connect(connection_t *conn, const char *address, tor_socket_strerror(errno)); } + if (bindaddr && bind(s, bindaddr, bindaddr_len) < 0) { + *socket_error = tor_socket_errno(s); + log_warn(LD_NET,"Error binding network socket: %s", + tor_socket_strerror(*socket_error)); + tor_close_socket(s); + return -1; + } + + tor_assert(options); + if (options->ConstrainedSockets) + set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize); + + if (connect(s, sa, sa_len) < 0) { + int e = tor_socket_errno(s); + if (!ERRNO_IS_CONN_EINPROGRESS(e)) { + /* yuck. kill it. */ + *socket_error = e; + log_info(LD_NET, + "connect() to socket failed: %s", + tor_socket_strerror(e)); + tor_close_socket(s); + return -1; + } else { + inprogress = 1; + } + } + + /* it succeeded. we're connected. */ + log_fn(inprogress ? LOG_DEBUG : LOG_INFO, LD_NET, + "Connection to socket %s (sock "TOR_SOCKET_T_FORMAT").", + inprogress ? "in progress" : "established", s); + conn->s = s; + if (connection_add_connecting(conn) < 0) { + /* no space, forget it */ + *socket_error = SOCK_ERRNO(ENOBUFS); + return -1; + } + return inprogress ? 0 : 1; + +} + + +/** Take conn, make a nonblocking socket; try to connect to + * addr:port (they arrive in *host order*). If fail, return -1 and if + * applicable put your best guess about errno into *socket_error. + * Else assign s to conn-\>s: if connected return 1, if EAGAIN return 0. + * + * address is used to make the logs useful. + * + * On success, add conn to the list of polled connections. + */ +int +connection_connect(connection_t *conn, const char *address, + const tor_addr_t *addr, uint16_t port, int *socket_error) +{ + struct sockaddr_storage addrbuf; + struct sockaddr_storage bind_addr_ss; + struct sockaddr *bind_addr = NULL; + struct sockaddr *dest_addr; + int dest_addr_len, bind_addr_len = 0; + const or_options_t *options = get_options(); + int protocol_family; + + if (tor_addr_family(addr) == AF_INET6) + protocol_family = PF_INET6; + else + protocol_family = PF_INET; + if (!tor_addr_is_loopback(addr)) { const tor_addr_t *ext_addr = NULL; if (protocol_family == AF_INET && @@ -1650,33 +1717,21 @@ connection_connect(connection_t *conn, const char *address, !tor_addr_is_null(&options->OutboundBindAddressIPv6_)) ext_addr = &options->OutboundBindAddressIPv6_; if (ext_addr) { - struct sockaddr_storage ext_addr_sa; socklen_t ext_addr_len = 0; - memset(&ext_addr_sa, 0, sizeof(ext_addr_sa)); - ext_addr_len = tor_addr_to_sockaddr(ext_addr, 0, - (struct sockaddr *) &ext_addr_sa, - sizeof(ext_addr_sa)); + memset(&bind_addr_ss, 0, sizeof(bind_addr_ss)); + bind_addr_len = tor_addr_to_sockaddr(ext_addr, 0, + (struct sockaddr *) &bind_addr_ss, + sizeof(bind_addr_ss)); if (ext_addr_len == 0) { log_warn(LD_NET, "Error converting OutboundBindAddress %s into sockaddr. " "Ignoring.", fmt_and_decorate_addr(ext_addr)); } else { - if (bind(s, (struct sockaddr *) &ext_addr_sa, ext_addr_len) < 0) { - *socket_error = tor_socket_errno(s); - log_warn(LD_NET,"Error binding network socket to %s: %s", - fmt_and_decorate_addr(ext_addr), - tor_socket_strerror(*socket_error)); - tor_close_socket(s); - return -1; - } + bind_addr = (struct sockaddr *)&bind_addr_ss; } } } - tor_assert(options); - if (options->ConstrainedSockets) - set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize); - memset(&addrbuf,0,sizeof(addrbuf)); dest_addr = (struct sockaddr*) &addrbuf; dest_addr_len = tor_addr_to_sockaddr(addr, port, dest_addr, sizeof(addrbuf)); @@ -1685,36 +1740,51 @@ connection_connect(connection_t *conn, const char *address, log_debug(LD_NET, "Connecting to %s:%u.", escaped_safe_str_client(address), port); - if (connect(s, dest_addr, (socklen_t)dest_addr_len) < 0) { - int e = tor_socket_errno(s); - if (!ERRNO_IS_CONN_EINPROGRESS(e)) { - /* yuck. kill it. */ - *socket_error = e; - log_info(LD_NET, - "connect() to %s:%u failed: %s", - escaped_safe_str_client(address), - port, tor_socket_strerror(e)); - tor_close_socket(s); - return -1; - } else { - inprogress = 1; - } - } + return connection_connect_sockaddr(conn, dest_addr, dest_addr_len, + bind_addr, bind_addr_len, socket_error); +} - /* it succeeded. we're connected. */ - log_fn(inprogress?LOG_DEBUG:LOG_INFO, LD_NET, - "Connection to %s:%u %s (sock "TOR_SOCKET_T_FORMAT").", - escaped_safe_str_client(address), - port, inprogress?"in progress":"established", s); - conn->s = s; - if (connection_add_connecting(conn) < 0) { - /* no space, forget it */ - *socket_error = SOCK_ERRNO(ENOBUFS); +#ifdef HAVE_SYS_UN_H + +/** Take conn, make a nonblocking socket; try to connect to + * an AF_UNIX socket at socket_path. If fail, return -1 and if applicable + * put your best guess about errno into *socket_error. Else assign s + * to conn-\>s: if connected return 1, if EAGAIN return 0. + * + * On success, add conn to the list of polled connections. + */ +int +connection_connect_unix(connection_t *conn, const char *socket_path, + int *socket_error) +{ + struct sockaddr_un dest_addr; + + tor_assert(socket_path); + + /* Check that we'll be able to fit it into dest_addr later */ + if (strlen(socket_path) + 1 > sizeof(dest_addr.sun_path)) { + log_warn(LD_NET, + "Path %s is too long for an AF_UNIX socket\n", + escaped_safe_str_client(socket_path)); + *socket_error = SOCK_ERRNO(ENAMETOOLONG); return -1; } - return inprogress ? 0 : 1; + + memset(&dest_addr, 0, sizeof(dest_addr)); + dest_addr.sun_family = AF_UNIX; + strlcpy(dest_addr.sun_path, socket_path, sizeof(dest_addr.sun_path)); + + log_debug(LD_NET, + "Connecting to AF_UNIX socket at %s.", + escaped_safe_str_client(socket_path)); + + return connection_connect_sockaddr(conn, + (struct sockaddr *)&dest_addr, sizeof(dest_addr), + NULL, 0, socket_error); } +#endif /* defined(HAVE_SYS_UN_H) */ + /** Convert state number to string representation for logging purposes. */ static const char * diff --git a/src/or/connection.h b/src/or/connection.h index ce6ed28..50bea51 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -89,6 +89,13 @@ int connection_connect(connection_t *conn, const char *address, const tor_addr_t *addr, uint16_t port, int *socket_error); +#ifdef HAVE_SYS_UN_H + +int connection_connect_unix(connection_t *conn, const char *socket_path, + int *socket_error); + +#endif /* defined(HAVE_SYS_UN_H) */ + /** Maximum size of information that we can fit into SOCKS5 username or password fields. */ #define MAX_SOCKS5_AUTH_FIELD_SIZE 255 diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f541249..9690653 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2940,7 +2940,7 @@ connection_exit_connect(edge_connection_t *edge_conn) const tor_addr_t *addr; uint16_t port; connection_t *conn = TO_CONN(edge_conn); - int socket_error = 0; + int socket_error = 0, result; if ( (!connection_edge_is_rendezvous_stream(edge_conn) && router_compare_to_my_exit_policy(&edge_conn->base_.addr, @@ -2955,14 +2955,36 @@ connection_exit_connect(edge_connection_t *edge_conn) return; } - addr = &conn->addr; - port = conn->port; +#ifdef HAVE_SYS_UN_H + if (conn->socket_family != AF_UNIX) { +#else + { +#endif /* defined(HAVE_SYS_UN_H) */ + addr = &conn->addr; + port = conn->port; + + if (tor_addr_family(addr) == AF_INET6) + conn->socket_family = AF_INET6; + + log_debug(LD_EXIT, "about to try connecting"); + result = connection_connect(conn, conn->address, + addr, port, &socket_error); +#ifdef HAVE_SYS_UN_H + } else { + /* + * In the AF_UNIX case, we expect to have already had conn->port = 1, + * tor_addr_make_unspec(conn->addr) (cf. the way we mark in the incoming + * case in connection_handle_listener_read()), and conn->address should + * have the socket path to connect to. + */ + tor_assert(conn->address && strlen(conn->address) > 0); - if (tor_addr_family(addr) == AF_INET6) - conn->socket_family = AF_INET6; + log_debug(LD_EXIT, "about to try connecting"); + result = connection_connect_unix(conn, conn->address, &socket_error); +#endif /* defined(HAVE_SYS_UN_H) */ + } - log_debug(LD_EXIT,"about to try connecting"); - switch (connection_connect(conn, conn->address, addr, port, &socket_error)) { + switch (result) { case -1: { int reason = errno_to_stream_end_reason(socket_error); connection_edge_end(edge_conn, reason);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
94
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2015