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

[tor/release-0.2.8] Start changelog for 0.2.8.6
by nickm＠torproject.org 27 Jul '16

27 Jul '16

commit babafdd4fbf1880a03298571094cd38ea2812beb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 26 20:06:21 2016 -0400 Start changelog for 0.2.8.6 --- ChangeLog | 15 +++++++++++++++ changes/bug18397 | 7 ------- changes/bug19660 | 8 -------- changes/bug19682 | 3 --- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index b92830e..ace46c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Changes in version 0.2.8.6 - 2016-07-2? + o Minor bugfixes (compilation): + - Fix a compilation warning in the unit tests on systems where char + is signed. Fixes bug 19682; bugfix on 0.2.8.1-alpha. + + o Minor bugfixes (Linux seccomp2 sandbox): + - Allow more syscalls when running with "Sandbox 1" enabled: + sysinfo, getsockopt(SO_SNDBUF), and setsockopt(SO_SNDBUFFORCE). On + some systems, these are required for Tor to start. Fixes bug + 18397; bugfix on 0.2.5.1-alpha. Patch from Daniel Pinto. + - Allow IPPROTO_UDP datagram sockets when running with "Sandbox 1", + so that get_interface_address6_via_udp_socket_hack() can work. + Fixes bug 19660; bugfix on 0.2.5.1-alpha + + Changes in version 0.2.8.5-rc - 2016-07-07 Tor 0.2.8.5-rc is the second release candidate in the Tor 0.2.8 series. If we find no new bugs or regressions here, the first stable diff --git a/changes/bug18397 b/changes/bug18397 deleted file mode 100644 index 53993da..0000000 --- a/changes/bug18397 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (Linux seccomp2 sandbox): - - Add a few missing syscalls to the seccomp2 sandbox: sysinfo, - getsockopt(SO_SNDBUF), and setsockopt(SO_SNDBUFFORCE). On - some systems, these are required for Tor to start with - "Sandbox 1" enabled. - Fixes bug 18397; bugfix on 0.2.5.1-alpha. Patch from - Daniel Pinto. diff --git a/changes/bug19660 b/changes/bug19660 deleted file mode 100644 index 72d32c8..0000000 --- a/changes/bug19660 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (sandboxing): - - If we did not find a non-private IPaddress by iterating over - interfaces, we would try to get one via - get_interface_address6_via_udp_socket_hack(). This opens a - datagram socket with IPPROTO_UDP. Previously all our datagram - sockets (via libevent) used IPPROTO_IP, so we did not have that - in the sandboxing whitelist. Add (SOCK_DGRAM, IPPROTO_UDP) - sockets to the sandboxing whitelist. Fixes bug 19660. diff --git a/changes/bug19682 b/changes/bug19682 deleted file mode 100644 index c799c41..0000000 --- a/changes/bug19682 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - Fix compilation warning in the unit tests on systems where - char is signed. Fixes bug 19682; bugfix on 0.2.8.1-alpha.

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 26 Jul '16

26 Jul '16

commit 500201a307b96899d5403a07b57ee33ccbe2f257 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 26 23:46:23 2016 +0000 Update translations for abouttor-homepage --- pa/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pa/aboutTor.dtd b/pa/aboutTor.dtd index 55c65ae..08486e3 100644 --- a/pa/aboutTor.dtd +++ b/pa/aboutTor.dtd @@ -44,6 +44,6 @@ <!ENTITY aboutTor.helpInfo5.label "ਦਾਨ ਦਿਓ »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> +<!ENTITY aboutTor.footer.label "ਟੋਰ ਪ੍ਰੋਜੇਕਟ ਇੱਕ ਅਮਰੀਕੀ 501(c)(3) ਗੈਰ-ਮੁਨਾਫਾ ਸੰਸਥਾ ਹੈ ਜੋ ਔਨਲਾਈਨ ਪ੍ਰਾਈਵੇਸੀ ਅਤੇ ਐਨੌਨੀਮਿਟੀ ਦੀ ਸਿੱਖਿਆ, ਖੋਜ, ਅਤੇ ਵਿਕਾਸ ਨੂੰ ਸਮਰਪਿਤ ਹੈ। "> <!ENTITY aboutTor.learnMore.label "ਟੋਰ ਪ੍ਰੋਜੈਕਟ ਬਾਰੇ ਹੋਰ ਜਾਣੋ "> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 26 Jul '16

26 Jul '16

commit 5255d84cc4bb6148acda4a8bff333fe19fc5d256 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 26 23:45:20 2016 +0000 Update translations for torcheck_completed --- pa/torcheck.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 10 deletions(-) diff --git a/pa/torcheck.po b/pa/torcheck.po index 7fe1f42..26e7432 100644 --- a/pa/torcheck.po +++ b/pa/torcheck.po @@ -1,15 +1,17 @@ # TorCheck gettext template -# Copyright (C) 2008-2012 The Tor Project, Inc +# Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# sukhbir <sukhbir.in(a)gmail.com>, 2012 +# A S Alam <apreet.alam(a)gmail.com>, 2014 +# Punjabi Fied <towtruckerwiki(a)gmail.com>, 2016 +# Sukhbir Singh <sukhbir.in(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-11-06 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/torproject/language/pa/)\n" +"PO-Revision-Date: 2016-07-26 23:43+0000\n" +"Last-Translator: Punjabi Fied <towtruckerwiki(a)gmail.com>\n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,8 +19,8 @@ msgstr "" "Language: pa\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -msgid "Congratulations. Your browser is configured to use Tor." -msgstr "ਮੁਬਾਰਕਾਂ. ਤੁਹਾਡਾ ਬ੍ਰਾਉਜ਼ਰ ਟੌਰ ਦੀ ਵਰਤੋਂ ਵਾਸਤੇ ਤਿਆਰ ਹੈ." +msgid "Congratulations. This browser is configured to use Tor." +msgstr "ਵਧਾਈਆਂ। ਇਹ ਬਰਾਊਜ਼ਰ ਟੋਰ ਵਰਤਣ ਲਈ ਸੰਰਚਿਤ ਹੈ।" msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -26,8 +28,8 @@ msgid "" "the Internet anonymously." msgstr "ਕਿਰਪਾ ਕਰ ਕੇ <a href=\"https://www.torproject.org/\">ਟੌਰ ਵੈੱਬਸਾਈਟ </a>ਤੇ ਜਾ ਕੇ ਟੌਰ ਦੀ ਸਹੀ ਵਰਤੋ ਬਾਰੇ ਸਮਝੋ. ਤੁਸੀਂ ਹੁਣ ਗੁਪਤ ਹੋ ਕੇ ਇੰਟਰਨੈੱਟ ਬ੍ਰਾਉਜ਼ ਕਰ ਸਕਦੇ ਹੋ." -msgid "There is a security update available for the Tor Browser Bundle." -msgstr "ਟੌਰ ਬ੍ਰਾਉਜ਼ਰ ਬੰਡਲ ਵਾਸਤੇ ਸਿਕ੍ਯੁਰਿਟੀ ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੇ." +msgid "There is a security update available for Tor Browser." +msgstr "ਟੋਰ ਬਰਾਊਜ਼ਰ ਲਈ ਸੁਰੱਖਿਆ ਅੱਪਡੇਟ ਉਪਲੱਬਧ ਹੈ।" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -53,4 +55,51 @@ msgid "" msgstr "ਅਸੀਂ ਕਿਸੇ ਅਸਥਾਈ ਵਿਘਨ ਕਰ ਕੇ ਨਹੀਂ ਪਤਾ ਕਰ ਸਕਦੇ ਕੇ ਤੁਹਾਡਾ ਮੁੱਢ IP <a href=\"https://www.torproject.org/\">ਟੌਰ ਨੋਡ</a> ਹੈ ਕੇ ਨਹੀਂ." msgid "Your IP address appears to be: " -msgstr "ਤੁਹਾਡਾ IP ਅੱਡ੍ਰੇੱਸ ਹੈ:" +msgstr "ਤੁਹਾਡਾ IP ਸਿਰਨਾਵਾਂ ਜਾਪੇਗਾ:" + +msgid "Are you using Tor?" +msgstr "ਕੀ ਤੁਸੀਂ ਟੋਰ ਵਰਤ ਰਹੇ ਹੋ?" + +msgid "This page is also available in the following languages:" +msgstr "ਇਹ ਸਫ਼ਾ ਹੇਠ ਦਿੱਤੀਆਂ ਭਾਸ਼ਾਵਾਂ ਵਿੱਚ ਵੀ ਉਪਲੱਬਧ ਹੈ:" + +msgid "For more information about this exit relay, see:" +msgstr "ਇਸ ਨਿਕਾਸ ਰੀਲੇਅ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਾਇ ਵੇਖੋ:" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "ਟੋਰ ਪ੍ਰੋਜੇਕਟ ਇੱਕ ਅਮਰੀਕੀ 501(c)(3) ਗੈਰ-ਮੁਨਾਫਾ ਸੰਸਥਾ ਹੈ ਜੋ ਔਨਲਾਈਨ ਪ੍ਰਾਈਵੇਸੀ ਅਤੇ ਐਨੌਨੀਮਿਟੀ ਦੀ ਸਿੱਖਿਆ, ਖੋਜ, ਅਤੇ ਵਿਕਾਸ ਨੂੰ ਸਮਰਪਿਤ ਹੈ। " + +msgid "Learn More »" +msgstr "» ਹੋਰ ਜਾਣੋ" + +msgid "Go" +msgstr "ਜਾਓ" + +msgid "Short User Manual" +msgstr "ਸੰਖੇਪ ਯੂਜ਼ਰ ਦਸਤਾਵੇਜ਼" + +msgid "Donate to Support Tor" +msgstr "ਟੋਰ ਮੱਦਦ ਲਈ ਦਾਨ ਦਿਓ" + +msgid "Tor Q&A Site" +msgstr "ਟੋਰ ਸਵਾਲ-ਜਵਾਬ ਸਾਈਟ" + +msgid "Volunteer" +msgstr "ਵਲੰਟੀਅਰ" + +msgid "JavaScript is enabled." +msgstr "ਜਾਵਾਸਕ੍ਰਿਪਟ ਚਾਲੂ ਹੈ।" + +msgid "JavaScript is disabled." +msgstr "ਜਾਵਾਸਕ੍ਰਿਪਟ ਬੰਦ ਹੈ।" + +msgid "However, it does not appear to be Tor Browser." +msgstr "ਪਰ, ਇਹ ਟੋਰ ਬਰਾਊਜ਼ਰ ਨਹੀਂ ਜਾਪਦਾ ਹੈ।" + +msgid "Run a Relay" +msgstr "ਰੀਲੇਅ ਚਲਾਓ" + +msgid "Stay Anonymous" +msgstr "ਅਗਿਆਤ ਰਹੋ"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 26 Jul '16

26 Jul '16

commit 70f08d34351f0053af4938584edec980d491f64c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 26 23:45:16 2016 +0000 Update translations for torcheck --- pa/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pa/torcheck.po b/pa/torcheck.po index 09e32cf..26e7432 100644 --- a/pa/torcheck.po +++ b/pa/torcheck.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-07-26 09:20+0000\n" +"PO-Revision-Date: 2016-07-26 23:43+0000\n" "Last-Translator: Punjabi Fied <towtruckerwiki(a)gmail.com>\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n" "MIME-Version: 1.0\n" @@ -69,7 +69,7 @@ msgstr "ਇਸ ਨਿਕਾਸ ਰੀਲੇਅ ਬਾਰੇ ਹੋਰ ਜਾਣ msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "" +msgstr "ਟੋਰ ਪ੍ਰੋਜੇਕਟ ਇੱਕ ਅਮਰੀਕੀ 501(c)(3) ਗੈਰ-ਮੁਨਾਫਾ ਸੰਸਥਾ ਹੈ ਜੋ ਔਨਲਾਈਨ ਪ੍ਰਾਈਵੇਸੀ ਅਤੇ ਐਨੌਨੀਮਿਟੀ ਦੀ ਸਿੱਖਿਆ, ਖੋਜ, ਅਤੇ ਵਿਕਾਸ ਨੂੰ ਸਮਰਪਿਤ ਹੈ। " msgid "Learn More »" msgstr "» ਹੋਰ ਜਾਣੋ" @@ -96,7 +96,7 @@ msgid "JavaScript is disabled." msgstr "ਜਾਵਾਸਕ੍ਰਿਪਟ ਬੰਦ ਹੈ।" msgid "However, it does not appear to be Tor Browser." -msgstr "" +msgstr "ਪਰ, ਇਹ ਟੋਰ ਬਰਾਊਜ਼ਰ ਨਹੀਂ ਜਾਪਦਾ ਹੈ।" msgid "Run a Relay" msgstr "ਰੀਲੇਅ ਚਲਾਓ"

1 0

[tor/master] Check that extend_info_from_router is never called on a client
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit 64bf6b70a889ee53978d70a2efc3c2a08a088826 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jul 7 16:10:56 2016 +1000 Check that extend_info_from_router is never called on a client --- changes/bug19639 | 3 +++ src/or/router.c | 8 +++++--- src/or/routerlist.c | 2 +- src/or/routerlist.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes/bug19639 b/changes/bug19639 new file mode 100644 index 0000000..9dc7e62 --- /dev/null +++ b/changes/bug19639 @@ -0,0 +1,3 @@ + o Minor bugfixes (circuits): + - Make sure extend_info_from_router is only called on servers. + Fixes bug 19639; bugfix on 0.2.8.1-alpha. diff --git a/src/or/router.c b/src/or/router.c index a671591..f858fbe 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1284,15 +1284,17 @@ decide_to_advertise_begindir(const or_options_t *options, } /** Allocate and return a new extend_info_t that can be used to build - * a circuit to or through the router r. Use the primary - * address of the router unless for_direct_connect is true, in - * which case the preferred address is used instead. */ + * a circuit to or through the router r. Uses the primary + * address of the router, so should only be called on a server. */ static extend_info_t * extend_info_from_router(const routerinfo_t *r) { tor_addr_port_t ap; tor_assert(r); + /* Make sure we don't need to check address reachability */ + tor_assert_nonfatal(!router_skip_or_reachability(get_options(), 0)); + router_get_prim_orport(r, &ap); return extend_info_new(r->nickname, r->cache_info.identity_digest, r->onion_pkey, r->onion_curve25519_pkey, diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 6ea9d8b..2fe8c3b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1870,7 +1870,7 @@ router_picked_poor_directory_log(const routerstatus_t *rs) /* When iterating through the routerlist, can OR address/port preference * and reachability checks be skipped? */ -static int +int router_skip_or_reachability(const or_options_t *options, int try_ip_pref) { /* Servers always have and prefer IPv4. diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 01f7644..9765ee7 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -58,6 +58,7 @@ const routerstatus_t *router_pick_trusteddirserver(dirinfo_type_t type, int flags); const routerstatus_t *router_pick_fallback_dirserver(dirinfo_type_t type, int flags); +int router_skip_or_reachability(const or_options_t *options, int try_ip_pref); int router_get_my_share_of_directory_requests(double *v3_share_out); void router_reset_status_download_failures(void); int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2);

1 0

[tor/master] Merge branch 'bug19639_squashed'
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit f0488551e7be4e2d21a104903a86be993a240398 Merge: 48d7dfb 64bf6b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 26 19:31:15 2016 -0400 Merge branch 'bug19639_squashed' changes/bug19639 | 3 +++ src/or/router.c | 8 +++++--- src/or/routerlist.c | 2 +- src/or/routerlist.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-)

1 0

[tor/master] Changes file for feature 19116
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit 48d7dfb92fba64dc0b9c26306f509c09a9246187 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jul 27 09:26:31 2016 +1000 Changes file for feature 19116 --- changes/feature19116 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/feature19116 b/changes/feature19116 new file mode 100644 index 0000000..4f6af5f --- /dev/null +++ b/changes/feature19116 @@ -0,0 +1,4 @@ + o Minor features: + - Move the test-network.sh script to chutney, and modify tor's + test-network.sh to call the (newer) chutney version when available. + Resolves ticket 19116. Patch by teor.

1 0

[tor/master] We fixed #15937, update a comment
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit bf2f7c265cd7bc7d8fdfe190177e61b4837c0476 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sun Jul 17 22:37:00 2016 +1000 We fixed #15937, update a comment --- src/test/test-network.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index e7288ec..4d97768 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -69,8 +69,8 @@ do ;; # Make this many connections per client (1) # Note: If you create 7 or more connections to a hidden service from - # a single client, you'll likely get a verification failure due to - # https://trac.torproject.org/projects/tor/ticket/15937 + # a single Tor 0.2.7 client, you'll likely get a verification failure due + # to #15937. This is fixed in 0.2.8. --connections|--connection|--connection-count|--count) export CHUTNEY_CONNECTIONS="$2" shift

1 0

[tor/master] Add a dry run mode to test-network.sh
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit bb4506da6f89c28bb4cf06697fbe9f59d6a3a22b Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sun Jul 17 22:08:31 2016 +1000 Add a dry run mode to test-network.sh --- src/test/test-network.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index b88577d..5dc7f99 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -48,9 +48,19 @@ do --coverage) export USE_COVERAGE_BINARY=true ;; + --dry-run) + # process arguments, but don't call any other scripts + export NETWORK_DRY_RUN=true + ;; *) echo "$myname: Sorry, I don't know what to do with '$1'." - exit 2 + echo "$myname: Maybe chutney's test-network.sh understands '$1'." + echo "$myname: Please update your chutney using 'git pull', and set \ +\$CHUTNEY_PATH" + # continue processing arguments during a dry run + if [ "$NETWORK_DRY_RUN" != true ]; then + exit 2 + fi ;; esac shift @@ -121,6 +131,11 @@ fi export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR +# And finish up if we're doing a dry run +if [ "$NETWORK_DRY_RUN" = true]; then + exit 0 +fi + cd "$CHUTNEY_PATH" ./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2

1 0

[tor/master] Call chutney's test-network.sh when it is available
by nickm＠torproject.org 26 Jul '16

26 Jul '16

commit 64b5140256af015e25933688c2df214c19e61d46 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sun Jul 17 22:15:48 2016 +1000 Call chutney's test-network.sh when it is available Also mark the parts of tor's test-network.sh that can be deleted once everyone has updated to chutney's test-network.sh. --- src/test/test-network.sh | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 5dc7f99..e7288ec 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,10 +1,44 @@ #! /bin/sh +# Please do not modify this script, it has been moved to chutney/tools + ECHO_N="/bin/echo -n" # Output is prefixed with the name of the script myname=$(basename $0) +# We need to find CHUTNEY_PATH, so that we can call the version of this script +# in chutney/tools. And we want to pass any arguments to that script as well. +# So we source this script, which processes its arguments to find CHUTNEY_PATH. + +# Avoid recursively sourcing this script, and don't call the chutney version +# while recursing, either +if [ "$TEST_NETWORK_RECURSING" != true ]; then + # Process the arguments into environmental variables with this script + # to make sure $CHUTNEY_PATH is set + # When we switch to using test-network.sh in chutney/tools, --dry-run + # can be removed, because this script will find chutney, then pass all + # arguments to chutney's test-network.sh + echo "$myname: Parsing command-line arguments to find \$CHUTNEY_PATH" + export TEST_NETWORK_RECURSING=true + . "$0" --dry-run "$@" + + # Call the chutney version of this script, if it exists, and we can find it + if [ -d "$CHUTNEY_PATH" -a -x "$CHUTNEY_PATH/tools/test-network.sh" ]; then + unset NETWORK_DRY_RUN + echo "$myname: Calling newer chutney script \ +$CHUTNEY_PATH/tools/test-network.sh" + "$CHUTNEY_PATH/tools/test-network.sh" "$@" + exit $? + else + echo "$myname: This script has moved to chutney/tools." + echo "$myname: Please update your chutney using 'git pull'." + # When we switch to using test-network.sh in chutney/tools, we should + # exit with a very loud failure here + echo "$myname: Falling back to the old tor version of the script." + fi +fi + until [ -z "$1" ] do case "$1" in @@ -16,6 +50,9 @@ do export TOR_DIR="$2" shift ;; + # When we switch to using test-network.sh in chutney/tools, only the + # --chutney-path and --tor-path arguments need to be processed by this + # script, everything else can be handled by chutney's test-network.sh --flavor|--flavour|--network-flavor|--network-flavour) export NETWORK_FLAVOUR="$2" shift @@ -115,6 +152,9 @@ CHUTNEY_PATH=\`pwd\`/chutney" fi fi +# When we switch to using test-network.sh in chutney/tools, this comment and +# everything below it can be removed + # For picking up the right tor binaries. # If these varibles aren't set, chutney looks for tor binaries in $PATH if [ -d "$TOR_DIR" ]; then @@ -132,8 +172,9 @@ export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR # And finish up if we're doing a dry run -if [ "$NETWORK_DRY_RUN" = true]; then - exit 0 +if [ "$NETWORK_DRY_RUN" = true ]; then + # we can't exit here, it breaks argument processing + return fi cd "$CHUTNEY_PATH"

1 0