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

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Mar '13

02 Mar '13

commit e07baaf11afe338b4bd43e88dbbfe6c9aa982ff7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 2 13:45:58 2013 +0000 Update translations for liveusb-creator --- de/de.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/de/de.po b/de/de.po index 818cf9b..349ec9a 100644 --- a/de/de.po +++ b/de/de.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <benni(a)include-benni.de>, 2013. # <benni(a)include-benni.de>, 2012. # Cornelius Neckenig <tbull(a)fedoraproject.org>, 2009. # Marcus Nitzschke <marcusni(a)gmx.de>, 2008. @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-02-28 05:00+0000\n" -"Last-Translator: Sacro <Scion(a)T-Online.de>\n" +"PO-Revision-Date: 2013-03-02 13:44+0000\n" +"Last-Translator: cyberfork <benni(a)include-benni.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -344,7 +345,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "" +msgstr "Mit diesem Button können Sie ein zuvor heruntergeladenes Live System ISO auswählen. Sollten Sie keines auswählen, wird für Sie automatisch eine Version heruntergeladen." #: ../liveusb/dialog.py:164 msgid "" @@ -470,7 +471,7 @@ msgstr "Nicht unterstütztes Dateisystem: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "" +msgstr "Nicht unterstütztes Dateisystem: %s \nSollten Sie versuchen ein Upgrade eines manuell installierten Tails Systems durchzuführen ( das bedeutet, sollten Sie das System ohne diese Installationsroutine installiert haben), gibt es dafür keine unterstützung: Sie müssen es erneut installieren, indem Sie den Menüpunkt \"Clone & Install\" auswählen." #: ../liveusb/creator.py:1211 #, python-format

1 0

[flashproxy/master] Use console.log, not console.debug, in Internet Explorer.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 8ad7433d63bc96e7295b4127b4d9aece69287e24 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 2 02:01:04 2013 -0800 Use console.log, not console.debug, in Internet Explorer. IE doesn't appear to have console.debug. --- proxy/flashproxy.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 193dba3..bf3fce9 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -94,8 +94,9 @@ function puts(s) { if (debug_div) { var at_bottom; - /* This shows up in the Web Console in Firefox. */ - console.debug(s); + /* This shows up in the Web Console in Firefox and F12 developer tools + in Internet Explorer. */ + (console.debug || console.log).call(console, s); /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ at_bottom = (debug_div.scrollTop + debug_div.clientHeight === debug_div.scrollHeight);

1 0

[flashproxy/master] Use the IPv4 address of tor1.bamsoftware.com in init script.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit cf6d7cf34b77cd6c229f7c2c894c222e925efdc4 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 2 01:28:31 2013 -0800 Use the IPv4 address of tor1.bamsoftware.com in init script. Otherwise, the host running the facilitator may resolve it as its IPv6 address [2600:3c01::f03c:91ff:fe93:6cd2], and start giving that relay address to proxies. Many fewer proxies will be able to connect to the IPv6 address than the IPv4. --- facilitator/init.d/facilitator | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/facilitator/init.d/facilitator b/facilitator/init.d/facilitator index 5228d1d..8780ff0 100755 --- a/facilitator/init.d/facilitator +++ b/facilitator/init.d/facilitator @@ -15,7 +15,8 @@ # Based on /etc/init.d/skeleton from Debian 6. # The relay must support the websocket pluggable transport. -RELAY=tor1.bamsoftware.com:9901 +# This is the IPv4 address of tor1.bamsoftware.com. +RELAY=173.255.221.44:9901 PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Flash proxy facilitator"

1 0

[flashproxy/master] ChangeLog for check-back-in.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit cf9d73f3a791a7d617358bf7400c895fd6a30c81 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 2 01:25:21 2013 -0800 ChangeLog for check-back-in. --- ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42d0735..e582239 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,10 @@ Changes in version 0.12 reported a problem with listening on IPv6, while being able to listen on IPv4. Fixes bug 8319. + o The facilitator now returns a check-back-in parameter in its + response, telling proxies how often to poll. Fixes bug 8171. Patch + by Alexandre Allaire. + Changes in version 0.11 o Added -4 and -6 options to flashproxy-client and flashproxy-reg-http. (The options already existed in

1 0

[flashproxy/master] Get polling interval from facilitator.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit bc8f8370362167eb84fe2a1c59c998f92c105b33 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Feb 7 18:43:22 2013 -0500 Get polling interval from facilitator. Set the polling interval to be the value of the "check-back-in" parameter from facilitator responses. If the polling interval received is invalid, print an error message and keep polling at the previous rate. --- proxy/flashproxy.js | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 8cf086f..d44c2f1 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -549,10 +549,17 @@ function FlashProxy() { var client_addr; var relay_addr; - setTimeout(this.proxy_main.bind(this), this.facilitator_poll_interval * 1000); - response = parse_query_string(text); + poll_interval = get_param_timespec(response, "check-back-in", this.facilitator_poll_interval); + if (poll_interval === null || poll_interval < MIN_FACILITATOR_POLL_INTERVAL) + puts("Error: polling interval from facilitator is not a nonnegative number at least " + repr(MIN_FACILITATOR_POLL_INTERVAL) + "."); + else + this.facilitator_poll_interval = poll_interval; + puts("Polling interval: " + repr(this.facilitator_poll_interval)); + + setTimeout(this.proxy_main.bind(this), this.facilitator_poll_interval * 1000); + if (!response.client) { puts("No clients."); return;

1 0

[flashproxy/master] Increase default and minimum polling intervals.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 71e73a102aef3c32be7566795884dfaa981f343d Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Fri Feb 8 09:52:52 2013 -0500 Increase default and minimum polling intervals. Increase DEFAULT_FACILITATOR_POLL_INTERVAL to 3600 seconds and increase MIN_FACILITATOR_POLL_INTERVAL to 10 seconds. --- proxy/flashproxy.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index d44c2f1..47f5df4 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -64,8 +64,8 @@ var DEFAULT_FACILITATOR_URL = "https://tor-facilitator.bamsoftware.com/"; var DEFAULT_MAX_NUM_PROXY_PAIRS = 10; var DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL = 60.0; -var DEFAULT_FACILITATOR_POLL_INTERVAL = 600.0; -var MIN_FACILITATOR_POLL_INTERVAL = 1.0; +var DEFAULT_FACILITATOR_POLL_INTERVAL = 3600.0; +var MIN_FACILITATOR_POLL_INTERVAL = 10.0; /* Bytes per second. Set to undefined to disable limit. */ var DEFAULT_RATE_LIMIT = undefined;

1 0

[flashproxy/master] Return polling interval in get_reg().
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 6157da5a7af867ec00f14b5da32ccebb548a1818 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Feb 7 18:13:26 2013 -0500 Return polling interval in get_reg(). Check that the polling interval reveived from the facilitator is a numeric value and return it to the caller, along with client and relay specs. --- facilitator/fac.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 9d77b95..7d55221 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -217,9 +217,17 @@ def get_reg(facilitator_addr, proxy_addr): command, params = transact(f, "GET", ("FROM", format_addr(proxy_addr))) finally: f.close() + check_back_in = param_first("CHECK-BACK-IN", params) + if not check_back_in: + raise ValueError("Facilitator did not return polling interval.") + try: + float(check_back_in) + except ValueError: + raise ValueError("Facilitator returned non-numeric polling interval.") if command == "NONE": return { - "client": "" + "client": "", + "check-back-in": check_back_in, } elif command == "OK": client_spec = param_first("CLIENT", params) @@ -234,6 +242,7 @@ def get_reg(facilitator_addr, proxy_addr): return { "client": format_addr(client), "relay": format_addr(relay), + "check-back-in": check_back_in, } else: raise ValueError("Facilitator response was not \"OK\"")

1 0

[flashproxy/master] Make facilitator_poll_interval option override other settings.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit b7ff1bcd4f0a35ac7ee8c9411e7df8df44d16d3a Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Fri Feb 8 11:05:00 2013 -0500 Make facilitator_poll_interval option override other settings. If the facilitator_poll_interval option is provided, and is a valid value, it overrides the facilitator-provided interval and the default interval. If the option is missing, fall back on the facilitator interval, and absent that, the default interval. If any value is smaller than MIN_FACILITATOR_POLL_INTERVAL, that is used instead. --- proxy/flashproxy.js | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 47f5df4..6aaa211 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -461,8 +461,8 @@ function FlashProxy() { return; } - this.facilitator_poll_interval = get_param_timespec(query, "facilitator_poll_interval", DEFAULT_FACILITATOR_POLL_INTERVAL); - if (this.facilitator_poll_interval === null || this.facilitator_poll_interval < MIN_FACILITATOR_POLL_INTERVAL) { + this.facilitator_poll_interval = get_param_timespec(query, "facilitator_poll_interval", undefined); + if (this.facilitator_poll_interval !== undefined && (this.facilitator_poll_interval === null || this.facilitator_poll_interval < MIN_FACILITATOR_POLL_INTERVAL)) { puts("Error: facilitator_poll_interval must be a nonnegative number at least " + MIN_FACILITATOR_POLL_INTERVAL + "."); this.die(); return; @@ -548,17 +548,24 @@ function FlashProxy() { var response; var client_addr; var relay_addr; + var poll_interval; response = parse_query_string(text); - poll_interval = get_param_timespec(response, "check-back-in", this.facilitator_poll_interval); - if (poll_interval === null || poll_interval < MIN_FACILITATOR_POLL_INTERVAL) - puts("Error: polling interval from facilitator is not a nonnegative number at least " + repr(MIN_FACILITATOR_POLL_INTERVAL) + "."); - else - this.facilitator_poll_interval = poll_interval; - puts("Polling interval: " + repr(this.facilitator_poll_interval)); + if (this.facilitator_poll_interval) { + poll_interval = this.facilitator_poll_interval; + } else { + poll_interval = get_param_integer(response, "check-back-in", DEFAULT_FACILITATOR_POLL_INTERVAL); + if (poll_interval === null) { + puts("Error: can't parse polling interval from facilitator, " + repr(poll_interval) + "."); + poll_interval = DEFAULT_FACILITATOR_POLL_INTERVAL; + } else { + poll_interval = Math.max(poll_interval, MIN_FACILITATOR_POLL_INTERVAL); + } + } - setTimeout(this.proxy_main.bind(this), this.facilitator_poll_interval * 1000); + puts("Polling interval: " + repr(poll_interval) + "."); + setTimeout(this.proxy_main.bind(this), poll_interval * 1000); if (!response.client) { puts("No clients.");

1 0

[flashproxy/master] Send polling interval to proxies.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 28b0408f9f62405c28f59f56cd1df59d07998142 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Feb 7 18:05:33 2013 -0500 Send polling interval to proxies. Include a check "CHECK-BACK-IN" parameter in response to proxy requests, that specifies when the proxy should contact the facilitator again. Currently this value is hard coded. --- facilitator/facilitator | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 0fa33e9..715ddec 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -16,6 +16,9 @@ DEFAULT_LISTEN_PORT = 9002 DEFAULT_RELAY_PORT = 9001 DEFAULT_LOG_FILENAME = "facilitator.log" +# Tell proxies to poll for clients every POLL_INTERVAL seconds. +POLL_INTERVAL = 600 + # Don't indulge clients for more than this many seconds. CLIENT_TIMEOUT = 1.0 # Buffer no more than this many bytes when trying to read a line. @@ -255,10 +258,10 @@ class Handler(SocketServer.StreamRequestHandler): if reg: log(u"proxy gets %s, relay %s (now %d)" % (safe_str(unicode(reg)), options.relay_spec, num_regs())) - print >> self.wfile, fac.render_transaction("OK", ("CLIENT", str(reg)), ("RELAY", options.relay_spec)) + print >> self.wfile, fac.render_transaction("OK", ("CLIENT", str(reg)), ("RELAY", options.relay_spec), ("CHECK-BACK-IN", str(POLL_INTERVAL))) else: log(u"proxy gets none") - print >> self.wfile, fac.render_transaction("NONE") + print >> self.wfile, fac.render_transaction("NONE", ("CHECK-BACK-IN", str(POLL_INTERVAL))) return True def do_PUT(self, params):

1 0

[flashproxy/master] Poll interval message.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit df1b155e7d1f10b90335bb2e5bf211e108e844fe Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 2 00:56:33 2013 -0800 Poll interval message. --- proxy/flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 6cb7b48..67f0f43 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -564,7 +564,7 @@ function FlashProxy() { } } - puts("Polling interval: " + repr(poll_interval) + "."); + puts("Next check in " + repr(poll_interval) + " seconds."); setTimeout(this.proxy_main.bind(this), poll_interval * 1000); if (!response.client) {

1 0