[tor-commits] [flashproxy/master] Change from PROXY_TRANSPORT to PROXY-TRANSPORT.

[infinity0 at torproject.org]

commit 3666cf28ad9102d7cd7bb700b8a3b01c8b45ac1d
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Oct 26 21:28:03 2013 -0700

    Change from PROXY_TRANSPORT to PROXY-TRANSPORT.
    
    This was suggested by Ximin. It now matches CHECK-BACK-IN,
    CLIENT-TRANSPORT, and RELAY-TRANSPORT.
---
 facilitator/fac.py      |    4 ++--
 facilitator/facilitator |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/facilitator/fac.py b/facilitator/fac.py
index d7d108e..0d1a9f6 100644
--- a/facilitator/fac.py
+++ b/facilitator/fac.py
@@ -341,8 +341,8 @@ def get_reg(facilitator_addr, proxy_addr, proxy_transport_list):
     # Form a list (in transact() format) with the transports that we
     # should send to the facilitator.  Then pass that list to the
     # transact() function.
-    # For example, PROXY_TRANSPORT=obfs2 PROXY_TRANSPORT=obfs3.
-    transports = [("PROXY_TRANSPORT", tp) for tp in proxy_transport_list]
+    # For example, PROXY-TRANSPORT=obfs2 PROXY-TRANSPORT=obfs3.
+    transports = [("PROXY-TRANSPORT", tp) for tp in proxy_transport_list]
 
     try:
         command, params = transact(f, "GET", ("FROM", format_addr(proxy_addr)), *transports)
diff --git a/facilitator/facilitator b/facilitator/facilitator
index 526e8e2..ebce31b 100755
--- a/facilitator/facilitator
+++ b/facilitator/facilitator
@@ -282,7 +282,7 @@ class Handler(SocketServer.StreamRequestHandler):
         return False
 
     # Handle a GET request (got flashproxy poll; need to return a proper client registration)
-    # Example: GET FROM="3.3.3.3:3333" PROXY_TRANSPORT="websocket" PROXY_TRANSPORT="webrtc"
+    # Example: GET FROM="3.3.3.3:3333" PROXY-TRANSPORT="websocket" PROXY-TRANSPORT="webrtc"
     def do_GET(self, params):
         proxy_spec = fac.param_first("FROM", params)
         if proxy_spec is None:
@@ -292,9 +292,9 @@ class Handler(SocketServer.StreamRequestHandler):
         except ValueError, e:
             return self.error(u"syntax error in proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e)))))
 
-        transport_list = fac.param_getlist("PROXY_TRANSPORT", params)
+        transport_list = fac.param_getlist("PROXY-TRANSPORT", params)
         if not transport_list:
-            return self.error(u"GET missing PROXY_TRANSPORT param")
+            return self.error(u"GET missing PROXY-TRANSPORT param")
 
         try:
             client_reg, relay_reg = get_match_for_proxy(proxy_addr, transport_list)