- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Fix a compile warning when using clang
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 30b3f0cdb148f85330e2c93ebb1c00f3cfc8655a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Mar 9 16:39:04 2011 +0100 Fix a compile warning when using clang Issue noticed by Steven Murdoch; fixes bug 2689. The cast didn't do anything, and we don't need to look at the return value of the function here. --- src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index af91099..51306b3 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -412,7 +412,7 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) tor_assert(rend_query); /* Determine responsible dirs. Even if we can't get all we want, * work with the ones we have. If it's empty, we'll notice below. */ - (int) hid_serv_get_responsible_directories(responsible_dirs, desc_id); + hid_serv_get_responsible_directories(responsible_dirs, desc_id); base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_id, DIGEST_LEN);

1 0

[tor/maint-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 5938804d17f6b458fcec9d479cd734d2e0256631 Merge: 98abe14 30b3f0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 15:14:12 2011 -0400 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.1] Fix a compile warning when using clang
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 30b3f0cdb148f85330e2c93ebb1c00f3cfc8655a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Mar 9 16:39:04 2011 +0100 Fix a compile warning when using clang Issue noticed by Steven Murdoch; fixes bug 2689. The cast didn't do anything, and we don't need to look at the return value of the function here. --- src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index af91099..51306b3 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -412,7 +412,7 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) tor_assert(rend_query); /* Determine responsible dirs. Even if we can't get all we want, * work with the ones we have. If it's empty, we'll notice below. */ - (int) hid_serv_get_responsible_directories(responsible_dirs, desc_id); + hid_serv_get_responsible_directories(responsible_dirs, desc_id); base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_id, DIGEST_LEN);

1 0

[tor/master] Log the source of a rejected POSTed v3 vote
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 3af59dcaee4e5ef147dc263dc9f5bf0e5cc72aad Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Mar 15 09:13:25 2011 -0700 Log the source of a rejected POSTed v3 vote Related to ticket 2683. --- changes/bug2683a | 3 +++ src/or/directory.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug2683a b/changes/bug2683a new file mode 100644 index 0000000..2fe308b --- /dev/null +++ b/changes/bug2683a @@ -0,0 +1,3 @@ + o Minor features + - Log the source of a rejected POSTed v3 networkstatus vote. + diff --git a/src/or/directory.c b/src/or/directory.c index f8d587f..00de1f2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3259,6 +3259,8 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, write_http_status_line(conn, status, "Vote stored"); } else { tor_assert(msg); + log_warn(LD_DIRSERV, "Rejected vote from %s (\"%s\").", + conn->_base.address, msg); write_http_status_line(conn, status, msg); } goto done;

1 0

[tor/master] Fix a log message typo
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 98abe1420d21cf67931229fb776117927c7ab1d6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Mar 15 09:48:26 2011 -0700 Fix a log message typo --- changes/log-typo-2011-03-15-01 | 3 +++ src/or/routerparse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/log-typo-2011-03-15-01 b/changes/log-typo-2011-03-15-01 new file mode 100644 index 0000000..3830df3 --- /dev/null +++ b/changes/log-typo-2011-03-15-01 @@ -0,0 +1,3 @@ + o Minor bugfixes + - Fix a minor typo in a log message. Bugfix on 0.2.2.6-alpha. + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 28ce97e..e0605dc 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2822,7 +2822,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, ns->flavor = flav = flavor; } if (flav != FLAV_NS && ns_type != NS_TYPE_CONSENSUS) { - log_warn(LD_DIR, "Flavor found on non-consenus networkstatus."); + log_warn(LD_DIR, "Flavor found on non-consensus networkstatus."); goto err; }

1 0

[tor/master] Merge remote branch 'origin/maint-0.2.2'
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 84f27eb051e0a770b16babd3c12198e16bd8537e Merge: f038b45 98abe14 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 14:50:42 2011 -0400 Merge remote branch 'origin/maint-0.2.2' changes/bug2683a | 3 +++ changes/log-typo-2011-03-15-01 | 3 +++ src/or/directory.c | 2 ++ src/or/routerparse.c | 2 +- 4 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Log the source of a rejected POSTed v3 vote
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 3af59dcaee4e5ef147dc263dc9f5bf0e5cc72aad Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Mar 15 09:13:25 2011 -0700 Log the source of a rejected POSTed v3 vote Related to ticket 2683. --- changes/bug2683a | 3 +++ src/or/directory.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug2683a b/changes/bug2683a new file mode 100644 index 0000000..2fe308b --- /dev/null +++ b/changes/bug2683a @@ -0,0 +1,3 @@ + o Minor features + - Log the source of a rejected POSTed v3 networkstatus vote. + diff --git a/src/or/directory.c b/src/or/directory.c index f8d587f..00de1f2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3259,6 +3259,8 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, write_http_status_line(conn, status, "Vote stored"); } else { tor_assert(msg); + log_warn(LD_DIRSERV, "Rejected vote from %s (\"%s\").", + conn->_base.address, msg); write_http_status_line(conn, status, msg); } goto done;

1 0

[tor/maint-0.2.2] Fix a log message typo
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 98abe1420d21cf67931229fb776117927c7ab1d6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Mar 15 09:48:26 2011 -0700 Fix a log message typo --- changes/log-typo-2011-03-15-01 | 3 +++ src/or/routerparse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/log-typo-2011-03-15-01 b/changes/log-typo-2011-03-15-01 new file mode 100644 index 0000000..3830df3 --- /dev/null +++ b/changes/log-typo-2011-03-15-01 @@ -0,0 +1,3 @@ + o Minor bugfixes + - Fix a minor typo in a log message. Bugfix on 0.2.2.6-alpha. + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 28ce97e..e0605dc 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2822,7 +2822,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, ns->flavor = flav = flavor; } if (flav != FLAV_NS && ns_type != NS_TYPE_CONSENSUS) { - log_warn(LD_DIR, "Flavor found on non-consenus networkstatus."); + log_warn(LD_DIR, "Flavor found on non-consensus networkstatus."); goto err; }

1 0

[metrics-tasks/master] Check in Thematic Mapping API prototype.
by karsten＠torproject.org 16 Mar '11

16 Mar '11

commit b76dd60885767c8246b732861f41af5489680d04 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 15 16:43:22 2011 +0100 Check in Thematic Mapping API prototype. --- task-2762/README | 19 ++ task-2762/css/stylesheet-ltr.css | 522 ++++++++++++++++++++++++++++++++++++++ task-2762/images/favicon.ico | Bin 0 -> 1150 bytes task-2762/images/top-left.png | Bin 0 -> 11137 bytes task-2762/images/top-middle.png | Bin 0 -> 240 bytes task-2762/images/top-right.png | Bin 0 -> 607 bytes task-2762/index.html | 93 +++++++ 7 files changed, 634 insertions(+), 0 deletions(-) diff --git a/task-2762/README b/task-2762/README new file mode 100644 index 0000000..fccd988 --- /dev/null +++ b/task-2762/README @@ -0,0 +1,19 @@ +Thematic Mapping API prototype for Tor metrics data +--------------------------------------------------- + + - Download the Thematic Mapping API JavaScript code from + http://thematicmapping.org/ and place it in this directory. In + particular, you'll need tmapi-0.1.js and worldborders.js. + + - Create your own Google Spreadsheet and replace the link + "https://spreadsheets.google.com/tq?key=0AujpbDQoBXkX..." in index.html + with a link to your spreadsheet. Feel free to use the existing link, + but note that you cannot change the data in it. + + - Register your domain at Google for using the Google Earth Plug-In on + your website. If you don't, the plugin won't load on your website, but + it will tell you where to register. + + - Make your website available via thttpd, Apache, or the web server of + your choice. + diff --git a/task-2762/css/stylesheet-ltr.css b/task-2762/css/stylesheet-ltr.css new file mode 100644 index 0000000..20a6b7f --- /dev/null +++ b/task-2762/css/stylesheet-ltr.css @@ -0,0 +1,522 @@ +body { + background-color: white; + margin-top: 0px; + font-family: Arial, Helvetica, sans-serif; + font-size: 1em; + font-style: normal; + color: #000000; + padding-top: 0px; +} + +/* images */ + +img { + border: 0; +} + + +li { + margin: .2em .2em .2em 1em; +} + +/* this centers the page */ + +.center { + text-align: center; + background-color: white; + margin: 0px auto 0 auto; + width: 85%; +} + +.center table { + margin-left: auto; + margin-right: auto; + text-align: left; +} + +/* for the shadow box */ + +table.shadowbox { + width: 788px; + border-collapse: collapse; + padding: 0; + margin-bottom: 2em; +} + +table.shadowbox td { + margin: 0; + padding: 0; +} + +/* spacer */ + +td.spacer { + width: 110px; +} + +div.banner { + text-align: center; + height: 79px; + margin-bottom: 10px; + width:100%; +} + +table.table-banner { + margin: 0 auto 0 auto; + background-image: url("images/tor_mast.gif"); + background-repeat: no-repeat; +} + +div.bottom { + font-size: 0.8em; + margin-top: 0.5cm; + margin-left: 1em; + margin-right: 1em; + text-align: center; +} + +/* the sidebars */ + +div.sidebar { + -moz-border-radius: 5px; + -khtml-border-radius: 5px; + background-color: #e5e5e5; + float: right; + margin: 0 0 10px 10px; + /* border: 2px solid #666; */ + padding: 10px; + width: 150px; + text-align: center; +} + +div.sidebar-left { + -moz-border-radius: 5px; + -khtml-border-radius: 5px; + background-color: #e5e5e5; + float: right; + margin: 0 0 5px 5px; + /* border: 2px solid #666; */ + padding: 5px; + width: 275px; + text-align: left; +} + +/* The main column (left text) */ + +div.main-column { + padding: 15px 0 10px 10px; + text-indent: 0pt; + font-size: 1em; + direction: ltr; + text-align: left; +} + +/* formatting styles */ + +h1 { + font-size: 1.6em; + margin-bottom: 0.5em; +} + +h2 { + font-size: 1.4em; + margin-bottom: 0em; + font-weight: bold; + margin-top: 0; +} + +h3 { + font-size: 1.2em; + margin-bottom: 0em; + font-weight: bold; + margin-top: 0; +} + +h4 { + font-size: 1.1em; + margin-bottom: 0em; + font-weight: bold; + margin-top: 0; +} + +h5 { + font-size: 1.0em; + margin-bottom: 0em; + font-weight: bold; + margin-top: 0; +} + +p { + margin-top: 0; + margin-bottom: 1em; +} + +a:link { + color: blue; + font-size: 1em; +} + +a:visited { + color: purple; + font-size: 1em; +} + +a.anchor:link { + font-size: 1em; + color: black; + font-weight: bold; + text-decoration: none; +} + +a.anchor:visited { + font-size: 1em; + color: black; + font-weight: bold; + text-decoration: none; +} + +a.anchor { + font-size: 1em; + color: black; + font-weight: bold; + text-decoration: none; +} + +td { + vertical-align: top; +} + +a.smalllink { + font-size: 0.8em; +} + +/* the banner */ + +table.banner { + width: 100%; + height: 79px; + margin-left: auto; + margin-right: auto; +} + +td.banner-left { + /* This is done with an <img> in the HTML so it can be clickable + background-image: url("/images/top-left.png"); + background-repeat: no-repeat; */ + width: 193px; +} + +td.banner-middle { + background-color: #00802B; + background-image: url("/images/top-middle.png"); + background-repeat: repeat-x; + vertical-align: bottom; + padding-bottom: 10px; + color: white; + font-weight: bold; + font-size: 1.2em; +} + +td.banner-middle a, td.banner-middle a:visited { + margin-right: 5px; + color: white; + font-weight: bold; + font-size: 1em; +} + +td.banner-middle a:hover { + color: #FF7F00; + font-weight: bold; + font-size: 1em; +} + +td.banner-right { + background-image: url("/images/top-right.png"); + background-repeat: no-repeat; + width: 15px; + background-position: right; + padding-top: 8px; +} + +.banner-middle a.current { + text-decoration: none; + color: #FF7F00; + font-weight: bold; + font-size: 1em; + width: auto; + left: -50px; +} + +.donatebutton { + width: auto; + text-align: center; +} + +.donatebutton a { + -moz-border-radius: 5px; + -khtml-border-radius: 5px; + margin: 10px 0 0 0; + font-weight: bold; + display: block; + padding: 6px; + background-color: #00802B; + border-top: 1px solid #00A838; + border-left: 1px solid #00A838; + border-bottom: 1px solid #00591E; + border-right: 1px solid #00591E; + color: #FFFFFF; +} + +.donatebutton a:hover { + color: orange; +} + +.donatebutton a:active { + color: orange; +} + +.downloadbutton { + width: auto; + text-align: center; +} + +.downloadbutton a { + -moz-border-radius: 5px; + -khtml-border-radius: 5px; + margin: 10px 0 0 0; + font-weight: bold; + display: block; + padding: 6px; + background-color: orange; + color: #FFFFFF; +} + +.downloadbutton a:hover { + color: green; +} + +.donatebutton a:active { + color: green; +} + +/* these styles are for the menu on the gui contest pages */ + +.guileft { + width: 25%; + float: left; + padding: 0; + margin: 0; +} + +.guimenu { + border: 1px solid #AAA6AB; + background-color: #E2DFE3; + margin: 0 15px 15px 0; + padding: 0; +} + +.guimenuinner a { + display: block; + text-decoration: none; + padding: 2px 0px 0px 12px; + margin: 0 0 0 0px; + color: #333333; +} + +.guimenuinner a:visited { + color: #333333; +} + +.guimenuinner a:hover { + background-image: url(gui/img/arrow.png); + background-repeat: no-repeat; + background-position: left; + color: #EF8012; +} + +.guimenuinner a.on { + background-image: url(gui/img/arrow.png); + background-repeat: no-repeat; + background-position: left; + color: #EF8012; +} + + +.guimenu h1 { + width: 85%; + font-size: 16px; + margin: 0 0 8px 0; + padding: 0; + border-bottom: 1px solid #AAA6AB; +} + +.curveleft { + background-image: url(gui/img/corner-topleft.png); + background-repeat: no-repeat; + background-position: top left; + margin: -1px; +} + +.curveright { + background-image: url(gui/img/corner-topright.png); + background-repeat: no-repeat; + background-position: top right; +} + +.guimenuinner { + + padding: 0 10px 0 10px; +} + + +.curvebottomleft { + background-image: url(gui/img/corner-bottomleft.png); + background-repeat: no-repeat; + background-position: bottom left; + margin: -1px; +} + +.curvebottomright { + background-image: url(gui/img/corner-bottomright.png); + background-repeat: no-repeat; + background-position: bottom right; +} + +table.mirrors { + margin: 0 auto; + border-width: 3px; + border-color: gray; + border-style: ridge; + border-collapse: collapse; +} +table.mirrors th { + border: 1px solid gray; + background-color: #DDDDDD; +} +table.mirrors td { + border: 1px solid gray; + padding: 4px; +} + +acronym { + border-bottom: none; +} + +dt { + font-weight: bolder; + font-style: italic; +} + +.nb { + -moz-border-radius: 5px; + -khtml-border-radius: 5px; + background-color:#EEEEFF; + border:1px solid #000000; + color:black; + font-size:10pt; + font-weight:bold; + margin:10px 0; + padding:15px 20px; + text-align:justify; +} + +.warning { + -moz-border-radius: 5px; + -khtml-border-radius: 5px; + background-color:#FFFFFF; + background-image:url(images/distros/warning.png); + background-position:15px center; + background-repeat:no-repeat; + border:2px solid #FF0000; + color:#1A1A1A; + font-size:10pt; + font-weight:bold; + margin:10px 0; + padding:15px 20px 15px 67px; + text-align:justify; +} + +hr { + background-color:#002200; + color:#666666; + font-size:1px; + height:1px; + line-height:0; + margin:15px 0 5px; +} + +.underline { + border-bottom:1px solid #000022; + margin:10px 0 20px; + padding:5px 0; +} + +div#graphmenu { + float:left; + margin-top:20px; + width:100%; + padding:5px; +} + +#graphmenu div.formrow { + clear:both; +} + +#graphmenu .formrow p { + float:left; +} + +#graphmenu .formrow label { + float:left; + width:100px; + margin:0px 5px 0px 0px; + text-align:right; +} + +#graphmenu .formrow label.graphname { + float:left; + width:100px; + margin:0px; + text-align:right; +} + +#graphmenu .formrow label.startend { + width:50px; + margin:0px 10px 0px 0px; + text-align:right; +} + +#graphmenu .formrow input { + float:left;width:100px; +} + +#graphmenu .formrow input.submit { + width:100px; + margin:0px 0px 0px 10px; +} + +#graphmenu .break { + clear:both; +} + +#graphmenu .note { + float:left; + font-size:.8em; + font-style:italic; +} + +#graphmenu div#torperfopts { + float:left; +} + +#graphmenu div#gettoropts { + float:left; +} + +#graphmenu div#regularopts { + float:left; +} + +.error { + color:red; +} diff --git a/task-2762/images/favicon.ico b/task-2762/images/favicon.ico new file mode 100644 index 0000000..48060b1 Binary files /dev/null and b/task-2762/images/favicon.ico differ diff --git a/task-2762/images/top-left.png b/task-2762/images/top-left.png new file mode 100644 index 0000000..9927355 Binary files /dev/null and b/task-2762/images/top-left.png differ diff --git a/task-2762/images/top-middle.png b/task-2762/images/top-middle.png new file mode 100644 index 0000000..1035dc5 Binary files /dev/null and b/task-2762/images/top-middle.png differ diff --git a/task-2762/images/top-right.png b/task-2762/images/top-right.png new file mode 100644 index 0000000..54623ef Binary files /dev/null and b/task-2762/images/top-right.png differ diff --git a/task-2762/index.html b/task-2762/index.html new file mode 100644 index 0000000..014abf2 --- /dev/null +++ b/task-2762/index.html @@ -0,0 +1,93 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html> +<head> + <title>Tor Daily Users Thematic Mapping API Prototype</title> + <script src="http://www.google.com/jsapi?key=ABQIAAAAgej9iuh3YJNjEPuctrZMehRNZJOGGZ5AJFY…"></script> + <script src="tmapi-0.1.js"></script> + <script src="worldborders.js"></script> + <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> + <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body onload="init()"> + <div class="center"> + <table class="banner" border="0" cellpadding="0" cellspacing="0" summary=""> + +<tr> + <td class="banner-left"> + <img src="/images/top-left.png" width="193" height="79"> + </td> + <td class="banner-middle"></td> + <td class="banner-right"></td> +</tr> +</table> + + <div class="main-column"> + <h2>Tor Daily Users Thematic Mapping API Prototype</h2> + <br> + + <p>This website is a prototype of the + <a href="http://thematicmapping.org/">Thematic Mapping API</a> + to display daily Tor users.</p> + + <div id='map_container' style='height: 800px; width: 800px;'> + <div id='map' style='height: 100%;'></div> + </div> + <script type="text/javascript"> + google.load("visualization", "1"); + google.load("earth", "1"); + + var earth = null; + + function init() { + google.earth.createInstance("map", initCallback, failureCallback); + } + + function initCallback(object) { + earth = object; + earth.getWindow().setVisibility(true); + + // Load statistics from Google Spreadsheet. + var query = new google.visualization.Query('https://spreadsheets.google.com/tq?key=0AujpbDQoBXkXdHdrUHhDZTE4cTllWUwtTjd…'); + // Send the query with a callback function. + query.send(handleQueryResponse); + + // Called when the query response is returned. + function handleQueryResponse(response) { + + var data = response.getDataTable(); + + var map = new TME.Map.Kml.GoogleViz(); + + var options = { + type: 'prism', + title: 'Daily Tor users on March 9, 2011', + maxHeight: 2000000, + colorType: 'scale', + classification: 'equal', + geometry: worldBorders + }; + + var kml = map.draw(data, options); + + var kmlObject = earth.parseKml(kml); + earth.getFeatures().appendChild(kmlObject); + + var lookAt = earth.getView().copyAsLookAt(earth.ALTITUDE_RELATIVE_TO_GROUND); + lookAt.setLatitude(35); + lookAt.setLongitude(-25); + lookAt.setRange(12000000); + earth.getView().setAbstractView(lookAt); + } + } + + function failureCallback(object) { + } + + </script> + + </div> + </div> +</body> +</html> +

1 0

[metrics-tasks/master] Add an example analysis and fix a minor bug.
by karsten＠torproject.org 16 Mar '11

16 Mar '11

commit 22700d31144c1b8f5c3cc954634f4db9ceffec30 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 15 14:49:20 2011 +0100 Add an example analysis and fix a minor bug. --- task-2680/ProcessSanitizedBridges.java | 2 +- task-2680/README | 138 +++++++++++++++++++++++++++----- task-2680/analysis.R | 50 ++++++++++++ 3 files changed, 169 insertions(+), 21 deletions(-) diff --git a/task-2680/ProcessSanitizedBridges.java b/task-2680/ProcessSanitizedBridges.java index 1f0e00e..c3ab6c8 100644 --- a/task-2680/ProcessSanitizedBridges.java +++ b/task-2680/ProcessSanitizedBridges.java @@ -84,7 +84,7 @@ public class ProcessSanitizedBridges { String fingerprint = Hex.encodeHexString(Base64.decodeBase64( parts[2] + "=")); String descriptor = Hex.encodeHexString(Base64.decodeBase64( - parts[2] + "=")); + parts[3] + "=")); String published = parts[4] + " " + parts[5]; String address = parts[6]; String orPort = parts[7]; diff --git a/task-2680/README b/task-2680/README index 65d8b85..69aec70 100644 --- a/task-2680/README +++ b/task-2680/README @@ -1,3 +1,22 @@ +Presenting bridge usage data so that researchers can focus on the math +====================================================================== + + "Right now the process of learning how to parse bridge consensus files, + bridge descriptor files, match up which descriptors go with which + consensus line, which bridges were Running when, etc is too + burdensome -- researchers who want to analyze bridge reachability are + giving up before they even get to the part they tried to sign up for." + (from arma's description of this ticket in Trac) + +This ticket contains the code to process the data tarballs from the +metrics website and convert them to a format that is more useful for +researchers. This README also contains instructions for working with the +new data formats. + + +1 Processing data tarballs from metrics.tpo +-------------------------------------------- + This ticket contains Java and R code to a) process bridge and relay data to convert them to a format that is more @@ -6,13 +25,9 @@ This ticket contains Java and R code to This README has a separate section for each Java or R code snippet. -The Java applications produce four output formats containing bridge -descriptors, bridge status lines, bridge pool assignments, and hashed -relay identities. The data formats are described below. - --------------------------------------------------------------------------- -ProcessSanitizedBridges.java +1.1 ProcessSanitizedBridges.java +--------------------------------- - Download sanitized bridge descriptors from the metrics website, e.g., https://metrics.torproject.org/data/bridge-descriptors-2011-01.tar.bz2, @@ -31,9 +46,9 @@ ProcessSanitizedBridges.java - Once the Java application is done, you'll find the two files statuses.csv and descriptors.csv in this directory. --------------------------------------------------------------------------- -ProcessSanitizedAssignments.java +1.2 ProcessSanitizedAssignments.java +------------------------------------- - Download sanitized bridge pool assignments from the metrics website, e.g., https://metrics.torproject.org/data/bridge-pool-assignments-2011-01.tar.bz2 @@ -48,9 +63,9 @@ ProcessSanitizedAssignments.java - Once the Java application is done, you'll find a file assignments.csv in this directory. --------------------------------------------------------------------------- -ProcessRelayConsensuses.java +1.3 ProcessRelayConsensuses.java +--------------------------------- - Download v3 relay consensuses from the metrics website, e.g., https://metrics.torproject.org/data/consensuses-2011-01.tar.bz2, and @@ -69,16 +84,24 @@ ProcessRelayConsensuses.java - Once the Java application is done, you'll find a file relays.csv in this directory. --------------------------------------------------------------------------- -verify.R +1.4 verify.R +------------- - Run the R verification script like this: $ R --slave -f verify.R --------------------------------------------------------------------------- -descriptors.csv +2 New data formats +------------------- + +The Java applications produce four output formats containing bridge +descriptors, bridge status lines, bridge pool assignments, and hashed +relay identities. The data formats are described below. + + +2.1 descriptors.csv +-------------------- The descriptors.csv file contains one line for each bridge descriptor that a bridge has published. This descriptor consists of fields coming from @@ -115,9 +138,9 @@ Bridges running early 0.2.2.x versions published faulty stats and are therefore removed from descriptors.csv. Bridges running 0.2.2.x or higher (except the faulty 0.2.2.x versions) collect stats in 24-hour intervals. --------------------------------------------------------------------------- -statuses.csv +2.2 statuses.csv +----------------- The statuses.csv file contains one line for every bridge that is referenced in a bridge network status. Note that if a bridge is running @@ -145,9 +168,16 @@ The columns in statuses.csv are: - valid: TRUE if bridge has the Valid flag, FALSE otherwise - v2dir: TRUE if bridge has the V2Dir flag, FALSE otherwise --------------------------------------------------------------------------- +Note that there is no tight relation between statuses.csv and +descriptors.csv when it comes to bridge usage statistics (even though +one can link them via the bridge's server descriptor identifier). A +bridge is free to write anything in its extra-info descriptor, including a +few days old bridge statistics. That is in no way related to the bridge +authority thinking that a bridge is running at a later time. + -assignments.csv +2.3 assignments.csv +-------------------- The assignments.csv file contains one line for every running bridge and the rings, subrings, and buckets that BridgeDB assigned it to. @@ -162,9 +192,9 @@ The columns in assignments.csv are: - flag: Flag subring - bucket: File bucket, only for distributor "unallocated" --------------------------------------------------------------------------- -relays.csv +2.4 relays.csv +--------------- The relays.csv file contains SHA-1 hashes of identity fingerprints of normal relays. If a bridge uses the same identity key that it also used @@ -177,3 +207,71 @@ The columns in relays.csv are: - consensus: ISO-formatted consensus publication time - fingerprint: Hex-formatted SHA-1 hash of identity fingerprint + +3 Working with the new data formats +------------------------------------ + +The new data formats are plain CSV files that can be processed by many +statistics tools, including R. For some analyses it may be sufficient to +evaluate a single CSV file and be done. But most analyses would require +combining two or more of the CSV files. + +See analysis.R for an example analysis. Run it like this: + + $ R --slave -f analysis.R + +Below is the output in case you don't have R installed but want to know +what kind of results to expect: + +Reading descriptors.csv. +Read 97394 rows from descriptors.csv. +28429 of these rows have bridge stats. +Here are the first 10 rows, sorted by fingerprint and bridge stats +interval end, and only displaying German and French users: + fingerprint bridgestatsend de fr +45933 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-02 11:32:47 0 0 +21782 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-02 11:33:53 0 0 +18869 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-02 11:53:07 0 0 +5182 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-02 19:23:52 0 0 +48686 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-03 09:38:20 0 0 +33774 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-03 19:30:08 0 0 +67666 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-03 22:11:47 0 0 +31329 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-06 09:14:07 0 0 +31668 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-07 11:23:26 0 0 +16943 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-08 11:49:26 0 0 +Reading relays.csv +Read 1606208 rows from relays.csv. +Filtering out bridges that have been seen as relays. +26425 descriptors remain. Again, here are the first 10 rows, sorted by +fingerprint and bridge stats interval end, and only displaying German +and French users: + fingerprint bridgestatsend de fr +45933 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-02 11:32:47 0 0 +21782 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-02 11:33:53 0 0 +18869 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-02 11:53:07 0 0 +5182 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-02 19:23:52 0 0 +48686 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-03 09:38:20 0 0 +33774 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-03 19:30:08 0 0 +67666 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-03 22:11:47 0 0 +31329 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-06 09:14:07 0 0 +31668 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-07 11:23:26 0 0 +16943 0008b101e9dcbcfa11ba638b86d71afdef54a4b5 2011-01-08 11:49:26 0 0 +Reading assignments.csv +Read 778561 rows from assignments.csv. +Filtering out bridges that have not been distributed via email. +14684 descriptors remain. Again, Here are the first 10 rows, sorted by +fingerprint and bridge stats interval end, and only displaying German +and French users: + fingerprint bridgestatsend de fr +66036 003817328def77002ff276a9af54bc4326a86d1c 2011-01-01 05:53:12 32 8 +61891 003817328def77002ff276a9af54bc4326a86d1c 2011-01-01 11:46:58 32 8 +54391 003817328def77002ff276a9af54bc4326a86d1c 2011-01-02 03:32:30 40 8 +73165 003817328def77002ff276a9af54bc4326a86d1c 2011-01-02 21:33:14 48 8 +82707 003817328def77002ff276a9af54bc4326a86d1c 2011-01-03 03:47:23 48 8 +5300 003817328def77002ff276a9af54bc4326a86d1c 2011-01-03 21:48:10 32 8 +23940 003817328def77002ff276a9af54bc4326a86d1c 2011-01-04 15:48:56 32 8 +2706 003817328def77002ff276a9af54bc4326a86d1c 2011-01-05 09:49:39 40 8 +17273 003817328def77002ff276a9af54bc4326a86d1c 2011-01-06 03:50:23 24 8 +72380 003817328def77002ff276a9af54bc4326a86d1c 2011-01-06 21:51:09 24 8 +Terminating. + diff --git a/task-2680/analysis.R b/task-2680/analysis.R new file mode 100644 index 0000000..fbe3199 --- /dev/null +++ b/task-2680/analysis.R @@ -0,0 +1,50 @@ +# Read descriptors.csv. +cat("Reading descriptors.csv.\n") +data <- read.csv("descriptors.csv", stringsAsFactors = FALSE) +cat("Read", length(data$fingerprint), "rows from descriptors.csv.\n") + +# We're interested in bridge stats. Let's filter out all descriptors that +# don't have any bridge stats. +data <- data[!is.na(data$bridgestatsend), ] +cat(length(data$fingerprint), "of these rows have bridge stats.\n") + +# Sort data first by bridge fingeprint, then by bridge stats interval end. +data <- data[order(data$fingerprint, data$bridgestatsend), ] +cat("Here are the first 10 rows, sorted by fingerprint and bridge", + "stats\ninterval end, and only displaying German and French users:\n") +data[1:10, c("fingerprint", "bridgestatsend", "de", "fr")] + +# Looks good, but we should exclude all bridges that have been seen as +# relays, or they will skew our results. Read relays.csv. +cat("Reading relays.csv\n") +relays <- read.csv("relays.csv", stringsAsFactors = FALSE) +cat("Read", length(relays$fingerprint), "rows from relays.csv.\n") + +# Filter out all descriptors of bridges that have been seen as relays. +cat("Filtering out bridges that have been seen as relays.\n") +data <- data[!data$fingerprint %in% relays$fingerprint, ] +cat(length(data$fingerprint), "descriptors remain. Again, here are the", + "first 10 rows, sorted by\nfingerprint and bridge stats interval", + "end, and only displaying German\nand French users:\n") +data[1:10, c("fingerprint", "bridgestatsend", "de", "fr")] + +# And finally, we only want to know bridge statistics of the bridges that +# were distributed via email. Read assignments.csv. +cat("Reading assignments.csv\n") +assignments <- read.csv("assignments.csv", stringsAsFactors = FALSE) +cat("Read", length(assignments$fingerprint), "rows from", + "assignments.csv.\n") + +# Filter out all descriptors of bridges that were not assigned to the +# email distributor. +cat("Filtering out bridges that have not been distributed via email.\n") +data <- data[!data$fingerprint %in% + assignments[assignments$type == 'email', "fingerprint"], ] +cat(length(data$fingerprint), "descriptors remain. Again, Here are the", + "first 10 rows, sorted by\nfingerprint and bridge stats interval", + "end, and only displaying German\nand French users:\n") +data[1:10, c("fingerprint", "bridgestatsend", "de", "fr")] + +# That's it. +cat("Terminating.\n") +

1 0