[tor-commits] [flashproxy/master] Use our own RTMFP server instead of Adobe's.

[dcf at torproject.org]

commit 750a8faf9db4e19c45fb2a9962789114279ea322
Author: David Fifield <david at bamsoftware.com>
Date:   Fri Jun 17 01:20:30 2011 -0700

    Use our own RTMFP server instead of Adobe's.
    
    The free Cumulus server works as a replacement for the Adobe RTMFP
    rendezvous server at rtmfp://p2p.rtmfp.net. By running this on the
    facilitator we cut out Adobe and reduce the number of trusted parties by
    one. The facilitator gains some information it didn't have before:
    though RTMFP data goes directly between endpoints, the RTMFP server
    seems to get periodic heartbeat messages while the connection is
    ongoing.
---
 README    |    6 +++---
 swfcat.as |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index ccde8b9..a086aa6 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ There are five main parts. Our terminology for each part is in quotes.
    must also serve a Flash crossdomain policy.
 
 A proxy is capable of connecting to a client in two ways: Using a normal
-TCP connection, or over Adobe RTMFP, which involves a third party but is
+TCP connection; or over RTMFP, which requires Flash on the client but is
 capable of traversing NAT.
 
 == Demonstration page
@@ -58,8 +58,8 @@ which facilitator to use, for example
 There are two ways in which the client can receive connections: over TCP
 or RTMFP. TCP doesn't send traffic to anyone other than the facilitator
 and the proxy, but it only works if you have a public IP address. RTMFP
-coordinates connections using a server controlled by Adobe, but works
-when the client is behind a NAT.
+coordinates connections using another server (which may be the same as
+the facilitator) and works when the client is behind a NAT.
 
 To connect with TCP, run
 	./connector.py -f <facilitator-ip>
diff --git a/swfcat.as b/swfcat.as
index 67d60a0..dda7a1a 100644
--- a/swfcat.as
+++ b/swfcat.as
@@ -21,7 +21,7 @@ package
         /* Adobe's Cirrus server for RTMFP connections.
            The Cirrus key is defined at compile time by
            reading from the CIRRUS_KEY environment var. */
-        private const CIRRUS_URL:String = "rtmfp://p2p.rtmfp.net";
+        private const CIRRUS_URL:String = "rtmfp://tor-facilitator.bamsoftware.com";
         private const CIRRUS_KEY:String = RTMFP::CIRRUS_KEY;
 
         private const DEFAULT_FACILITATOR_ADDR:Object = {