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

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 31 Oct '18

31 Oct '18

commit b2c43b1c956cda4e71d5bb7e0da811be08f4afe4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 31 21:16:23 2018 +0000 Update translations for tails-perl5lib_completed --- ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ko.po b/ko.po index 46fc99eba..9257f88cd 100644 --- a/ko.po +++ b/ko.po @@ -8,11 +8,11 @@ # Philipp Sauter <qt123(a)pm.me>, 2018 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-08-16 11:11+0200\n" -"PO-Revision-Date: 2018-09-30 04:58+0000\n" -"Last-Translator: snotree <cknblue(a)gmail.com>\n" +"PO-Revision-Date: 2018-10-31 21:03+0000\n" +"Last-Translator: Philipp Sauter <qt123(a)pm.me>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 31 Oct '18

31 Oct '18

commit 324881c6332102d4552cff0884df0b82cb59c88b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 31 21:16:18 2018 +0000 Update translations for tails-perl5lib --- ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ko.po b/ko.po index 46fc99eba..9257f88cd 100644 --- a/ko.po +++ b/ko.po @@ -8,11 +8,11 @@ # Philipp Sauter <qt123(a)pm.me>, 2018 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-08-16 11:11+0200\n" -"PO-Revision-Date: 2018-09-30 04:58+0000\n" -"Last-Translator: snotree <cknblue(a)gmail.com>\n" +"PO-Revision-Date: 2018-10-31 21:03+0000\n" +"Last-Translator: Philipp Sauter <qt123(a)pm.me>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[stem/master] Tor stacktraces missing if the crash occures on the last test
by atagar＠torproject.org 31 Oct '18

31 Oct '18

commit c15c8a5af1f7a9a85a092b932f380b4823ebe86d Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 31 13:01:49 2018 -0700 Tor stacktraces missing if the crash occures on the last test Dumb me. We should check if the tor process is running *after* the test, not before. Otherwise tor segfaults that occure during our last test suite go unreported (such as with tor commit 075acf905). --- run_tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/run_tests.py b/run_tests.py index bd0839c9..3afc5c9a 100755 --- a/run_tests.py +++ b/run_tests.py @@ -236,11 +236,11 @@ def main(): println('Running tests...\n', STATUS) for test_class in get_integ_tests(args.specific_test): - if integ_runner.assert_tor_is_running(): - run_result = _run_test(args, test_class, output_filters) - test.output.print_logging(logging_buffer) - skipped_tests += len(getattr(run_result, 'skipped', [])) - else: + run_result = _run_test(args, test_class, output_filters) + test.output.print_logging(logging_buffer) + skipped_tests += len(getattr(run_result, 'skipped', [])) + + if not integ_runner.assert_tor_is_running(): # our tor process died error_tracker.register_error()

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 31 Oct '18

31 Oct '18

commit 8f8772ecfdd480852d7f0a563580a1c278f7e346 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 31 17:47:17 2018 +0000 Update translations for torbirdy --- gl/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gl/torbirdy.dtd b/gl/torbirdy.dtd index a803fedd9..a5c2dc5a5 100644 --- a/gl/torbirdy.dtd +++ b/gl/torbirdy.dtd @@ -19,7 +19,7 @@ <!ENTITY torbirdy.prefs.proxy.label "Proxy"> <!ENTITY torbirdy.prefs.privacy.label "Privacidade"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> -<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Usar a configuración recomendada do proxy para TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service"> <!ENTITY torbirdy.prefs.anonservice.key "a">

1 0

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

31 Oct '18

commit 6edb74e7f196f30b35a9e6e7e4ca61d8ee218c81 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 31 15:49:11 2018 +0000 Update translations for support-portal --- contents+fr.po | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 3c9f337d8..a6250f8be 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1,13 +1,14 @@ # Translators: # erinm, 2018 # Emma Peel, 2018 +# AO <ao(a)localizationlab.org>, 2018 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-27 19:20+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Emma Peel, 2018\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2018\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -295,7 +296,7 @@ msgstr "" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.title) @@ -568,6 +569,8 @@ msgid "" "<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " "with a padlock\">" msgstr "" +"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " +"with a padlock\">" #: http//localhost/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.description) @@ -1613,7 +1616,7 @@ msgstr "connexion-à-tor" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/image3.png\" alt=\"New release alert\">" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.description) @@ -1664,6 +1667,8 @@ msgid "" "<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " "Circuit for this Site\">" msgstr "" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " +"Circuit for this Site\">" #: http//localhost/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -3619,6 +3624,8 @@ msgid "" "<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " "Browser Update\">" msgstr "" +"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " +"Browser Update\">" #: http//localhost/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) @@ -3645,6 +3652,8 @@ msgid "" "<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " "Browser Menu\">" msgstr "" +"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " +"Browser Menu\">" #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.description) @@ -4302,7 +4311,7 @@ msgstr "" #: http//localhost/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description)

1 0

[webwml/master] Update "Android" Experimental Tor Browser verion
by hiro＠torproject.org 31 Oct '18

31 Oct '18

commit 91543c41fadfa999c284d585c69ab33db9ac340f Author: hiro <hiro(a)torproject.org> Date: Wed Oct 31 16:32:12 2018 +0100 Update "Android" Experimental Tor Browser verion --- es/banner.wmi | 18 +++++ es/index.wml | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++ es/navigation.wmi | 29 ++++++++ include/versions.wmi | 4 +- 4 files changed, 251 insertions(+), 2 deletions(-) diff --git a/es/banner.wmi b/es/banner.wmi new file mode 100644 index 00000000..bb914cc8 --- /dev/null +++ b/es/banner.wmi @@ -0,0 +1,18 @@ +<div class="eoy-background"> + <div class="eoy-wrap"> + <div class="eoy-artwork"> + </div> + <div class="eoy-message"> + <div class="tor-strength-in-num"> + <p>Tor: strength in numbers</p> + </div> + <div class="keep-tor-strong-giv"> + <p class="advance-universal-hu">Advance universal <mark>human rights.</mark> Protect the <mark>privacy of millions.</mark> Your financial support will allow people around the world to be more <mark>safe online.</mark></p> + <span class="give-today-and-mozi">Give today, and Mozilla will match your donation.</span> + </div> + <div class="eoy-btn-container"> + <a class="eoy-btn count-me-in" href="https://torproject.org/donate/donate-sin-hp1">Count me in</a> + </div> + </div> + </div> +</div> diff --git a/es/index.wml b/es/index.wml new file mode 100644 index 00000000..7ae08d27 --- /dev/null +++ b/es/index.wml @@ -0,0 +1,202 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 1-high +#include "banner.wmi" +#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" +<define-tag lang>es-ES</define-tag> +<div id="home"> + <div id="content" class="clearfix"> + <div id="maincol"> + <div id="banner"> + <ul> + <li>Tor prevents people from learning your location or browsing habits.</li> + <li>Tor is for web browsers, instant messaging clients, and more.</li> + <li>Tor is free and open source for Windows, Mac, Linux/Unix, and Android</li> + </ul> + <h1 class="headline">Anonymity Online</h1> + <p class="desc">Protect your privacy. Defend yourself against network surveillance and traffic analysis.</p> + + <div id="download"> + <a href="<page download/download-easy>"> + <span class="download-tor">Download Tor</span></a> + </div> + </div> + <div class="subcol-container clearfix"> + <div class="subcol first"> + <h2>What is Tor?</h2> <p>Tor is free software and an open + network that helps you defend against traffic analysis, + a form of network surveillance that + threatens personal freedom and privacy, confidential business + activities and relationships, and state security.<br> + <span class="continue"><a href="<page about/overview>">Learn + more about Tor »</a></span></p> + </div> +  + <div class="subcol"> + <h2>Why Anonymity Matters</h2> + <p>Tor protects you by bouncing your communications around a + distributed network of relays run by volunteers all around + the world: it prevents somebody watching your Internet + connection from learning what sites you visit, and it prevents + the sites you visit from learning your physical location.<br> + <span class="continue"><a href="<page + getinvolved/volunteer>">Get involved with Tor + »</a></span></p> + </div> + </div> +  + <div id="home-our-projects" class="clearfix"> + <h2>Our Projects</h2> + <div class="fauxhead"></div> + <table style="table-layout: fixed;"> + <tr> +  + <td> + <div class="project"> + <a href="<page projects/torbrowser>"><img + src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> + <h3><a href="<page projects/torbrowser>">Tor + Browser</a></h3> + <p>Tor Browser contains everything you need to safely + browse the Internet.</p> + </div> + </td> + <td> + <div class="project"> + <a href="https://guardianproject.info/apps/orbot/"><img + src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a> + <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3> + <p>Tor for Google Android devices.</p> + </div> + </td> + </tr> + <tr> + <td> + <div class="project"> + <a href="https://tails.boum.org/"><img src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> + <h3><a href="https://tails.boum.org/">Tails</a></h3> + <p>Live CD/USB operating system preconfigured to use + Tor safely.</p> + </div> + </td> +  + <td> + <div class="project"> + <a href="https://nyx.torproject.org/"><img + src="$(IMGROOT)/icon-Nyx.jpg" alt="Nyx Icon"></a> + <h3><a href="https://nyx.torproject.org/">Nyx</a></h3> + <p>Terminal (command line) application for monitoring + and configuring Tor.</p> + </div> + </td> + </tr> + <tr> +  + <td> + <div class="project"> + <a href="https://metrics.torproject.org/rs.html"><img + src="$(IMGROOT)/icon-TorStatus.jpg" alt="Atlas Icon"></a> + <h3><a href="https://metrics.torproject.org/rs.html">Relay + Search</a></h3> + <p>Site providing an overview of the Tor network.</p> + </div> + </td> +  + <td> + <div class="project"> + <a href="<page docs/pluggable-transports>"><img + src="$(IMGROOT)/icon-Obfsproxy.jpg" alt="Pluggable Transports Icon"></a> + <h3><a href="<page docs/pluggable-transports>">Pluggable Transports</a></h3> + <p>Pluggable transports help you circumvent censorship.</p> + </div> + </td> + </tr> + <tr> + <td> + <div class="project"> + <a href="https://stem.torproject.org/"><img + src="$(IMGROOT)/icon-stem.jpg" alt="Stem Icon"></a> + <h3><a href="https://stem.torproject.org/">Stem</a></h3> + <p>Library for writing scripts and applications that interact + with Tor.</p> + </div> + </td> + <td> + <div class="project"> + <a href="https://ooni.torproject.org/"><img + src="$(IMGROOT)/icon-OONI.png" alt="OONI"></a> + <h3><a href="https://ooni.torproject.org/">OONI</a></h3> + <p>Global observatory monitoring for network censorship.</p> + </div> + </td> + </tr> + </table> + <span class="continue"><a href="<page projects/projects>">Learn more about our projects »</a></span> + </div> +  + </div> +  + <div id="sidecol"> + <div class="joblink"> + <a href="<page about/jobs>">We're hiring! »</a> + </div> +  +#include <blog-recent.wmi> +  + <div id="home-users"> + <h2>Who Uses Tor?</h2> + <div class="fauxhead"></div> + <div class="user"> + <h3> + <a href="<page about/torusers>#normalusers"><img src="$(IMGROOT)/family.jpg" alt="Normal People">Family & Friends</a> + </h3> + <p>People like you and your family use Tor to protect themselves, their children, and their dignity while using the Internet.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#executives"><img src="$(IMGROOT)/consumers.jpg" alt="Businesses">Businesses</a> + </h3> + <p>Businesses use Tor to research competition, keep business strategies confidential, and facilitate internal accountability.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#activists"><img src="$(IMGROOT)/activists.jpg" alt="Activists & Whistleblowers">Activists</a> + </h3> + <p>Activists use Tor to anonymously report abuses from danger zones. Whistleblowers use Tor to safely report on corruption.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#journalist"><img src="$(IMGROOT)/media.jpg" alt="Journalists and the Media">Media</a> + </h3> + <p>Journalists and the media use Tor to protect their research and sources online.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#military"><img src="$(IMGROOT)/military.jpg" alt="Military and Law Enforcement">Military & Law Enforcement</a> + </h3> + <p>Militaries and law enforcement use Tor to protect their communications, investigations, and intelligence gathering online.</p> + </div> + </div> +  + </div> +  + </div> +  + </div> +  +#include <foot.wmi> diff --git a/es/navigation.wmi b/es/navigation.wmi new file mode 100644 index 00000000..051a263e --- /dev/null +++ b/es/navigation.wmi @@ -0,0 +1,29 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'docs/documentation' , 'Documentation', + 'press/press' , 'Press', + '<blog>' , 'Blog', + '<newsletter>' , 'Newsletter', + 'about/contact' , 'Contact', + ); + my @donatenav = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'about/contact' , 'Contact', + ); + my @calltoaction = ( + 'download/download-easy' , 'Download', + 'getinvolved/volunteer' , 'Volunteer', + 'donate/donate-button' , 'Donate', + ); + +:> diff --git a/include/versions.wmi b/include/versions.wmi index 24a8b55e..d54479c7 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -48,5 +48,5 @@ <define-tag package-source-alpha whitespace=delete>../dist/<file-source-alpha></define-tag> # *** tor browser android *** -<define-tag version-torbrowserbundleandroid whitespace=delete>1.0a2</define-tag> -<define-tag releasedate-torbrowserbundleandroid whitespace=delete>2018-10-11</define-tag> +<define-tag version-torbrowserbundleandroid whitespace=delete>1.0a3</define-tag> +<define-tag releasedate-torbrowserbundleandroid whitespace=delete>2018-10-31</define-tag>

1 0

[torspec/master] HSv3: Actually do base32 in the client auth pubkey example.
by dgoulet＠torproject.org 31 Oct '18

31 Oct '18

commit c2cce301d8afa92d69d1594565269ecd33dcd3a6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 17 14:45:29 2018 +0300 HSv3: Actually do base32 in the client auth pubkey example. Pointed out by Jean Chevalier. --- rend-spec-v3.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rend-spec-v3.txt b/rend-spec-v3.txt index 03b45d9..4329f00 100644 --- a/rend-spec-v3.txt +++ b/rend-spec-v3.txt @@ -2347,7 +2347,7 @@ Appendix G. Managing authorized client data [CLIENT-AUTH-MGMT] Here is an an example: - descriptor:x25519:5c8eac469bb3f1b85bc7cd893f52dc42a9ab66f1b02b5ce6a68e9b175d3bb433 + descriptor:x25519:OM7TGIVRYMY6PFX6GAC6ATRTA5U6WW6U7A4ZNHQDI6OVL52XVV2Q Tor SHOULD ignore lines it does not recognize. Tor SHOULD ignore files that don't use the ".auth" suffix.

1 0

[torspec/master] Merge branch 'tor-github/pr/40'
by dgoulet＠torproject.org 31 Oct '18

31 Oct '18

commit 14881dc2270dd734d46d23ef77ee2c7aa68736bd Merge: a315eed c2cce30 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 31 11:10:28 2018 -0400 Merge branch 'tor-github/pr/40' rend-spec-v3.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Check IPv6 subnets as well as IPv4 subnets where possible when choosing client paths
by nickm＠torproject.org 31 Oct '18

31 Oct '18

commit 067b16eae2b7d37c7ec1595226bc7bf26aac1ff5 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Sep 5 10:12:35 2018 -0400 Check IPv6 subnets as well as IPv4 subnets where possible when choosing client paths --- changes/bug24393 | 6 ++++++ src/feature/nodelist/nodelist.c | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug24393 b/changes/bug24393 new file mode 100644 index 000000000..e19019231 --- /dev/null +++ b/changes/bug24393 @@ -0,0 +1,6 @@ + o Minor features (ipv6): + - When using addrs_in_same_network_family(), check IPv6 subnets as well as + IPv4 ones where possible when a client chooses circuit paths. Previously, + we used this function only for IPv4 subnets. Closes ticket 24393. Patch + by Neel Chauhan. + diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index a98a5c865..a1a1b0ea3 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1867,6 +1867,9 @@ int addrs_in_same_network_family(const tor_addr_t *a1, const tor_addr_t *a2) { + if (tor_addr_is_null(a1) || tor_addr_is_null(a2)) + return 0; + switch (tor_addr_family(a1)) { case AF_INET: return 0 == tor_addr_compare_masked(a1, a2, 16, CMP_SEMANTIC); @@ -1917,7 +1920,13 @@ nodes_in_same_family(const node_t *node1, const node_t *node2) tor_addr_t a1, a2; node_get_addr(node1, &a1); node_get_addr(node2, &a2); - if (addrs_in_same_network_family(&a1, &a2)) + + tor_addr_port_t ap6_1, ap6_2; + node_get_pref_ipv6_orport(node1, &ap6_1); + node_get_pref_ipv6_orport(node2, &ap6_2); + + if (addrs_in_same_network_family(&a1, &a2) || + addrs_in_same_network_family(&ap6_1.addr, &ap6_2.addr)) return 1; } @@ -1974,12 +1983,17 @@ nodelist_add_node_and_family(smartlist_t *sl, const node_t *node) /* First, add any nodes with similar network addresses. */ if (options->EnforceDistinctSubnets) { tor_addr_t node_addr; + tor_addr_port_t node_ap6; node_get_addr(node, &node_addr); + node_get_pref_ipv6_orport(node, &node_ap6); SMARTLIST_FOREACH_BEGIN(all_nodes, const node_t *, node2) { tor_addr_t a; + tor_addr_port_t ap6; node_get_addr(node2, &a); - if (addrs_in_same_network_family(&a, &node_addr)) + node_get_pref_ipv6_orport(node2, &ap6); + if (addrs_in_same_network_family(&a, &node_addr) || + addrs_in_same_network_family(&ap6.addr, &node_ap6.addr)) smartlist_add(sl, (void*)node2); } SMARTLIST_FOREACH_END(node2); }

1 0

[tor/master] Add test for nodes_in_same_family()
by nickm＠torproject.org 31 Oct '18

31 Oct '18

commit e9adc200aab8bf2068dc7d7fb0cf2e2d43149182 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Sep 12 15:50:11 2018 -0400 Add test for nodes_in_same_family() --- src/test/test_address.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/src/test/test_address.c b/src/test/test_address.c index e99220f83..69de072cf 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -24,6 +24,8 @@ #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */ #include "core/or/or.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/node_st.h" #include "feature/nodelist/nodelist.h" #include "lib/net/address.h" #include "test/test.h" @@ -1170,6 +1172,78 @@ test_address_tor_addr_in_same_network_family(void *ignored) return; } +static node_t * +helper_create_mock_node(char id_char) +{ + node_t *node = tor_malloc_zero(sizeof(node_t)); + routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); + tor_addr_make_null(&ri->ipv6_addr, AF_INET6); + node->ri = ri; + memset(node->identity, id_char, sizeof(node->identity)); + return node; +} + +static void +helper_free_mock_node(node_t *node) +{ + tor_free(node->ri); + tor_free(node); +} + +#define NODE_SET_IPV4(node, ipv4_addr, ipv4_port) { \ + tor_addr_t addr; \ + tor_addr_parse(&addr, ipv4_addr); \ + node->ri->addr = tor_addr_to_ipv4h(&addr); \ + node->ri->or_port = ipv4_port; \ + } + +#define NODE_CLEAR_IPV4(node) { \ + node->ri->addr = 0; \ + node->ri->or_port = 0; \ + } + +#define NODE_SET_IPV6(node, ipv6_addr_str, ipv6_port) { \ + tor_addr_parse(&node->ri->ipv6_addr, ipv6_addr_str); \ + node->ri->ipv6_orport = ipv6_port; \ + } + +static void +test_address_tor_node_in_same_network_family(void *ignored) +{ + (void)ignored; + node_t *node_a = helper_create_mock_node('a'); + node_t *node_b = helper_create_mock_node('b'); + + NODE_SET_IPV4(node_a, "8.8.8.8", 1); + NODE_SET_IPV4(node_b, "8.8.4.4", 1); + + tt_int_op(nodes_in_same_family(node_a, node_b), OP_EQ, 1); + + NODE_SET_IPV4(node_a, "8.8.8.8", 1); + NODE_SET_IPV4(node_b, "1.1.1.1", 1); + + tt_int_op(nodes_in_same_family(node_a, node_b), OP_EQ, 0); + + NODE_CLEAR_IPV4(node_a); + NODE_SET_IPV6(node_a, "2001:470:20::2", 1); + + tt_int_op(nodes_in_same_family(node_a, node_b), OP_EQ, 0); + + NODE_CLEAR_IPV4(node_b); + NODE_SET_IPV6(node_b, "2606:4700:4700::1111", 1); + + tt_int_op(nodes_in_same_family(node_a, node_b), OP_EQ, 0); + + NODE_SET_IPV6(node_a, "2606:4700:4700::1001", 1); + tt_int_op(nodes_in_same_family(node_a, node_b), OP_EQ, 1); + + helper_free_mock_node(node_a); + helper_free_mock_node(node_b); + + done: + return; +} + #define ADDRESS_TEST(name, flags) \ { #name, test_address_ ## name, flags, NULL, NULL } @@ -1202,6 +1276,7 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(tor_addr_to_mapped_ipv4h, 0), ADDRESS_TEST(tor_addr_eq_ipv4h, 0), ADDRESS_TEST(tor_addr_in_same_network_family, 0), + ADDRESS_TEST(tor_node_in_same_network_family, 0), END_OF_TESTCASES };

1 0