[tor-commits] [flashproxy/master] Bypass facilitator when given "client" and "relay"

[dcf@xxxxxxxxxxxxxx]

commit 2adb6d5745534b7d274b7297e21f15d538b31456
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Fri May 31 12:25:21 2013 -0700

    Bypass facilitator when given "client" and "relay"
    
    Proxy should not contact facilitator if given "relay" and "client"
    parameters.
    
    Fixes #9006
---
 ChangeLog           |    4 ++++
 proxy/flashproxy.js |    1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 791224c..edd92a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,10 @@
     meant to reduce the number of connections to the relay when clients
     haven't set up port forwarding. Introduced bug 9009, later fixed. 
 
+  o A proxy no longer contacts the facilitator when it is given the
+    "client" and "relay" parameters. It serves the one given client and
+    then stops. Patch by Arlo Breault. Fixes bug 9006.
+
 Changes in version 1.1
   o Programs that use certificate pins now take a --disable-pin option
     that causes pins to be ignored.
diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js
index cb54f23..8a70c60 100644
--- a/proxy/flashproxy.js
+++ b/proxy/flashproxy.js
@@ -522,6 +522,7 @@ function FlashProxy() {
         }
         if (client_addr !== undefined && relay_addr !== undefined) {
             this.begin_proxy(client_addr, relay_addr);
+            return;
         } else if (client_addr !== undefined) {
             puts("Error: the \"client\" parameter requires \"relay\" also.")
             this.die();

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits