- tor-commits - lists.torproject.org

[tor/release-0.2.2] put the 0.2.1.30 stanza in the 0.2.2 changelog
by arma＠torproject.org 01 Aug '11

01 Aug '11

commit 13f1d2f0eccfa26d5061e5969c7d17265d7af797 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 1 16:13:12 2011 -0400 put the 0.2.1.30 stanza in the 0.2.2 changelog --- ChangeLog | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f17d9e0..686fcb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -754,6 +754,57 @@ Changes in version 0.2.2.23-alpha - 2011-03-08 git://git.torproject.org/torspec.git +Changes in version 0.2.1.30 - 2011-02-23 + Tor 0.2.1.30 fixes a variety of less critical bugs. The main other + change is a slight tweak to Tor's TLS handshake that makes relays + and bridges that run this new version reachable from Iran again. + We don't expect this tweak will win the arms race long-term, but it + buys us time until we roll out a better solution. + + o Major bugfixes: + - Stop sending a CLOCK_SKEW controller status event whenever + we fetch directory information from a relay that has a wrong clock. + Instead, only inform the controller when it's a trusted authority + that claims our clock is wrong. Bugfix on 0.1.2.6-alpha; fixes + the rest of bug 1074. + - Fix a bounds-checking error that could allow an attacker to + remotely crash a directory authority. Bugfix on 0.2.1.5-alpha. + Found by "piebeer". + - If relays set RelayBandwidthBurst but not RelayBandwidthRate, + Tor would ignore their RelayBandwidthBurst setting, + potentially using more bandwidth than expected. Bugfix on + 0.2.0.1-alpha. Reported by Paul Wouters. Fixes bug 2470. + - Ignore and warn if the user mistakenly sets "PublishServerDescriptor + hidserv" in her torrc. The 'hidserv' argument never controlled + publication of hidden service descriptors. Bugfix on 0.2.0.1-alpha. + + o Minor features: + - Adjust our TLS Diffie-Hellman parameters to match those used by + Apache's mod_ssl. + - Update to the February 1 2011 Maxmind GeoLite Country database. + + o Minor bugfixes: + - Check for and reject overly long directory certificates and + directory tokens before they have a chance to hit any assertions. + Bugfix on 0.2.1.28. Found by "doorss". + - Bring the logic that gathers routerinfos and assesses the + acceptability of circuits into line. This prevents a Tor OP from + getting locked in a cycle of choosing its local OR as an exit for a + path (due to a .exit request) and then rejecting the circuit because + its OR is not listed yet. It also prevents Tor clients from using an + OR running in the same instance as an exit (due to a .exit request) + if the OR does not meet the same requirements expected of an OR + running elsewhere. Fixes bug 1859; bugfix on 0.1.0.1-rc. + + o Packaging changes: + - Stop shipping the Tor specs files and development proposal documents + in the tarball. They are now in a separate git repository at + git://git.torproject.org/torspec.git + - Do not include Git version tags as though they are SVN tags when + generating a tarball from inside a repository that has switched + between branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. + + Changes in version 0.2.2.22-alpha - 2011-01-25 Tor 0.2.2.22-alpha fixes a few more less-critical security issues. The main other change is a slight tweak to Tor's TLS handshake that makes

1 0

[tor/master] reach back in time and correct two changelog entries
by arma＠torproject.org 01 Aug '11

01 Aug '11

commit 843796495b2fef3219d460f2bcaa4f54481883a6 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 1 15:53:13 2011 -0400 reach back in time and correct two changelog entries --- ChangeLog | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 824c19b..fb7e170 100644 --- a/ChangeLog +++ b/ChangeLog @@ -391,7 +391,7 @@ Changes in version 0.2.2.26-beta - 2011-05-17 - Authorities now clean their microdesc cache periodically and when reading from disk initially, not only when adding new descriptors. This prevents a bug where we could lose microdescriptors. Bugfix - on 0.2.2.6-alpha. 2230 + on 0.2.2.6-alpha. Fixes bug 2230. - Do not crash when our configuration file becomes unreadable, for example due to a permissions change, between when we start up and when a controller calls SAVECONF. Fixes bug 3135; bugfix @@ -2679,8 +2679,9 @@ Changes in version 0.2.2.5-alpha - 2009-10-11 o Major bugfixes: - Make the tarball compile again. Oops. Bugfix on 0.2.2.4-alpha. - o New directory authorities: - - Move dizum to an alternate IP address. + o Directory authorities: + - Temporarily (just for this release) move dizum to an alternate + IP address. Changes in version 0.2.2.4-alpha - 2009-10-10

1 0

[tor/master] Initial patch to build Tor with msvc and nmake
by nickm＠torproject.org 01 Aug '11

01 Aug '11

commit e802199cb3a2ebb4c09eaf4949e279acd3b46fc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 1 12:36:59 2011 -0400 Initial patch to build Tor with msvc and nmake We'll still need to tweak it so that it looks for includes and libraries somewhere more sensible than "where we happened to find them on Erinn's system"; so that tests and tools get built too; so that it's a bit documented; and so that we actually try running the output. Work done with Erinn Clark. --- Makefile.am | 1 + Makefile.nmake | 5 +++++ changes/nmake | 3 +++ src/common/Makefile.am | 2 +- src/common/Makefile.nmake | 20 ++++++++++++++++++++ src/common/torgzip.c | 4 ---- src/common/util.c | 6 +++--- src/or/Makefile.am | 2 +- src/or/Makefile.nmake | 28 ++++++++++++++++++++++++++++ src/or/networkstatus.c | 7 ------- src/win32/orconfig.h | 10 ++++++++++ 11 files changed, 72 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0daca63..cd0d883 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ EXTRA_DIST = \ ChangeLog \ INSTALL \ LICENSE \ + Makefile.nmake \ README \ ReleaseNotes \ tor.spec \ diff --git a/Makefile.nmake b/Makefile.nmake new file mode 100644 index 0000000..425f1ec --- /dev/null +++ b/Makefile.nmake @@ -0,0 +1,5 @@ +all: + cd src/common + $(MAKE) /F Makefile.nmake + cd ../../src/or + $(MAKE) /F Makefile.nmake diff --git a/changes/nmake b/changes/nmake new file mode 100644 index 0000000..47f4f8f --- /dev/null +++ b/changes/nmake @@ -0,0 +1,3 @@ + o Minor features (build compatibility): + - Limited, experimental support for building with nmake and MSVC. + diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 4821849..2244fe5 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,7 +1,7 @@ noinst_LIBRARIES = libor.a libor-crypto.a libor-event.a -EXTRA_DIST = common_sha1.i sha256.c +EXTRA_DIST = common_sha1.i sha256.c Makefile.nmake #CFLAGS = -Wall -Wpointer-arith -O2 diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake new file mode 100644 index 0000000..c8b5988 --- /dev/null +++ b/src/common/Makefile.nmake @@ -0,0 +1,20 @@ +all: libor.lib libor-crypto.lib libor-event.lib + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include + +LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \ + log.obj memarea.obj mempool.obj procmon.obj util.obj \ + util_codedigest.obj + +LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj + +LIBOR_EVENT_OBJECTS = compat_libevent.obj + +libor.lib: $(LIBOR_OBJECTS) + lib $(LIBOR_OBJECTS) /out:libor.lib + +libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS) + lib $(LIBOR_CRYPTO_OBJECTS) /out:libor-crypto.lib + +libor-event.lib: $(LIBOR_EVENT_OBJECTS) + lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 2937c67..ae7d7cf 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -43,11 +43,7 @@ #define off64_t int64_t #endif -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else #include <zlib.h> -#endif /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ diff --git a/src/common/util.c b/src/common/util.c index 15b6e71..601f2be 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -14,6 +14,9 @@ #define _GNU_SOURCE #include "orconfig.h" +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif #define UTIL_PRIVATE #include "util.h" #include "torlog.h" @@ -68,9 +71,6 @@ #ifdef HAVE_SYS_FCNTL_H #include <sys/fcntl.h> #endif -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif #ifdef HAVE_TIME_H #include <time.h> #endif diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 344e63f..e2a1b6d 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -7,7 +7,7 @@ else tor_platform_source= endif -EXTRA_DIST=ntmain.c or_sha1.i +EXTRA_DIST=ntmain.c or_sha1.i Makefile.nmake if USE_EXTERNAL_EVDNS evdns_source= diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake new file mode 100644 index 0000000..919edbb --- /dev/null +++ b/src/or/Makefile.nmake @@ -0,0 +1,28 @@ +all: tor.exe + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common + +LIBS = ..\..\..\build-alpha\lib\libevent.a \ + ..\..\..\build-alpha\lib\libcrypto.a \ + ..\..\..\build-alpha\lib\libssl.a \ + ..\..\..\build-alpha\lib\libz.a \ + ws2_32.lib advapi32.lib shell32.lib + +LIBTOR_OBJECTS = buffers.obj circuitbuild.obj circuitlist.obj circuituse.obj \ + command.obj config.obj connection.obj connection_edge.obj \ + connection_or.obj control.obj cpuworker.obj directory.obj \ + dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj \ + hibernate.obj main.obj microdesc.obj networkstatus.obj \ + nodelist.obj onion.obj policies.obj reasons.obj relay.obj \ + rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \ + rephist.obj router.obj routerlist.obj routerparse.obj status.obj \ + config_codedigest.obj ntmain.obj + +libtor.lib: $(LIBTOR_OBJECTS) + lib $(LIBTOR_OBJECTS) /out:libtor.lib + +tor.exe: libtor.lib tor_main.obj + $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj + +clean: + del $(LIBTOR_OBJECTS) *.lib tor.exe diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 2586ce6..868c2a2 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2006,13 +2006,6 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers, tor_memcmp(rs->identity_digest, router->cache_info.identity_digest, DIGEST_LEN), { -#if 0 - /* We have no routerstatus for this router. Clear flags and skip it. */ - if (!authdir) { - if (router->purpose == ROUTER_PURPOSE_GENERAL) - router_clear_status_flags(router); - } -#endif }) { /* We have a routerstatus for this router. */ const char *digest = router->cache_info.identity_digest; diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ed6da8e..cf49339 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -122,6 +122,7 @@ /* Define to 1 if you have the <sys/socket.h> header file. */ #undef HAVE_SYS_SOCKET_H + /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H @@ -234,3 +235,12 @@ /* Version number of package */ #define VERSION "0.2.3.2-alpha-dev" + + + +#define HAVE_STRUCT_SOCKADDR_IN6 +#define HAVE_STRUCT_IN6_ADDR +#define RSHIFT_DOES_SIGN_EXTEND +#define FLEXIBLE_ARRAY_MEMBER 0 +#define HAVE_EVENT2_EVENT_H +#define SHARE_DATADIR ""

1 0

[tor/master] Re-order tor_fw_helper_LDADD flags so that they work
by nickm＠torproject.org 01 Aug '11

01 Aug '11

commit 9d77f24cf5032c4a1dbf64ec2e25d7debf3758ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 1 11:05:49 2011 -0400 Re-order tor_fw_helper_LDADD flags so that they work Patch from "blueness". --- src/tools/tor-fw-helper/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/tools/tor-fw-helper/Makefile.am b/src/tools/tor-fw-helper/Makefile.am index 75878f2..77ff63f 100644 --- a/src/tools/tor-fw-helper/Makefile.am +++ b/src/tools/tor-fw-helper/Makefile.am @@ -34,5 +34,5 @@ miniupnpc_cppflags = endif tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags) -tor_fw_helper_LDADD = $(nat_pmp_ldadd) $(miniupnpc_ldadd) ../../common/libor.a @TOR_LIB_WS32@ +tor_fw_helper_LDADD = ../../common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) @TOR_LIB_WS32@ tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags)

1 0

[flashproxy/master] Gracefully handle the case when a request is so broken it doesn't have
by dcf＠torproject.org 31 Jul '11

31 Jul '11

commit 7f54b3675a9d62d930dc1842be0253d588178f0d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 28 16:04:33 2011 +0000 Gracefully handle the case when a request is so broken it doesn't have headers. --- facilitator.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/facilitator.py b/facilitator.py index eaad855..287602d 100755 --- a/facilitator.py +++ b/facilitator.py @@ -272,7 +272,10 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): def log_request(self, code): addr_s = format_addr(self.client_address) - referer = self.headers.get("Referer") or "-" + try: + referer = self.headers["Referer"] + except (AttributeError, KeyError): + referer = "-" log(u"resp %s %s %d %s" % (addr_s, repr(self.requestline), code, repr(referer)))

1 0

[flashproxy/master] Turn "broken pipe" facilitator errors into a one-line log message.
by dcf＠torproject.org 31 Jul '11

31 Jul '11

commit 545b33f21b1db659f80fd1109469d25ce5ab6533 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 28 16:34:16 2011 +0000 Turn "broken pipe" facilitator errors into a one-line log message. --- facilitator.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/facilitator.py b/facilitator.py index 287602d..b2f8304 100755 --- a/facilitator.py +++ b/facilitator.py @@ -3,6 +3,7 @@ import BaseHTTPServer import SocketServer import cgi +import errno import getopt import os import re @@ -302,6 +303,19 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): data["relay"] = options.relay_spec self.request.send(urllib.urlencode(data)) + # Catch "broken pipe" errors that otherwise cause a stack trace in the log. + def catch_epipe(fn): + def ret(self, *args): + try: + fn(self, *args) + except socket.error, e: + if e.errno != errno.EPIPE: + raise + log(u"%s broken pipe" % format_addr(self.client_address)) + return ret + handle = catch_epipe(BaseHTTPServer.BaseHTTPRequestHandler.handle) + finish = catch_epipe(BaseHTTPServer.BaseHTTPRequestHandler.finish) + REGS = RegSet() opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:r:",

1 0

[torperf/master] Remove unused command-line options -v and -F.
by karsten＠torproject.org 30 Jul '11

30 Jul '11

commit 9e94e666068c6d9daec1df567e44d93ffa8a6d85 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 28 19:17:59 2011 +0000 Remove unused command-line options -v and -F. --- trivsocks-client.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/trivsocks-client.c b/trivsocks-client.c index 1c3d895..70e29a7 100644 --- a/trivsocks-client.c +++ b/trivsocks-client.c @@ -449,7 +449,7 @@ main(int argc, char **argv) { uint32_t sockshost; uint16_t socksport; - int isSocks4 = 0, isVerbose = 0, isReverse = 0, force = 0; + int isSocks4 = 0, isReverse = 0; char **arg; int n_args; uint32_t result = 0; @@ -470,16 +470,12 @@ main(int argc, char **argv) } while (n_args && *arg[0] == '-') { - if (!strcmp("-v", arg[0])) - isVerbose = 1; - else if (!strcmp("-4", arg[0])) + if (!strcmp("-4", arg[0])) isSocks4 = 1; else if (!strcmp("-5", arg[0])) isSocks4 = 0; else if (!strcmp("-x", arg[0])) isReverse = 1; - else if (!strcmp("-F", arg[0])) - force = 1; else { fprintf(stderr, "Unrecognized flag '%s'\n", arg[0]); usage();

1 0

[torperf/master] Fix compilation on MacOS X
by karsten＠torproject.org 30 Jul '11

30 Jul '11

commit a8cb23f556b9391562ad0e632d9f05a332eaaf95 Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Fri Jul 29 16:54:44 2011 +0100 Fix compilation on MacOS X - Properly cast parameters to printf - Replace GNU-specific strndup with tor_strndup --- trivsocks-client.c | 2 +- util.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/trivsocks-client.c b/trivsocks-client.c index 70e29a7..d68aaca 100644 --- a/trivsocks-client.c +++ b/trivsocks-client.c @@ -249,7 +249,7 @@ do_http_get(int s, const char *path, const char *hostname, size_t *read_bytes, s static int print_time(struct timeval t) { - return printf("%ld %ld ", t.tv_sec, t.tv_usec); + return printf("%ld %ld ", (long int)t.tv_sec, (long int)t.tv_usec); } // Timestamps of important events diff --git a/util.c b/util.c index 96cee0a..fcc8ef9 100644 --- a/util.c +++ b/util.c @@ -73,6 +73,27 @@ read_all(int fd, char *buf, size_t count, int isSocket) return numread; } +/** Allocate and return a new string containing the first <b>n</b> + * characters of <b>s</b>. If <b>s</b> is longer than <b>n</b> + * characters, only the first <b>n</b> are copied. The result is + * always NUL-terminated. + */ +char * +tor_strndup(const char *s, size_t n) +{ + char *dup; + dup = malloc(n+1); + /* Performance note: Ordinarily we prefer strlcpy to strncpy. But + * this function gets called a whole lot, and platform strncpy is + * much faster than strlcpy when strlen(s) is much longer than n. + */ + if (!dup) + return dup; + strncpy(dup, s, n); + dup[n]='\0'; + return dup; +} + /** * Read a 16-bit value beginning at <b>cp</b>. Equivalent to * *(uint16_t*)(cp), but will not cause segfaults on platforms that forbid @@ -207,7 +228,7 @@ parse_addr_port(int severity, const char *addrport, char **address, colon = strchr(addrport, ':'); if (colon) { - _address = strndup(addrport, colon-addrport); + _address = tor_strndup(addrport, colon-addrport); _port = (int) parse_long(colon+1,10,1,65535,NULL,NULL); if (!_port) { fprintf(stderr, "Port %s out of range\n", colon+1);

1 0

[torperf/master] Add ChangeLog entry for previous 2 commits.
by karsten＠torproject.org 30 Jul '11

30 Jul '11

commit 079de667fb0a0ed05bbb4e33de168ec13644c858 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 29 21:17:49 2011 -0400 Add ChangeLog entry for previous 2 commits. --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b41f1be..b0ae8c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Torperf change log: Changes in version 0.0.2 - 2011-??-?? - Include <arpa/inet.h> for the BSDs that don't get ntohl from any of the other includes. + - Fix compilation for GCC 4.6 and Mac OS X. Changes in version 0.0.1 - 2011-04-12 - Initial release

1 0

[metrics-web/master] Add table with top-10 relays by bandwidth.
by karsten＠torproject.org 30 Jul '11

30 Jul '11

commit e988175f5056c2b4f4eb74bc0d8b8df26886eb2c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 29 20:41:04 2011 -0400 Add table with top-10 relays by bandwidth. --- rserve/tables.R | 16 ++++++++++ .../ernie/web/GraphsSubpagesServlet.java | 3 ++ .../ernie/web/TableParameterChecker.java | 1 + web/WEB-INF/network.jsp | 31 ++++++++++++++++++++ 4 files changed, 51 insertions(+), 0 deletions(-) diff --git a/rserve/tables.R b/rserve/tables.R index 6d3b5fb..aabd588 100644 --- a/rserve/tables.R +++ b/rserve/tables.R @@ -69,3 +69,19 @@ write_censorship_events <- function(start, end, path) { write.csv(r, path, quote = FALSE, row.names = FALSE) } +write_top_10_relays <- function(start, end, path) { + drv <- dbDriver("PostgreSQL") + con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) + q <- paste("SELECT fingerprint, SUM(written_sum) ", + "AS written_sum FROM bwhist WHERE date >= '", start, + "' AND date <= '", end, "' GROUP BY 1 ORDER BY 2 DESC LIMIT 10", + sep = "") + rs <- dbSendQuery(con, q) + c <- fetch(rs, n = -1) + dbDisconnect(con) + dbUnloadDriver(drv) + c <- data.frame(fingerprint = c$fingerprint, + written_sum = round(c$written_sum / 2^40, 2)) + write.csv(c, path, quote = FALSE, row.names = FALSE) +} + diff --git a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java index c7f3056..16d0db0 100644 --- a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java +++ b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java @@ -36,6 +36,9 @@ public class GraphsSubpagesServlet extends HttpServlet { this.availableGraphsSubpageTables.put("users.html", new HashSet<String>(Arrays.asList( "direct-users,censorship-events".split(",")))); + this.availableGraphsSubpageTables.put("network.html", + new HashSet<String>(Arrays.asList( + "top-10-relays".split(",")))); this.knownCountries = Countries.getInstance().getCountryList(); } diff --git a/src/org/torproject/ernie/web/TableParameterChecker.java b/src/org/torproject/ernie/web/TableParameterChecker.java index 5b6f627..2c0a7be 100644 --- a/src/org/torproject/ernie/web/TableParameterChecker.java +++ b/src/org/torproject/ernie/web/TableParameterChecker.java @@ -41,6 +41,7 @@ public class TableParameterChecker { this.availableTables = new HashMap<String, String>(); this.availableTables.put("direct-users", "start,end,filename"); this.availableTables.put("censorship-events", "start,end,filename"); + this.availableTables.put("top-10-relays", "start,end,filename"); this.knownParameterValues = new HashMap<String, String>(); } diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 1789cb7..9d83cf1 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -1,5 +1,6 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> @@ -230,6 +231,36 @@ in the network.</p> </form> <p><a href="csv/bandwidth.csv">CSV</a> file containing all data.</p> <br> +<a name="top-10-relays"></a> +<p><b>Top-10 relays by bandwidth history:</b></p> +<table> + <tr> + <th>Fingerprint</th> + <th>Bandwidth history</th> + </tr> + <c:forEach var="row" items="${top_10_relays_tabledata}"> + <tr> + <td><a href="https://metrics.torproject.org/relay.html?fingerprint=${row['fingerprint']}">${row['fingerprint']}</a>&emsp;</td> + <td><fmt:formatNumber type="number" minFractionDigits="2" value="${row['written_sum']}" /> TiB</td> + </tr> + </c:forEach> +</table> +<br> +<form action="network.html#top-10-relays"> + <div class="formrow"> + <input type="hidden" name="table" value="top-10-relays"> + <p> + <label>Start date (yyyy-mm-dd):</label> + <input type="text" name="start" size="10" + value="<c:choose><c:when test="${fn:length(top_10_relays_start) == 0}">${default_start_date}</c:when><c:otherwise>${top_10_relays_start[0]}</c:otherwise></c:choose>"> + <label>End date (yyyy-mm-dd):</label> + <input type="text" name="end" size="10" + value="<c:choose><c:when test="${fn:length(top_10_relays_end) == 0}">${default_end_date}</c:when><c:otherwise>${top_10_relays_end[0]}</c:otherwise></c:choose>"> + </p><p> + <input class="submit" type="submit" value="Update table"> + </p> + </div> +</form> <h3>Relay bandwidth by Exit and/or Guard flags</h3> <br>

1 0