commit a9bec460af27f75182b63770997df4f68ad84c57 Author: David Fifield david@bamsoftware.com Date: Fri Jun 17 01:25:55 2011 -0700
Remove CIRRUS_KEY.
The Cumulus server doesn't need a development key. --- Makefile | 2 +- README | 4 ---- RTMFPSocket.as | 2 +- swfcat.as | 8 ++------ 4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile index 6c11397..ed799c6 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ all: $(TARGETS) swfcat.swf: *.as badge.png
%.swf: %.as - $(MXMLC) -output $@ -static-link-runtime-shared-libraries -define=RTMFP::CIRRUS_KEY,"$(CIRRUS_KEY)" $< + $(MXMLC) -output $@ -static-link-runtime-shared-libraries $<
clean: rm -f $(TARGETS) diff --git a/README b/README index a086aa6..773d3cb 100644 --- a/README +++ b/README @@ -32,10 +32,6 @@ Download the (free software) Flex SDK. http://opensource.adobe.com/wiki/display/flexsdk/Flex+SDK Put its bin directory in your PATH. The important executable is mxmlc.
-For RTMFP support, you need a Cirrus developer key from Adobe. Put it in -the environment variable CIRRUS_KEY so it can be found by Makefile. - $ export CIRRUS_KEY=XXXXXXXXXXXXXXXXXXXXXXXX-YYYYYYYYYYYY - To build, run $ make Copy the resulting swfcat.swf file to a web server. diff --git a/RTMFPSocket.as b/RTMFPSocket.as index e23c4fd..49c297b 100644 --- a/RTMFPSocket.as +++ b/RTMFPSocket.as @@ -50,7 +50,7 @@ package private var cirrus_url:String; private var cirrus_key:String;
- public function RTMFPSocket(cirrus_url:String, cirrus_key:String) + public function RTMFPSocket(cirrus_url:String, cirrus_key:String = "") { connected = false;
diff --git a/swfcat.as b/swfcat.as index dda7a1a..4d69449 100644 --- a/swfcat.as +++ b/swfcat.as @@ -18,11 +18,7 @@ package
public class swfcat extends Sprite { - /* 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://tor-facilitator.bamsoftware.com"; - private const CIRRUS_KEY:String = RTMFP::CIRRUS_KEY;
private const DEFAULT_FACILITATOR_ADDR:Object = { host: "tor-facilitator.bamsoftware.com", @@ -201,7 +197,7 @@ package { var rs:RTMFPSocket;
- rs = new RTMFPSocket(CIRRUS_URL, CIRRUS_KEY); + rs = new RTMFPSocket(CIRRUS_URL); rs.addEventListener(Event.COMPLETE, function (e:Event):void { puts("Got RTMFP id " + rs.id); register(rs); @@ -286,7 +282,7 @@ package }
if (client_spec.match(/^[0-9A-Fa-f]{64}$/)) { - s_c = new RTMFPSocket(CIRRUS_URL, CIRRUS_KEY); + s_c = new RTMFPSocket(CIRRUS_URL); s_r = new Socket(); proxy_pair = new ProxyPair(this, s_c, function ():void { s_c.connect(client_spec);