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

[flashproxy/master] Remove superfluous undefined default value.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit a505a975c5a2704794770dcb092e26889f54afd9 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 2 00:52:40 2013 -0800 Remove superfluous undefined default value. --- proxy/flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 6aaa211..6cb7b48 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -461,7 +461,7 @@ function FlashProxy() { return; } - this.facilitator_poll_interval = get_param_timespec(query, "facilitator_poll_interval", undefined); + this.facilitator_poll_interval = get_param_timespec(query, "facilitator_poll_interval"); 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();

1 0

[flashproxy/master] Do not fail if facilitator doesn't provide a polling interval.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 130fe4ff0ff52192c390b5157fd45eb75579d1d2 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Fri Feb 8 11:10:55 2013 -0500 Do not fail if facilitator doesn't provide a polling interval. Do not raise an exception in get_reg() if the facilitator doesn't provide a polling interval. --- facilitator/fac.py | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 7d55221..357009c 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -217,18 +217,17 @@ def get_reg(facilitator_addr, proxy_addr): command, params = transact(f, "GET", ("FROM", format_addr(proxy_addr))) finally: f.close() + response = {} 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 check_back_in is not None: + try: + float(check_back_in) + except ValueError: + raise ValueError("Facilitator returned non-numeric polling interval.") + response["check-back-in"] = check_back_in if command == "NONE": - return { - "client": "", - "check-back-in": check_back_in, - } + response["client"] = "" + return response elif command == "OK": client_spec = param_first("CLIENT", params) relay_spec = param_first("RELAY", params) @@ -239,10 +238,8 @@ def get_reg(facilitator_addr, proxy_addr): # Check the syntax returned by the facilitator. client = parse_addr_spec(client_spec) relay = parse_addr_spec(relay_spec) - return { - "client": format_addr(client), - "relay": format_addr(relay), - "check-back-in": check_back_in, - } + response["client"] = format_addr(client) + response["relay"] = format_addr(relay) + return response else: raise ValueError("Facilitator response was not \"OK\"")

1 0

[flashproxy/master] Rewrite MIN_FACILITATOR_POLL_INTERVAL test and move out of else.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 53d44969a50590b4e35ec28d3c69cfaebe5e76ca Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 2 00:58:33 2013 -0800 Rewrite MIN_FACILITATOR_POLL_INTERVAL test and move out of else. --- proxy/flashproxy.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 67f0f43..c662f73 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -559,9 +559,9 @@ function FlashProxy() { 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); } + if (poll_interval < MIN_FACILITATOR_POLL_INTERVAL) + poll_interval = MIN_FACILITATOR_POLL_INTERVAL; } puts("Next check in " + repr(poll_interval) + " seconds.");

1 0

[flashproxy/master] Add a test for presence of CHECK-BACK-IN.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit be11569d8090e4d015819217141727f4aeccd3c2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 2 01:12:35 2013 -0800 Add a test for presence of CHECK-BACK-IN. --- facilitator/facilitator-test | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index fd12ebe..455aa3f 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -87,6 +87,12 @@ class FacilitatorTest(unittest.TestCase): reg = fac.get_reg(FACILITATOR_ADDR, self.IPV6_PROXY_ADDR) self.assertEqual(reg["client"], fac.format_addr(self.IPV6_CLIENT_ADDR)) + def test_check_back_in(self): + """Test that facilitator responses contain a CHECK-BACK-IN key with a + numeric value.""" + reg = fac.get_reg(FACILITATOR_ADDR, self.IPV6_PROXY_ADDR) + self.assertGreater(int(reg["check-back-in"]), 0) + # def test_same_proxy(self): # """Test that the same proxy doesn't get the same client when asking # twice."""

1 0

[flashproxy/master] Slightly abstract the facilitator polling interval.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 4f8e1e19b3b29c13bd6ed2f6fdb0924db393f098 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 2 01:16:29 2013 -0800 Slightly abstract the facilitator polling interval. --- facilitator/facilitator | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 715ddec..0f16620 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -255,13 +255,14 @@ class Handler(SocketServer.StreamRequestHandler): log(u"error getting reg for proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) self.send_error() return False + check_back_in = get_check_back_in_for_proxy(proxy_addr) 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), ("CHECK-BACK-IN", str(POLL_INTERVAL))) + print >> self.wfile, fac.render_transaction("OK", ("CLIENT", str(reg)), ("RELAY", options.relay_spec), ("CHECK-BACK-IN", str(check_back_in))) else: log(u"proxy gets none") - print >> self.wfile, fac.render_transaction("NONE", ("CHECK-BACK-IN", str(POLL_INTERVAL))) + print >> self.wfile, fac.render_transaction("NONE", ("CHECK-BACK-IN", str(check_back_in))) return True def do_PUT(self, params): @@ -330,6 +331,10 @@ def get_reg_for_proxy(proxy_addr): REGS = regs_for_af(af) return REGS.fetch() +def get_check_back_in_for_proxy(proxy_addr): + """Get a CHECK-BACK-IN interval suitable for this proxy.""" + return POLL_INTERVAL + def put_reg(reg): """Add a registration.""" addr_str = reg.host

1 0

[flashproxy/master] Merge branch 'poll_interval'
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit fbd9db7108ef0c9ee8209b056cb11346765c8f71 Merge: a529ed7 4f8e1e1 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 2 01:20:32 2013 -0800 Merge branch 'poll_interval' facilitator/fac.py | 20 +++++++++++++------- facilitator/facilitator | 12 ++++++++++-- facilitator/facilitator-test | 6 ++++++ proxy/flashproxy.js | 26 ++++++++++++++++++++------ 4 files changed, 49 insertions(+), 15 deletions(-)

1 0

[flashproxy/master] Remove unused pt_enverror.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 8306cf6f1836f9674d6285281a241890b7237b6d Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 1 21:29:49 2013 -0800 Remove unused pt_enverror. --- flashproxy-client | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index ed97ced..ef25d47 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -984,10 +984,6 @@ def pt_line(keyword, *args): print keyword, " ".join(pt_escape(x) for x in args) sys.stdout.flush() -def pt_enverror(msg): - pt_line("ENV-ERROR", msg) - sys.exit(1) - def pt_smethoderror(msg): pt_line("SMETHOD-ERROR", msg) sys.exit(1)

1 0

[flashproxy/master] Ignore socket.error in setting IPV6_V6ONLY.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 3f830e70acc9cb239a5b7197e6eee67d088bec0c Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 1 21:07:27 2013 -0800 Ignore socket.error in setting IPV6_V6ONLY. --- flashproxy-client | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 6fc152c..ed97ced 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -492,6 +492,10 @@ def listen_socket(addr): # http://bugs.python.org/issue6926. IPV6_V6ONLY is the default # behavior on Windows anyway, so we can skip the setsockopt. pass + except socket.error: + # Seen on Windows XP: + # socket.error: [Errno 109] Protocol not available + pass s.bind(addr) s.listen(10) return s

1 0

[flashproxy/master] Change unused pt_smethoderror to pt_cmethoderror.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit 41a5db3d91fd82b0f145fb956aa69524e1776cdd Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 1 21:30:04 2013 -0800 Change unused pt_smethoderror to pt_cmethoderror. --- flashproxy-client | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index ef25d47..c229a3f 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -984,8 +984,8 @@ def pt_line(keyword, *args): print keyword, " ".join(pt_escape(x) for x in args) sys.stdout.flush() -def pt_smethoderror(msg): - pt_line("SMETHOD-ERROR", msg) +def pt_cmethoderror(msg): + pt_line("CMETHOD-ERROR", msg) sys.exit(1) def pt_get_client_transports(known):

1 0

[flashproxy/master] ChangeLog for #8319.
by dcf＠torproject.org 02 Mar '13

02 Mar '13

commit a529ed79d9c6dfa400d3ec19de935cb813d85249 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 1 21:36:46 2013 -0800 ChangeLog for #8319. --- ChangeLog | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b13769b..42d0735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,11 @@ Changes in version 0.12 instructions in modules/mediawiki/custom.js. Contributed by Sathyanarayanan Gunasekaran. + o Make flashproxy-client ignore errors in opening listeners, as long + as at least one local and one remote listener can be opened. A user + reported a problem with listening on IPv6, while being able to + listen on IPv4. Fixes bug 8319. + 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