April 2011 - tor-commits - lists.torproject.org

[torspec/master] make explicit how to distinguish old bridge lines
by arma＠torproject.org 12 Apr '11

12 Apr '11

commit e65b0219700ab09819aebeab6034df9cbb3b3591 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 11 19:27:43 2011 -0400 make explicit how to distinguish old bridge lines --- proposals/180-pluggable-transport.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index daa81bf..5e9e5b1 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -159,6 +159,15 @@ Specifications: Client behavior The "id-fingerprint" field is always provided in a field named "keyid", if it was given. Method names must be C identifiers. + For reference, the old bridge format was + bridge address[:port] [id-fingerprint] + where port defaults to 443 and the id-fingerprint is optional. The + new format can be distinguished from the old one by checking if the + first argument has any non-C-identifier characters. (Looking for a + period should be a simple way.) Also, while the id-fingerprint could + optionally include whitespace in the old format, whitespace in the + id-fingerprint is not permitted in the new format. + Example: if the bridge line is "bridge trebuchet www.example.com:3333 rocks=20 height=5.6m" AND if the Tor client knows that the 'trebuchet' method is provided by a SOCKS5 proxy on

1 0

[torspec/master] finish mucking with proposal 180
by arma＠torproject.org 11 Apr '11

11 Apr '11

commit 648ca5d78889a440fac1594f89fc3cab15dbb6a3 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 11 16:08:24 2011 -0400 finish mucking with proposal 180 --- proposals/180-pluggable-transport.txt | 48 ++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 22 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index b1836e0..daa81bf 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -142,7 +142,7 @@ Specifications: Client behavior to use to connect to a bridge. The new format is: - "bridge method address:port [[keyid=]id-fingerprint] [k=v] [k=v] [k=v]" + bridge method address:port [[keyid=]id-fingerprint] [k=v] [k=v] [k=v] To connect to such a bridge, the Tor program needs to know which local SOCKS proxy will support the transport called "method". It @@ -352,30 +352,34 @@ Managed proxy interface - FORWARD:1 - If this option is set, and address:port is not a publicly - accessible address, then the bridge needs to forward some - other address:port to address:port via upnp-helper. + If this option is set (for example, because address:port is not + a publicly accessible address), then Tor needs to forward some + other address:port to address:port via upnp-helper. Tor would + then advertise that other address:port in the bridge line instead. - - ARGS:k=v,k=v,k=v + - ARGS:K=V,K=V,K=V - If this option is set, the K=V arguments are added to the + If this option is set, the K=V arguments are added to Tor's extrainfo document. - DECLARE:K=V,... - If this option is set, all the K=V options should be - added as extension entries to the router descriptor, so other - relays can make use of it. (See below) + If this option is set, the K=V options should be added as + extension entries to the router descriptor, so clients and other + relays can make use of it. See ideas/xxx-triangleboy-transport.txt + for an example situation where the plugin would want to declare + parameters to other Tors. - USE-EXTENDED-PORT:1 - If this option is set, the server plugin is using the - extended server port. + If this option is set, the server plugin is planning to connect + to Tor's extended server port. SMETHOD and CMETHOD lines may be interspersed, to allow the proxies to - report success even when some methods may require probing your network, - connecting to some kind of peers, etc. After the last SMETHOD line, - the proxy says "SMETHODS DONE". + report methods as they become available, even when some methods may + require probing your network, connecting to some kind of peers, etc + before they are set up. After the final SMETHOD line, the proxy says + "SMETHODS DONE". The proxy SHOULD NOT tell Tor about a server or client method unless it is actually open and ready to use. @@ -395,9 +399,9 @@ The extended ORPort protocol Server transports may need to connect to the bridge and pass additional information about client connections that the bridge - would ordinarily receive from the kernel's TCP stack. To to this, + would ordinarily receive from the kernel's TCP stack. To do this, they connect to the "extended server port" as given in - SERVER_PORT, sent a short amount of information, wait for a + EXTENDED_SERVER_PORT, send a short amount of information, wait for a response, and then send the user traffic on that port. The extended server port protocol is as follows: @@ -429,16 +433,16 @@ Advertising bridge methods Bridges put the 'method' lines in their extra-info documents. - method SP methodname SP address:port SP arglist NL + method SP methodname SP address:port [SP arglist] NL - The address:port parse are as returned from an SMETHOD line. The - arglist is a K=V,... list as returned in the ARGS part of the - SMETHOD line. + The address:port are as returned from an SMETHOD line (unless they are + replaced by the FORWARD: directive). The arglist is a K=V,... list as + returned in the ARGS: part of the SMETHOD line's Options component. If the SMETHOD line includes a DECLARE: part, the router descriptor gets a new line: - method-info SP methodname SP arglist NL + method-info SP methodname [SP arglist] NL Bridge authority behavior @@ -452,7 +456,7 @@ Bridgedb behavior Bridgedb can, given a set of router descriptors and their corresponding extrainfo documents, generate a set of bridge lines - for each descriptor. Bridgedb may want to avoid handing out + for each bridge. Bridgedb may want to avoid handing out methods that seem to get bridges blocked quickly. Implementation plan

1 0

[torspec/master] interim commit while i clean up proposal 180
by arma＠torproject.org 11 Apr '11

11 Apr '11

commit 6982edff1b24e5d185245216dae12e1acfec3143 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 11 15:10:21 2011 -0400 interim commit while i clean up proposal 180 --- proposals/180-pluggable-transport.txt | 121 ++++++++++++++++----------------- 1 files changed, 58 insertions(+), 63 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index dc0564d..b1836e0 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -102,8 +102,8 @@ Non-Goals current proposal, though we are not currently sure whether it's a good idea to implement. - We deliberately reject any design that would involve linking more code - into Tor's process space. + We deliberately reject any design that would involve linking the + transport plugins into Tor's process space. Design overview @@ -188,20 +188,19 @@ Specifications: Client behavior options, even if the same executable and options are listed for more than one method. - If instead of a transport name, the torrc lists "*" for a managed proxy, - tor uses that proxy for all transports that it supports. So - "ClientTransportPlugin * exec /usr/libexec/tor/foobar" tells Tor - that it should use the foobar plugin for everything that it supports. + If instead of a transport method, the torrc lists "*" for a managed + proxy, Tor uses that proxy for all transport methods that the plugin + supports. So "ClientTransportPlugin * exec /usr/libexec/tor/foobar" + tells Tor that Tor should use the foobar plugin for every method that + the proxy supports. See the "Managed proxy interface" section below + for details on how Tor learns which methods a plugin supports. - If two proxies support the same method, Tor should use whichever + If two plugins support the same method, Tor should use whichever one is listed first. The same program can implement a managed or an external proxy: it just needs to take an argument saying which one to be. - See "Managed proxy behavior" for more information on the managed - proxy interface. - Server behavior Server proxies are configured similarly to client proxies. When @@ -216,7 +215,7 @@ Server behavior this in-band. As before, the server lists proxies in its torrc. These can be - external proxies that run on their own, or managedproxies that Tor + external proxies that run on their own, or managed proxies that Tor launches. An external server proxy is configured as @@ -227,9 +226,9 @@ Server behavior configuration information that we'll tell users. A managed proxy is configured as - ServerTransportPlugin method exec /path/to/binary [options] + ServerTransportPlugin method exec /path/to/binary [options] or - ServerTransportPlugin * exec /path/to/binary [options] + ServerTransportPlugin * exec /path/to/binary [options] When possible, Tor should launch only one binary of each binary/option pair configured. So if the torrc contains @@ -243,12 +242,12 @@ Server behavior Managed proxy interface - When the Tor client launches a client proxy from the command - line, it communicates via environment variables. At a minimum, - it sets: + When the Tor client or relay launches a managed proxy, it communicates + via environment variables. At a minimum, it sets: {Client and server} - HOME, PATH -- as you'd expect. + + "HOME", "PATH" -- as you'd expect. "STATE_LOCATION" -- a directory where the proxy should store state if it wants to. This directory is not required to @@ -272,19 +271,23 @@ Managed proxy interface {Server only} - "EXT_SERVER_PORT=addr:portnum" -- A port (probably on localhost) that - speaks the extended server protocol. + "EXTENDED_SERVER_PORT=addr:portnum" -- A port (probably on localhost) + that speaks the extended server protocol. (See the "The extended + ORPort protocol" section below.) "ORPORT=addr:portnum" -- Our regular ORPort in a form suitable - for local connections. + for local connections, i.e. connections from the proxy to + the ORPort. - "BINDADDR=addr" -- An address on which to listen for local + "BINDADDR=addr" -- An address on which to listen for client proxy connections. This might be the advertised address, or might be a local address that Tor will forward ports to. It MUST be an address that will work with bind(). "SERVER_TRANSPORTS=..." -- A comma-separated list of server - methods that the proxy should support, or * + methods that the proxy should support, or * if all methods + should be enabled. The proxy SHOULD ignore methods that it + doesn't recognize. The transport proxy replies by writing NL-terminated lines to stdout. The metaformat is @@ -300,14 +303,14 @@ Managed proxy interface First, the proxy writes "VERSION 1" to say that it supports this protocol. It must either pick a version that Tor told it about, or - pick no version at all, and say "ERROR no-version\n" and exit. + pick no version at all, say "ERROR no-version\n", and exit. The proxy should then open its ports. If running as a client proxy, it should not use fixed ports; instead it should autoselect ports to avoid conflicts. A client proxy should by default only listen on localhost for connections. - A server proxy SHOULD try listen at a consistent port, though it + A server proxy SHOULD try to listen at a consistent port, though it SHOULD pick a different one if the port it last used is now allocated. A client or server proxy then should tell which methods it has @@ -334,20 +337,18 @@ Managed proxy interface should say: CMETHOD-ERROR methodname "Message" - A proxy should tell Tor about the server methods it is providing + A proxy should also tell Tor about the server methods it is providing by printing zero or more SMETHOD lines. These lines look like: - SMETHOD methodname address:port [Options] + SMETHOD methodname address:port [Options] If there's an error setting up a configured server method, the proxy should say: SMETHOD-ERROR methodname "message" The 'address:port' part of an SMETHOD line is the address to put - in the bridge line. The ARGS: part is a list of key-value pairs - that the client needs to know. The Options part is a list of - space-separated K:V flags that Tor should know about. Recognized - options are: + in the bridge line. The Options part is a list of space-separated + K:V flags that Tor should know about. Recognized options are: - FORWARD:1 @@ -363,16 +364,18 @@ Managed proxy interface - DECLARE:K=V,... If this option is set, all the K=V options should be - added as extension entries to the router descriptor. (See - below) + added as extension entries to the router descriptor, so other + relays can make use of it. (See below) - - USE-EXTPORT:1 + - USE-EXTENDED-PORT:1 If this option is set, the server plugin is using the extended server port. - SMETHOD and CMETHOD lines may be interspersed. After the list - SMETHOD line, the proxy says "SMETHODS DONE" + SMETHOD and CMETHOD lines may be interspersed, to allow the proxies to + report success even when some methods may require probing your network, + connecting to some kind of peers, etc. After the last SMETHOD line, + the proxy says "SMETHODS DONE". The proxy SHOULD NOT tell Tor about a server or client method unless it is actually open and ready to use. @@ -388,7 +391,7 @@ Managed proxy interface closed. Proxies should respond to a second INT signal by shutting down cleanly. -The extended ORPort protocol. +The extended ORPort protocol Server transports may need to connect to the bridge and pass additional information about client connections that the bridge @@ -422,17 +425,17 @@ The extended ORPort protocol. about client addresses, but that's a historically error-prone way to go about annotating connections.] -Advertising bridge methods: +Advertising bridge methods Bridges put the 'method' lines in their extra-info documents. method SP methodname SP address:port SP arglist NL The address:port parse are as returned from an SMETHOD line. The - arglist is a K=V,... list as retuned in the ARGS part of the + arglist is a K=V,... list as returned in the ARGS part of the SMETHOD line. - If the SMETHOD line includes a DECLARE: part, the routerinfo gets + If the SMETHOD line includes a DECLARE: part, the router descriptor gets a new line: method-info SP methodname SP arglist NL @@ -445,7 +448,7 @@ Bridge authority behavior transport method before we allow its use: the point of this design is to remove bottlenecks in transport deployment. -Bridgedb behavior: +Bridgedb behavior Bridgedb can, given a set of router descriptors and their corresponding extrainfo documents, generate a set of bridge lines @@ -455,9 +458,10 @@ Bridgedb behavior: Implementation plan First, we should implement per-bridge proxies via the "external - proxy" method described in "Specifications: Client behavior". the + proxy" method described in "Specifications: Client behavior". Also, + we'll want to build the extended-server-port mechanism. This will let bridges run - transport proxies such that they can give bridge lines to + transport proxies such that they can generate bridge lines to give to clients for testing, so long as the user configures and launches their proxies on their own. @@ -465,15 +469,15 @@ Implementation plan the whole idea there is silly. If we do, the next most important part seems to be getting - the client-side automatic part written. And once that's done, we + the client-side automation part written. And once that's done, we can evaluate how much of the server side is easy for people to do and how much is hard. The "obfsproxy" obfuscating proxy is a likely candidate for an - initial transport, as is Steven Murdoch's http thing or something - similar. + initial transport (trac entry #2760), as is Steven Murdoch's http + thing (trac entry #2759) or something similar. -Notes on plugins to write: +Notes on plugins to write We should ship a couple of null plugin implementations in one or two popular, portable languages so that people get an idea of how to @@ -482,23 +486,15 @@ Notes on plugins to write: 1. We should have one that's just a proof of concept that does nothing but transfer bytes back and forth. - 1. We should not do a rot13 one. - - 2. We should implement a basic proxy that does not transform the bytes at all - - 1. We should implement DNS or HTTP using other software (as goodesll + 2. We should implement DNS or HTTP using other software (as Geoff Goodell did years ago with DNS) as an example of wrapping existing code into our plugin model. - 2. The obfuscated-ssh superencipherment is pretty trivial and pretty - useful. It makes the protocol stringwise unfingerprintable. + 3. The obfuscated-ssh superencipherment is pretty trivial and pretty + useful. It makes the protocol stringwise unfingerprintable. - 1. Nick needs to be told firmly not to bikeshed the obfuscated-ssh - superencipherment too badly - - 1. Go ahead, bikeshed my day - - 1. If we do a raw-traffic proxy, openssh tunnels would be the logical choice. + 4. If we do a raw-traffic proxy, openssh tunnels would be the logical + choice. Appendix: recommendations for transports @@ -506,8 +502,9 @@ Appendix: recommendations for transports someday do so well at circumvention that it should be implemented inside Tor, it should use the same license as Tor. - Use libraries that Tor already requires. (You can rely on openssl and - libevent being present if current Tor is present.) + Tor already uses OpenSSL, Libevent, and zlib. Before you go and decide + to use crypto++ in your transport plugin, ask yourself whether OpenSSL + wouldn't be a nicer choice. Be portable: most Tor users are on Windows, and most Tor developers are not, so designing your code for just one of these platforms will @@ -529,5 +526,3 @@ Appendix: recommendations for transports protocols -- and in many cases, most possible variants of a given protocol won't actually exist in the wild. - -

1 0

r24586: {translation} update translation priority (translation/trunk/projects/orbot/po/.tx)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 15:41:31 +0000 (Mon, 11 Apr 2011) New Revision: 24586 Modified: translation/trunk/projects/orbot/po/.tx/config Log: update translation priority Modified: translation/trunk/projects/orbot/po/.tx/config =================================================================== --- translation/trunk/projects/orbot/po/.tx/config 2011-04-11 15:31:29 UTC (rev 24585) +++ translation/trunk/projects/orbot/po/.tx/config 2011-04-11 15:41:31 UTC (rev 24586) @@ -1,4 +1,4 @@ -[torproject.orbot-strings-pot] +[torproject.3-orbot-strings-pot] file_filter = <lang>/strings.po source_file = templates/strings.pot source_lang = en

1 0

r24585: {translation} updating translation priority (translation/trunk/projects/torbutton/po/.tx)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 15:31:29 +0000 (Mon, 11 Apr 2011) New Revision: 24585 Modified: translation/trunk/projects/torbutton/po/.tx/config Log: updating translation priority Modified: translation/trunk/projects/torbutton/po/.tx/config =================================================================== --- translation/trunk/projects/torbutton/po/.tx/config 2011-04-11 15:25:55 UTC (rev 24584) +++ translation/trunk/projects/torbutton/po/.tx/config 2011-04-11 15:31:29 UTC (rev 24585) @@ -1,12 +1,12 @@ [main] host = https://www.transifex.net -[torproject.torbutton-torbutton-dtd-pot] +[torproject.1-torbutton-torbutton-dtd-pot] file_filter = <lang>/torbutton.dtd.po source_file = templates/torbutton.dtd.pot source_lang = en -[torproject.torbutton-torbutton-properties-pot] +[torproject.1-torbutton-torbutton-properties-pot] file_filter = <lang>/torbutton.properties.po source_file = templates/torbutton.properties.pot source_lang = en

1 0

r24584: {translation} updating the resource names, see #2713 for more info (translation/trunk/projects/website/po/.tx)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 15:25:55 +0000 (Mon, 11 Apr 2011) New Revision: 24584 Modified: translation/trunk/projects/website/po/.tx/config Log: updating the resource names, see #2713 for more info Modified: translation/trunk/projects/website/po/.tx/config =================================================================== --- translation/trunk/projects/website/po/.tx/config 2011-04-11 14:50:21 UTC (rev 24583) +++ translation/trunk/projects/website/po/.tx/config 2011-04-11 15:25:55 UTC (rev 24584) @@ -1,4 +1,4 @@ -[torproject.website-docs-bridges-pot] +[torproject.2-website-docs-bridges-pot] file_filter = <lang>/docs/1-high.bridges.po source_file = templates/docs/1-high.bridges.pot source_lang = en @@ -28,7 +28,7 @@ source_file = templates/about/3-low.translators.pot source_lang = en -[torproject.website-about-overview-pot] +[torproject.2-website-about-overview-pot] file_filter = <lang>/about/2-medium.overview.po source_file = templates/about/2-medium.overview.pot source_lang = en @@ -98,7 +98,7 @@ source_file = templates/donate/3-low.matching-program.pot source_lang = en -[torproject.website-download-download-pot] +[torproject.1-website-download-download-pot] file_filter = <lang>/download/3-low.download.po source_file = templates/download/3-low.download.pot source_lang = en @@ -123,7 +123,7 @@ source_file = templates/press/3-low.inthemedia.pot source_lang = en -[torproject.website-projects-torbrowser-pot] +[torproject.3-website-projects-torbrowser-pot] file_filter = <lang>/projects/1-high.torbrowser.po source_file = templates/projects/1-high.torbrowser.pot source_lang = en @@ -171,7 +171,7 @@ source_file = templates/about/3-low.volunteers.pot source_lang = en -[torproject.website-index-pot] +[torproject.1-website-index-pot] file_filter = <lang>/1-high.index.po source_file = templates/1-high.index.pot source_lang = en @@ -211,7 +211,7 @@ source_file = templates/docs/2-medium.faq.pot source_lang = en -[torproject.website-docs-tor-doc-windows-pot] +[torproject.1-website-docs-tor-doc-windows-pot] file_filter = <lang>/docs/1-high.tor-doc-windows.po source_file = templates/docs/1-high.tor-doc-windows.pot source_lang = en @@ -236,7 +236,7 @@ source_file = templates/donate/3-low.donate-hardware.pot source_lang = en -[torproject.website-docs-highproxychain-pot] +[torproject.2-website-docs-highproxychain-pot] file_filter = <lang>/docs/1-high.proxychain.po source_file = templates/docs/1-high.proxychain.pot source_lang = en

1 0

r24583: {website} make sure we include the German .wmi files for German transl (website/trunk)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 14:50:21 +0000 (Mon, 11 Apr 2011) New Revision: 24583 Modified: website/trunk/po2wml.sh Log: make sure we include the German .wmi files for German translations Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-04-11 14:03:18 UTC (rev 24582) +++ website/trunk/po2wml.sh 2011-04-11 14:50:21 UTC (rev 24583) @@ -119,7 +119,7 @@ # Include the English footer for most of the # translations - if [[ $subdir != "ar" && $subdir != "pl" ]] + if [[ $subdir != "ar" && $subdir != "pl" && $subdir != "de" ]] then echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile" fi @@ -153,6 +153,35 @@ echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" fi + # If the translation is German, include the + # correct header, menu files and footer + if [ $subdir = "de" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@de/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "de/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "de/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi + # If the translation is Arabic, include the # correct header, css, menu files and footer if [ $subdir = "ar" ] @@ -217,7 +246,7 @@ # Include the English footer for most of the # translations - if [[ $lang != "ar" && $lang != "pl" ]] + if [[ $lang != "ar" && $lang != "pl" && $subdir != "de" ]] then echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi @@ -250,6 +279,34 @@ echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi + # If the translation is German, include the + # correct header, menu files and footer + if [ $lang = "de" ] + then + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@de/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "de/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "de/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + # If the file is an Arabic translation, include the # correct header, css, menu files and footer if [ $lang = "ar" ]

1 0

r24582: {} deleting old file, now renamed to 1-high.index.po (translation/trunk/projects/website/po/de)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 14:03:18 +0000 (Mon, 11 Apr 2011) New Revision: 24582 Removed: translation/trunk/projects/website/po/de/3-low.index.po Log: deleting old file, now renamed to 1-high.index.po Deleted: translation/trunk/projects/website/po/de/3-low.index.po =================================================================== --- translation/trunk/projects/website/po/de/3-low.index.po 2011-04-11 13:33:34 UTC (rev 24581) +++ translation/trunk/projects/website/po/de/3-low.index.po 2011-04-11 14:03:18 UTC (rev 24582) @@ -1,273 +0,0 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR The Tor Project, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-02-12 12:19+0000\n" -"PO-Revision-Date: 2011-03-11 21:44+0000\n" -"Last-Translator: carolyn <carolyn(a)torproject.org>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/en/index.wml:12 -msgid "Tor prevents anyone from learning your location or browsing habits." -msgstr "" - -#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/en/index.wml:13 -msgid "" -"Tor is for web browsers, instant messaging clients, remote logins, and more." -msgstr "" - -#. type: Content of: <div><div><div><div><ul><li> -#: /home/runa/tor/website/en/index.wml:14 -msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android" -msgstr "" - -#. type: Content of: <div><div><div><div><h1> -#: /home/runa/tor/website/en/index.wml:16 -msgid "Anonymity Online" -msgstr "Anonymität online" - -#. type: Content of: <div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:17 -msgid "" -"Protect your privacy. Defend yourself against network surveillance and " -"traffic analysis." -msgstr "" - -#. type: Content of: <div><div><div><div><div> -#: /home/runa/tor/website/en/index.wml:20 -msgid "" -"<a href=\"<page download/download>\"> <span class=\"download-tor\">Download " -"Tor</span></a>" -msgstr "" -"<a href=\"<page download/download>\"> <span class=\"download-tor\">Lade Tor " -"herunter</span></a>" - -#. type: Content of: <div><div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:26 -msgid "What is Tor?" -msgstr "Was ist Tor?" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:26 -msgid "" -"Tor is free software and an open network that helps you defend against a " -"form of network surveillance that threatens personal freedom and privacy, " -"confidential business activities and relationships, and state security known" -" as <a href=\"<page about/overview>\">traffic analysis</a><br><span " -"class=\"continue\"><a href=\"<page about/overview>\">Learn more about Tor " -"»</a></span>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:36 -msgid "Why Anonymity Matters" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:37 -msgid "" -"Tor protects you by bouncing your communications around a distributed " -"network of relays run by volunteers all around the world: it prevents " -"somebody watching your Internet connection from learning what sites you " -"visit, and it prevents the sites you visit from learning your physical " -"location. Tor works with many of your existing applications, including web " -"browsers, instant messaging clients, remote login, and other applications " -"based on the TCP protocol.<br><span class=\"continue\"><a href=\"<page " -"getinvolved/volunteer>\">Get involved with Tor »</a></span>" -msgstr "" - -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:50 -msgid "Our Projects" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td> -#: /home/runa/tor/website/en/index.wml:55 -msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><h3> -#: /home/runa/tor/website/en/index.wml:56 -msgid "<a href=\"<page torbutton/index>\">Torbutton</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:57 -msgid "" -"Torbutton is a 1-click way for Firefox users to enable or disable Tor in " -"Firefox." -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td> -#: /home/runa/tor/website/en/index.wml:61 -msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><h3> -#: /home/runa/tor/website/en/index.wml:62 -msgid "<a href=\"https://check.torproject.org\">Check</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:63 -msgid "Check determines if you are successfully browsing with Tor." -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td> -#: /home/runa/tor/website/en/index.wml:69 -msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><h3> -#: /home/runa/tor/website/en/index.wml:70 -msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:71 -msgid "" -"Vidalia is a graphical way to control and view Tor's connections and " -"settings." -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td> -#: /home/runa/tor/website/en/index.wml:75 -msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><h3> -#: /home/runa/tor/website/en/index.wml:76 -msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:78 -msgid "" -"Tor Browser contains everything you need to safely browse the Internet." -msgstr "" - -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:90 -msgid "Who Uses Tor?" -msgstr "Wer benutzt Tor?" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:93 -msgid "" -"<a href=\"<page about/torusers>#normalusers\"><img " -"src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\"> Family & " -"Friends</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:96 -msgid "" -"People like you and your family use Tor to protect themselves, their " -"children, and their dignity while using the Internet." -msgstr "" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:100 -msgid "" -"<a href=\"<page about/torusers>#executives\"><img " -"src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\"> Businesses</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:103 -msgid "" -"Businesses use Tor to research competition, keep business strategies " -"confidential, and facilitate internal accountability." -msgstr "" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:107 -msgid "" -"<a href=\"<page about/torusers>#activists\"><img " -"src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists & Whistleblowers\"> " -"Activists</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:110 -msgid "" -"Activists use Tor to anonymously report abuses from danger zones. " -"Whistleblowers use Tor to safely report on corruption." -msgstr "" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:114 -msgid "" -"<a href=\"<page about/torusers>#journalist\"><img " -"src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\"> Media</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:117 -msgid "" -"Journalists and the media use Tor to protect their research and sources " -"online." -msgstr "" - -#. type: Content of: <div><div><div><div><div><h3> -#: /home/runa/tor/website/en/index.wml:121 -msgid "" -"<a href=\"<page about/torusers>#military\"><img " -"src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law Enforcement\"> " -"Military & Law Enforcement</a>" -msgstr "" - -#. type: Content of: <div><div><div><div><div><p> -#: /home/runa/tor/website/en/index.wml:124 -msgid "" -"Militaries and law enforcement use Tor to protect their communications, " -"investigations, and intelligence gathering online." -msgstr "" - -#. type: Content of: <div><div><div><div><h2> -#: /home/runa/tor/website/en/index.wml:128 -msgid "Announcements" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><div> -#: /home/runa/tor/website/en/index.wml:133 -msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:134 -msgid "" -"Tor helping with Egypt. Here's what we've learned <a " -"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent " -"events in Egypt</a>. And we're keeping our <a href=\"<page " -"press/inthemedia>\">In the media</a> page up to date with stories about how " -"we're helping around the world." -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><div> -#: /home/runa/tor/website/en/index.wml:140 -msgid "<span class=\"month\">Jan</span><br><span class=\"day\">17</span>" -msgstr "" - -#. type: Content of: <div><div><div><div><table><tr><td><p> -#: /home/runa/tor/website/en/index.wml:141 -msgid "" -"The latest stable Tor version, 0.2.1.29, is <a " -"href=\"http://archives.seul.org/or/announce/Jan-2011/msg00000.html\">released</a>." -" Tor 0.2.1.29 continues our recent code security audit work. The main fix " -"resolves a remote heap overflow vulnerability that can allow remote code " -"execution. Other fixes address a variety of assert and crash bugs, most of " -"which we think are hard to exploit remotely. All Tor users should upgrade." -msgstr ""

1 0

r24581: {} add german translation of navigation.wmi (and some other non (in website/trunk: . de include include/de)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 13:33:34 +0000 (Mon, 11 Apr 2011) New Revision: 24581 Added: website/trunk/de/ website/trunk/de/navigation.wmi website/trunk/include/de/ website/trunk/include/de/foot.wmi website/trunk/include/de/head.wmi website/trunk/include/de/info.wmi website/trunk/include/de/navigation.wmi website/trunk/include/de/side.wmi Log: add german translation of navigation.wmi (and some other non-translated .wmi files) Added: website/trunk/de/navigation.wmi =================================================================== --- website/trunk/de/navigation.wmi (rev 0) +++ website/trunk/de/navigation.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,25 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Startseite', + 'about/overview' , '�ber Tor', + 'docs/documentation' , 'Dokumentation', + 'projects/projects' , 'Projekte', + 'press/press' , 'Presse', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Shop', + ); + my @calltoaction = ( + 'download/download' , 'Download', + 'donate/donate' , 'Spenden', + 'getinvolved/volunteer' , 'Sich Engagieren', + ); + +:> + Added: website/trunk/include/de/foot.wmi =================================================================== --- website/trunk/include/de/foot.wmi (rev 0) +++ website/trunk/include/de/foot.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,131 @@ +#!/usr/bin/env wml +#use "functions.wmi" + + <div id="footer"> + <div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div> + <div class="about"> + <p>"Tor" and the "Onion Logo" are registered trademarks of + <a href="<page docs/trademark-faq>">The Tor Project, Inc.</a> + Content on this site is licensed under a <a + href="http://creativecommons.org/licenses/by/3.0/us/">Creative + Commons Attribution 3.0 United States License</a>, unless + otherwise noted.</p> + + </div> +  +  + <div class="col first"> + <h4>About Tor</h4> + <ul> + <li><a href="<page about/overview>">What Tor Does</a></li> + <li><a href="<page about/torusers>">Users of Tor</a></li> + <li><a href="<page about/corepeople>">Core Tor People</a></li> + <li><a href="<page about/sponsors>">Sponsors</a></li> + <li><a href="<page about/contact>">Contact Us</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Get Involved</h4> + <ul> + <li><a href="<page donate/donate>">Donate</a></li> + <li><a href="<page docs/documentation>#MailingLists">Mailing List</a></li> + <li><a href="<page getinvolved/mirrors>">Mirrors</a></li> + <li><a href="<page docs/hidden-services>">Hidden Services</a></li> + <li><a href="<page getinvolved/translation>">Translations</a></li> + <li><a href="<page getinvolved/open-positions>">Careers</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Documentation</h4> + <ul> + <li><a href="<page docs/tor-manual>">Manuals</a></li> + <li><a href="<page docs/documentation>">Installation Guides</a></li> + <li><a href="<wiki>">Tor Wiki</a></li> + <li><a href="<page docs/faq>">General Tor FAQ</a></li> + </ul> + </div> +  + +  + <div class="col wider"> + <h4>Languages</h4> + <: if (has_translations()) { :> + <p> + This page is also available in the following languages: + <: print list_translations() :>.<br /> + How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>. + </p> + <: }; :> + </div> + + + </div> +  + + </div> +  +</body> +</html> Added: website/trunk/include/de/head.wmi =================================================================== --- website/trunk/include/de/head.wmi (rev 0) +++ website/trunk/include/de/head.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,142 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "navigation.wmi" + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>$(TITLE)</title> + <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico"> + <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> + <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> + <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" +type="application/rss+xml">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> + <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> + + #<link href="css/master.css" rel="stylesheet" type="text/css"> +  +  +# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # end WML to generate css/js paths + + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> +</head> +<body> +<div id="wrap"> + <div id="header"> + <h1 id="logo"><a href="<page index>">Tor</a></h1> + # navigation menu generation + <div id="nav"> + <ul> + <:{ + # create a hash and maintain order of keys + my %navigation; + my @keys; + while (@navigation) { + my $key = shift @navigation; + my $val = shift @navigation; + push @keys, $key; + $navigation{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory of active link, set class active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + + # translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; + } + # english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key}; + } + # full url + elsif ($key =~/^http/) { + printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to +docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + # end navigation generation + <div id="calltoaction"> + <ul> + <:{ + my %calltoaction; + my @keys; + while (@calltoaction) { + my $key = shift @calltoaction; + my $val = shift @calltoaction; + push @keys, $key; + $calltoaction{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory, set active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + #if ($WML_SRC_BASENAME eq $base) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + # try to use a translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; + } + # default to english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + </div> +  + +#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> +#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>."> Added: website/trunk/include/de/info.wmi =================================================================== --- website/trunk/include/de/info.wmi (rev 0) +++ website/trunk/include/de/info.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,10 @@ +#!/usr/bin/env wml +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="bulb">Tor Tip</h2> + <p>Tor is written for and supported by people like you. <a href="<page +donate/donate>">Donate today</a>!</p> + </div> +  +</div> + Added: website/trunk/include/de/navigation.wmi =================================================================== --- website/trunk/include/de/navigation.wmi (rev 0) +++ website/trunk/include/de/navigation.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,25 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Startseite', + 'about/overview' , '�ber Tor', + 'docs/documentation' , 'Dokumentation', + 'projects/projects' , 'Projekte', + 'press/press' , 'Presse', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Shop', + ); + my @calltoaction = ( + 'download/download' , 'Download', + 'donate/donate' , 'Spenden', + 'getinvolved/volunteer' , 'Sich Engagieren', + ); + +:> + Added: website/trunk/include/de/side.wmi =================================================================== --- website/trunk/include/de/side.wmi (rev 0) +++ website/trunk/include/de/side.wmi 2011-04-11 13:33:34 UTC (rev 24581) @@ -0,0 +1,91 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "sidenav.wmi" +<div class="img-shadow"> + <div id="sidenav"> + <: + # recursively search menu structure to see if it contains a given page + sub containsSub($$); + sub containsSub($$) { + my ($elements, $page) = @_; + for my $ele (@{$elements}) { + if (containsSub($ele->{'subelements'},$page)){ + return 1; + } elsif ($page eq $ele->{'url'}) { + return 1; + } + + } + return 0; + } + + # generate navigation menu + sub printNavMenu($$$); + sub printNavMenu($$$) { + my ($navmenu, $page, $lang) = @_; + print '<ul>'."\n"; + for my $navmenu (@{$navmenu}) { + # this menu entry is the current (active) page + if ($navmenu->{'url'} eq $page) { + + # the current page has nested menu elements + if ($navmenu->{'subelements'}) { # menu has dropdown + printf '<li class="dropdown active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; + + # the current (active) page does not have sub elements + } else { + printf '<li class="active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + + # a subelement of this menu item is the current (active) page + } elsif (containsSub($navmenu->{'subelements'}, $page)) { + printf '<li class="dropdown"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; #encapsulate subelements + # recurse to generate the expanded menu + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; #encapsulate subelements + + # the menu entry is not active and does not enclose the active page + } else { + + # if there are subelements, set collapsed style + if ($navmenu->{'subelements'}) { + printf '<li class="dropdown"><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + # regular menu entry + } else { + printf '<li><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + } + } + print '</ul>'."\n"; + } + + my $lang = "$(LANG)"; + + use Cwd; + use Cwd 'abs_path'; + use File::Spec; + + # get document path from site root + my $path = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)")); + my $page = $WML_SRC_BASENAME; + printNavMenu($sidenav, $path.'/'.$page, $lang); + :> + </div> +  +</div> +

1 0

[torperf/master] Update analyze_guards.py to take multiple .extradata files.
by karsten＠torproject.org 11 Apr '11

11 Apr '11

commit 31dc1db35befd0283b6e069cc33557537b590888 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Apr 8 02:19:52 2011 -0700 Update analyze_guards.py to take multiple .extradata files. --- analyze_guards.py | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/analyze_guards.py b/analyze_guards.py index 365d658..8d528f7 100755 --- a/analyze_guards.py +++ b/analyze_guards.py @@ -1,20 +1,13 @@ #!/usr/bin/python # -# This script takes a list of $idhex=nickname OR nickname=idhex lines and -# prints out min, avg, dev, max statistics based on the current consensus. +# This script takes a list of extradata files and tells you some statistics +# about the guard selection used by checking against the current consensus. # -# Be sure to include ratio in the filenames of idhexes that are supposedly -# chosen by consensus to descriptor ratio values. +# Use the script like this: +# ./analyze_guards.py slowratio50kb.extradata slowratio1mb50kb.extradata # -# Here is an example scriptlet for extracting the guards from an extrainfo -# file: -# awk '{ print $3; }' < torperfslowratio-50kb.extradata > slowratio50kb.extra -# -# Use this result like this: -# ./analyze_guards.py slowratio50kb.extra -# -# It should then print out ranking stats. Use your brain to determine if these -# stats make sense for the run you selected. +# It should then print out ranking stats one per file. Use your brain to +# determine if these stats make sense for the run you selected. import sys import math @@ -51,23 +44,29 @@ def analyze_list(router_map, idhex_list): return (min_rank, avg, math.sqrt(varience/(len(idhex_list)-absent-1)), max_rank, absent) -def main(): - f = file(sys.argv[1], "r") +def process_file(router_map, file_name): + f = file(file_name, "r") idhex_list = f.readlines() + guard_list = [] for i in xrange(len(idhex_list)): - if "~" in idhex_list[i]: char = "~" - else: char = "=" + line = idhex_list[i].split() + path = None + used = False + for word in line: + if word.startswith("PATH="): path = word[5:] + if word.startswith("USED_BY"): used = True + + if path and used: + guard = path.split(",") + guard_list.append(guard[0]) - split = idhex_list[i].split(char) + print "Guard rank stats (min, avg, dev, total, absent): " + print file_name + ": " + str(analyze_list(router_map, guard_list)) - if split[0][0] == "$": - idhex_list[i] = split[0] - else: - idhex_list[i] = "$"+split[1] +def main(): c = TorCtl.TorCtl.connect(HOST, PORT) - nslist = c.get_network_status() sorted_rlist = filter(lambda r: r.desc_bw > 0, c.read_routers(c.get_network_status())) router_map = {} for r in sorted_rlist: router_map["$"+r.idhex] = r @@ -88,8 +87,9 @@ def main(): for i in xrange(len(sorted_rlist)): sorted_rlist[i].list_rank = i - print "Guard rank stats (min, avg, dev, total, absent): " - print str(analyze_list(router_map, idhex_list)) + for file_name in sys.argv[1:]: + process_file(router_map, file_name) + if __name__ == '__main__': main()

1 0