[tor-commits] [flashproxy/master] Send a protocol revision number (r=1) in polling messages.

[dcf at torproject.org]

commit a9c43cf5a047fafda30be5b6716748e19cdcaeff
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Sep 10 21:28:28 2012 -0700

    Send a protocol revision number (r=1) in polling messages.
    
    This will be used to distinguish proxies that send their list of clients
    from those that don't.
---
 proxy/flashproxy.js |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js
index 237c629..63413fc 100644
--- a/proxy/flashproxy.js
+++ b/proxy/flashproxy.js
@@ -533,6 +533,8 @@ function FlashProxy() {
     };
 
     this.proxy_main = function() {
+        var params;
+        var url;
         var xhr;
 
         if (this.proxy_pairs.length >= this.max_num_proxy_pairs) {
@@ -540,9 +542,12 @@ function FlashProxy() {
             return;
         }
 
+        /* Flash proxy protocol revision. */
+        params = [["r", "1"]];
+        url = this.fac_url.replace(/\?.*/, "") + "?" + build_query_string(params);
         xhr = new XMLHttpRequest();
         try {
-            xhr.open("GET", this.fac_url);
+            xhr.open("GET", url);
         } catch (err) {
             /* An exception happens here when, for example, NoScript allows the
                domain on which the proxy badge runs, but not the domain to which
@@ -562,7 +567,7 @@ function FlashProxy() {
                     puts("Facilitator: can't connect: got status " + repr(xhr.status) + " and status text " + repr(xhr.statusText) + ".");
             }
         }.bind(this);
-        puts("Facilitator: connecting to " + this.fac_url + ".");
+        puts("Facilitator: connecting to " + url + ".");
         xhr.send(null);
     };