March 2012 - tor-commits - lists.torproject.org

[tor/master] Add unit tests for path_is_relative
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 998891e7342155f7c0c5839f4c5816ace686134f Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 22:53:25 2012 +0100 Add unit tests for path_is_relative --- src/test/test_util.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index e2050f8..741b8d5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1503,6 +1503,42 @@ test_util_sscanf(void) ; } +static void +test_util_path_is_relative(void) +{ + /* OS-independent tests */ + test_eq(1, path_is_relative("")); + test_eq(1, path_is_relative("dir")); + test_eq(1, path_is_relative("dir/")); + test_eq(1, path_is_relative("./dir")); + test_eq(1, path_is_relative("../dir")); + + test_eq(0, path_is_relative("/")); + test_eq(0, path_is_relative("/dir")); + test_eq(0, path_is_relative("/dir/")); + + /* Windows */ +#ifdef MS_WINDOWS + /* I don't have Windows so I can't test this, hence the "#ifdef + 0". These are tests that look useful, so please try to get them + running and uncomment if it all works as it should */ +#ifdef 0 + test_eq(1, path_is_relative("dir")); + test_eq(1, path_is_relative("dir\\")); + test_eq(1, path_is_relative("dir\\a:")); + test_eq(1, path_is_relative("dir\\a:\\")); + + test_eq(0, path_is_relative("\\dir")); + test_eq(0, path_is_relative("a:\\dir")); + test_eq(0, path_is_relative("z:\\dir")); + test_eq(0, path_is_relative("http:\\dir")); +#endif +#endif + + done: + ; +} + /** Run unittests for memory pool allocator */ static void test_util_mempool(void) @@ -2855,6 +2891,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(mmap), UTIL_LEGACY(threads), UTIL_LEGACY(sscanf), + UTIL_LEGACY(path_is_relative), UTIL_LEGACY(strtok), UTIL_LEGACY(di_ops), UTIL_TEST(find_str_at_start_of_line, 0),

1 0

[tor/master] Some more corner cases for tor_sscanf
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit dbd170f752b422004835def53f84b786f32c9a08 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 22:53:08 2012 +0100 Some more corner cases for tor_sscanf --- src/test/test_util.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index c63f97d..e2050f8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1379,10 +1379,14 @@ test_util_sscanf(void) char s1[10], s2[10], s3[10], ch; int r; - /* Simple tests (malformed patterns and literal matching) */ + /* Simple tests (malformed patterns, literal matching, ...) */ test_eq(-1, tor_sscanf("123", "%i", &r)); /* %i is not supported */ test_eq(-1, tor_sscanf("wrong", "%5c", s1)); /* %c cannot have a number. */ test_eq(-1, tor_sscanf("hello", "%s", s1)); /* %s needs a number. */ + test_eq(-1, tor_sscanf("prettylongstring", "%999999s", s1)); + test_eq(-1, tor_sscanf("prettylongstring", "%0s", s1)); + test_eq(-1, tor_sscanf("We're the 99 monkeys", "We're the 99%%")); + test_eq(0, tor_sscanf("prettylongstring", "%10s", NULL)); /* No '%'-strings: always "success" */ test_eq(0, tor_sscanf("hello world", "hello world")); test_eq(0, tor_sscanf("hello world", "good bye")); @@ -1477,6 +1481,8 @@ test_util_sscanf(void) test_eq(2, tor_sscanf("76trombones", "%6u%9s", &u1, s1)); /* %u%s */ test_eq(76, u1); test_streq(s1, "trombones"); + test_eq(1, tor_sscanf("prettylongstring", "%999s", s1)); + test_streq(s1, "prettylongstring"); /* %s doesn't eat spaces */ test_eq(2, tor_sscanf("hello world", "%9s %9s", s1, s2)); test_streq(s1, "hello");

1 0

[tor/master] Disable some tor_sscanf tests that gcc says are illegal formats
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit c4bfc7ca0e9ed95e184a6dc8ea1220988e7ca937 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 21:01:19 2012 -0500 Disable some tor_sscanf tests that gcc says are illegal formats --- src/test/test_util.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 5bbf448..0187187 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1384,9 +1384,12 @@ test_util_sscanf(void) test_eq(-1, tor_sscanf("wrong", "%5c", s1)); /* %c cannot have a number. */ test_eq(-1, tor_sscanf("hello", "%s", s1)); /* %s needs a number. */ test_eq(-1, tor_sscanf("prettylongstring", "%999999s", s1)); - test_eq(-1, tor_sscanf("prettylongstring", "%0s", s1)); test_eq(-1, tor_sscanf("We're the 99 monkeys", "We're the 99%%")); +#if 0 + /* GCC thinks these two are illegal. */ + test_eq(-1, tor_sscanf("prettylongstring", "%0s", s1)); test_eq(0, tor_sscanf("prettylongstring", "%10s", NULL)); +#endif /* No '%'-strings: always "success" */ test_eq(0, tor_sscanf("hello world", "hello world")); test_eq(0, tor_sscanf("hello world", "good bye"));

1 0

[tor/master] changes file for extra-tests branch
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 0f7e96038dcc003829c08fb511e274113471de3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 21:10:17 2012 -0500 changes file for extra-tests branch --- changes/extra-tests | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/extra-tests b/changes/extra-tests new file mode 100644 index 0000000..f23a0b5 --- /dev/null +++ b/changes/extra-tests @@ -0,0 +1,2 @@ + o Testing + - A wide variety of new unit tests by Esteban Manchado Velázques.

1 0

r25517: {website} Adding Atlas and Onionoo to the volunteer page (website/trunk/getinvolved/en)
by Damian Johnson 09 Mar '12

09 Mar '12

Author: atagar Date: 2012-03-09 16:20:33 +0000 (Fri, 09 Mar 2012) New Revision: 25517 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding Atlas and Onionoo to the volunteer page Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-03-09 16:00:42 UTC (rev 25516) +++ website/trunk/getinvolved/en/volunteer.wml 2012-03-09 16:20:33 UTC (rev 25517) @@ -222,6 +222,14 @@ </tr> <tr class="alt"> + <td><a href="#project-atlas">Atlas</a></td> + <td>Client Service</td> + <td>JavaScript</td> + <td>Moderate</td> + <td>hellais</td> + </tr> + + <tr> <td><a href="#project-torstatus">TorStatus</a></td> <td>Client Service</td> <td>Python, Django</td> @@ -229,7 +237,7 @@ <td></td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-weather">Weather</a></td> <td>Client Service</td> <td>Python</td> @@ -237,7 +245,7 @@ <td>kaner</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -245,7 +253,7 @@ <td>kaner</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Python, Perl</td> @@ -253,6 +261,14 @@ <td></td> </tr> + <tr> + <td><a href="#project-onionoo">Onionoo</a></td> + <td>Backend Service</td> + <td>Java</td> + <td>Moderate</td> + <td>karsten</td> + </tr> + <tr class="alt"> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> @@ -560,6 +576,16 @@ <i><a href="#metricsSearch">Searchable Tor descriptor and Metrics data archive</a></i> (Python/Django?) </p> + <a id="project-atlas"></a> + <h3><a href="https://atlas.torproject.org/">Atlas</a> (<a + href="https://gitweb.torproject.org/atlas.git">code</a>)</h3> + + <p> + Atlas is a web application to discover Tor relays and bridges. It provides + useful information on how relays are configured along with graphics about + their past usage. This is the third evolution of the TorStatus application. + </p> + <a id="project-torstatus"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/projects/TorStatus">TorStatus</a> (<a href="https://gitweb.torproject.org/torstatus.git">code</a>)</h3> @@ -608,6 +634,15 @@ This has been relatively unchanged for quite a while. </p> + <a id="project-onionoo"></a> + <h3><a href="<page projects/onionoo>">Onionoo</a> (<a + href="https://gitweb.torproject.org/onionoo.git">code</a>)</h3> + + <p> + Onionoo is a JSON based protocol to learn information about currently + running Tor relays and bridges. + </p> + <a id="project-bridgedb"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB">BridgeDB</a> (<a href="https://gitweb.torproject.org/bridgedb.git">code</a>, <a

1 0

r25516: {website} Making Jake the primary mentor for the thunderbird project A (website/trunk/getinvolved/en)
by Damian Johnson 09 Mar '12

09 Mar '12

Author: atagar Date: 2012-03-09 16:00:42 +0000 (Fri, 09 Mar 2012) New Revision: 25516 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Making Jake the primary mentor for the thunderbird project As per his request Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-03-09 14:41:49 UTC (rev 25515) +++ website/trunk/getinvolved/en/volunteer.wml 2012-03-09 16:00:42 UTC (rev 25516) @@ -1288,7 +1288,7 @@ <br> Skill Level: <i>High</i> <br> - Likely Mentors: <i>Mike</i> + Likely Mentors: <i>Jake</i> <p> We're hearing from an increasing number of users that they want to use Thunderbird with Tor. However, there are plenty of application-level

1 0

r25515: {website} make the italian mirror, italian. update the status page. (in website/trunk: . include)
by Andrew Lewman 09 Mar '12

09 Mar '12

Author: phobos Date: 2012-03-09 14:41:49 +0000 (Fri, 09 Mar 2012) New Revision: 25515 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: make the italian mirror, italian. update the status page. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-03-09 01:28:06 UTC (rev 25514) +++ website/trunk/include/mirrors-table.wmi 2012-03-09 14:41:49 UTC (rev 25515) @@ -1,32 +1,32 @@ <tr> - <td>NL</td> + <td>IS</td> - <td>torproject.nl</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.nl/dist/">http</a></td> - <td><a href="http://www.torproject.nl/">http</a></td> - <td><a href="https://www.torproject.nl/dist/">https</a></td> - <td><a href="https://www.torproject.nl/">https</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>IT</td> - <td>CCC</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://torproject.jcsh.it/dist/">http</a></td> + <td><a href="http://torproject.jcsh.it/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,15 +35,15 @@ <tr> - <td>IS</td> + <td>AT</td> - <td>torproject.is</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://torproject.ph3x.at/dist/">http</a></td> + <td><a href="http://torproject.ph3x.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,15 +52,15 @@ <tr> - <td>EU</td> + <td>AT</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.jcsh.it/dist/">http</a></td> - <td><a href="http://torproject.jcsh.it/">http</a></td> + <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> + <td><a href="http://tor.dont-know-me.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -69,15 +69,15 @@ <tr> - <td>AT</td> + <td>EU</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.ph3x.at/dist/">http</a></td> - <td><a href="http://torproject.ph3x.at/">http</a></td> + <td><a href="http://tor.unregistered.eu/dist/">http</a></td> + <td><a href="http://tor.unregistered.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -88,64 +88,64 @@ <td>US</td> - <td>BarkerJr</td> + <td>searchprivate</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://tor.searchprivate.com/dist/">http</a></td> + <td><a href="http://tor.searchprivate.com/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>AT</td> + <td>DE</td> - <td></td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> - <td><a href="http://tor.dont-know-me.at/">http</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> - <td>IS</td> + <td>US</td> - <td>myRL.net</td> + <td>NW Linux</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.myrl.net/dist/">http</a></td> - <td><a href="http://tor.myrl.net/">http</a></td> - <td><a href="https://tor.myrl.net/dist/">https</a></td> - <td><a href="https://tor.myrl.net/">https</a></td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> - <td>US</td> + <td>DE</td> - <td>hessmo</td> + <td>borgmann.tv</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td><a href="http://tor.borgmann.tv/dist/">http</a></td> + <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -154,15 +154,15 @@ <tr> - <td>EU</td> + <td>IL</td> - <td></td> + <td>Host4site</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.unregistered.eu/dist/">http</a></td> - <td><a href="http://tor.unregistered.eu/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -171,32 +171,32 @@ <tr> - <td>FR</td> + <td>GB</td> - <td>BarkerJr</td> + <td>torland</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> + <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> + <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>AT</td> + <td>IS</td> - <td>cyberarmy</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist/">http</a></td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -205,15 +205,15 @@ <tr> - <td>US</td> + <td>INT</td> - <td>searchprivate</td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist/">http</a></td> - <td><a href="http://tor.searchprivate.com/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -222,49 +222,49 @@ <tr> - <td>DE</td> + <td>NL</td> - <td></td> + <td>torproject.nl</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></td> + <td><a href="http://www.torproject.nl/dist/">http</a></td> + <td><a href="http://www.torproject.nl/">http</a></td> + <td><a href="https://www.torproject.nl/dist/">https</a></td> + <td><a href="https://www.torproject.nl/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>factor.cc</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>EE</td> - <td>chaos darmstadt</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -273,66 +273,66 @@ <tr> - <td>HU</td> + <td>US</td> - <td>Unknown</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.tor.hu/dist/">http</a></td> - <td><a href="http://mirror.tor.hu/">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> - <td>DE</td> + <td>IS</td> - <td>beme it</td> + <td>myRL.net</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="http://tor.myrl.net/dist/">http</a></td> + <td><a href="http://tor.myrl.net/">http</a></td> + <td><a href="https://tor.myrl.net/dist/">https</a></td> + <td><a href="https://tor.myrl.net/">https</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> + <td> - </td> </tr> <tr> <td>US</td> - <td>NW Linux</td> + <td>hessmo</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>LT</td> - <td>borgmann.tv</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.borgmann.tv/dist/">http</a></td> - <td><a href="http://tor.borgmann.tv/">http</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -341,32 +341,32 @@ <tr> - <td>US</td> + <td>FR</td> - <td>Xpdm</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> + <td><a href="http://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>IL</td> + <td>AT</td> - <td>Host4site</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> + <td><a href="http://tor.cyberarmy.at/dist/">http</a></td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -375,117 +375,117 @@ <tr> - <td>US</td> + <td>DE</td> - <td>AskApache</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>FR</td> + <td>DE</td> - <td>LazyTiger</td> + <td>factor.cc</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> <td>DE</td> - <td>spline</td> + <td>chaos darmstadt</td> <td>Up to date</td> - <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> - <td><a href="http://tor.spline.de/dist/">http</a></td> - <td><a href="http://tor.spline.de/">http</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></td> <td> - </td> - <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>GB</td> + <td>HU</td> - <td>torland</td> + <td>Unknown</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> - <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> + <td><a href="http://mirror.tor.hu/dist/">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>IS</td> + <td>US</td> - <td>TheOnionRouter</td> + <td>Xpdm</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>US</td> - <td>[[:bbs:]]</td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> <td> - </td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>INT</td> + <td>FR</td> - <td>CoralCDN</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -494,66 +494,66 @@ <tr> - <td>IS</td> + <td>DE</td> - <td>crypto.is</td> + <td>spline</td> <td>Up to date</td> + <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> + <td><a href="http://tor.spline.de/dist/">http</a></td> + <td><a href="http://tor.spline.de/">http</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></td> <td> - </td> - <td><a href="https://torproject.crypto.is/dist/">http</a></td> - <td><a href="https://torproject.crypto.is/">http</a></td> - <td><a href="https://torproject.crypto.is/dist/">https</a></td> - <td><a href="https://torproject.crypto.is/">https</a></td> - <td> - </td> - <td> - </td> + <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> </tr> <tr> - <td>NL</td> + <td>DE</td> - <td>Amorphis</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> <td> - </td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>DK</td> + <td>IS</td> - <td>Zentrum der Gesundheit</td> + <td>crypto.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">http</a></td> + <td><a href="https://torproject.crypto.is/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">https</a></td> + <td><a href="https://torproject.crypto.is/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>EE</td> + <td>NL</td> - <td>CyberSIDE</td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -562,15 +562,15 @@ <tr> - <td>LT</td> + <td>DK</td> - <td></td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-03-09 01:28:06 UTC (rev 25514) +++ website/trunk/update-mirrors.pl 2012-03-09 14:41:49 UTC (rev 25515) @@ -878,9 +878,9 @@ mirror056 => { adminContact => "", orgName => "", - isoCC => "EU", + isoCC => "IT", subRegion => "", - region => "EU", + region => "IT", ipv4 => "True", ipv6 => "True", loadBalanced => "No",

1 0

[onionoo/master] Implement caching using Last-Modified/If-Modified-Since headers.
by karsten＠torproject.org 09 Mar '12

09 Mar '12

commit 163ee8c8472ce13e6e1e589d245b102c7d684a67 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 9 13:56:35 2012 +0100 Implement caching using Last-Modified/If-Modified-Since headers. --- src/org/torproject/onionoo/Main.java | 16 ++++++++-------- src/org/torproject/onionoo/ResourceServlet.java | 7 ++++++- web/index.html | 8 +++----- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/org/torproject/onionoo/Main.java b/src/org/torproject/onionoo/Main.java index 8c4497d..20367d2 100644 --- a/src/org/torproject/onionoo/Main.java +++ b/src/org/torproject/onionoo/Main.java @@ -17,14 +17,6 @@ public class Main { cn.setBridgeRunningBits(); cn.writeRelaySearchDataFile(); - printStatus("Updating summary data."); - SummaryDataWriter sdw = new SummaryDataWriter(); - sdw.setLastValidAfterMillis(cn.getLastValidAfterMillis()); - sdw.setLastPublishedMillis(cn.getLastPublishedMillis()); - sdw.setCurrentRelays(cn.getCurrentRelays()); - sdw.setCurrentBridges(cn.getCurrentBridges()); - sdw.writeSummaryDataFile(); - printStatus("Updating detail data."); DetailDataWriter ddw = new DetailDataWriter(); ddw.setCurrentRelays(cn.getCurrentRelays()); @@ -42,6 +34,14 @@ public class Main { bdw.readExtraInfoDescriptors(); bdw.deleteObsoleteBandwidthFiles(); + printStatus("Updating summary data."); + SummaryDataWriter sdw = new SummaryDataWriter(); + sdw.setLastValidAfterMillis(cn.getLastValidAfterMillis()); + sdw.setLastPublishedMillis(cn.getLastPublishedMillis()); + sdw.setCurrentRelays(cn.getCurrentRelays()); + sdw.setCurrentBridges(cn.getCurrentBridges()); + sdw.writeSummaryDataFile(); + printStatus("Terminating."); } diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 016c9ef..b28eca1 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -26,7 +26,7 @@ public class ResourceServlet extends HttpServlet { this.readSummaryFile(); } - long summaryFileLastModified = 0L; + long summaryFileLastModified = -1L; boolean readSummaryFile = false; private String relaysPublishedLine = null, bridgesPublishedLine = null; private List<String> relayLines = new ArrayList<String>(), @@ -69,6 +69,11 @@ public class ResourceServlet extends HttpServlet { this.readSummaryFile = true; } + public long getLastModified(HttpServletRequest request) { + this.readSummaryFile(); + return this.summaryFileLastModified; + } + public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { diff --git a/web/index.html b/web/index.html index 27bb094..ff781f6 100755 --- a/web/index.html +++ b/web/index.html @@ -16,11 +16,9 @@ responds with JSON-formatted replies.</p> gzip"</i> header in their requests and handle gzip-compressed responses. Only requests starting at a certain size will be compressed by the server.</li> -<li><b>Caching:</b> Clients should cache all responses for up to five -minutes. -A better caching strategy may be employed in the future that will be based -on the server's information when new data is expected to be -available.</li> +<li><b>Caching:</b> Clients should make use of the <i>"Last-Modified"</i> +header of responses and include that timestamp in a +<i>"If-Modified-Since"</i> header of subsequent requests.</li> <li><b>Protocol changes:</b> There are plenty of reasons why we may have to change the protocol described here. Clients should be able to handle all valid JSON responses, ignoring

1 0

[onionoo/master] Exclude votes from rsync.
by karsten＠torproject.org 09 Mar '12

09 Mar '12

commit 1f92229bc389baae5b29981e866449eec5704abc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 9 12:09:08 2012 +0100 Exclude votes from rsync. --- bin/update.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bin/update.sh b/bin/update.sh index 8b11d2d..3fd815c 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -1,4 +1,4 @@ #!/bin/bash -rsync -arz --delete metrics.torproject.org::metrics-recent in +rsync -arz --delete --exclude 'relay-descriptors/votes' metrics.torproject.org::metrics-recent in ant run >> log

1 0

[onionoo/master] Fix copy-paste bug leading to missing as_name fields.
by karsten＠torproject.org 09 Mar '12

09 Mar '12

commit 85d4085cea2c9629a1ef13abca2fbde8d18ec647 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 9 11:56:24 2012 +0100 Fix copy-paste bug leading to missing as_name fields. --- src/org/torproject/onionoo/DetailDataWriter.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index 35b6484..a65ef36 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -358,7 +358,7 @@ public class DetailDataWriter { sb.append(",\n\"as_number\":\"" + StringEscapeUtils.escapeJavaScript(aSNumber) + "\""); } - if (cityName != null) { + if (aSName != null) { sb.append(",\n\"as_name\":\"" + StringEscapeUtils.escapeJavaScript(aSName) + "\""); }

1 0