[tor-commits] [flashproxy/master] Use new-window to open RTMFP clients.

[dcf at torproject.org]

commit 4043f75c01779cfb82c003e77c4db23615d1bff0
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Jul 18 06:04:28 2011 +0000

    Use new-window to open RTMFP clients.
---
 RTMFPSocket.as |    9 ++++++---
 experiments/00 |    3 +--
 experiments/01 |    4 ++--
 swfcat.as      |    2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/RTMFPSocket.as b/RTMFPSocket.as
index 9dca232..e91d06d 100644
--- a/RTMFPSocket.as
+++ b/RTMFPSocket.as
@@ -183,9 +183,12 @@ package
 
         public function close():void
         {
-            outgoing.close();
-            incoming.close();
-            nc.close();
+            if (outgoing)
+                outgoing.close();
+            if (incoming)
+                incoming.close();
+            if (nc)
+                nc.close();
         }
 
         public function readBytes(output:ByteArray, offset:uint = 0, length:uint = 0):void
diff --git a/experiments/00 b/experiments/00
index ecc8c48..bc4befb 100755
--- a/experiments/00
+++ b/experiments/00
@@ -60,9 +60,8 @@ echo "getting the dump file..."
 i=2
 until [ $i -gt $NUM_CLIENTS ]; do
     let local_port=2000+i
-    gnome-terminal -e "/bin/bash -c 'wget -t1 http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'"
+    xterm -e "/bin/bash -c 'wget -t1 http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'" &
     let i=i+1
-    sleep 2
 done
 
 # Use this one for delaying the termination of experiment below
diff --git a/experiments/01 b/experiments/01
index ff0179d..0c273e7 100755
--- a/experiments/01
+++ b/experiments/01
@@ -42,14 +42,14 @@ echo "starting flash proxy client side..."
 i=1
 until [ $i -gt $NUM_CLIENTS ]; do
     let local_port=9000+i
-    firefox --remote "openURL(http://localhost:1080/swfcat.swf?local=127.0.0.1:${local_port}&client=1&facilitator=127.0.0.1:4701)"
+    firefox --remote "openURL(http://localhost:1080/swfcat.swf?local=127.0.0.1:${local_port}&client=1&facilitator=127.0.0.1:4701,new-window)"
     let i=i+1
     sleep 2
 done
 
 # Start the flash proxy, server side
 echo "starting flash proxy server side..."
-firefox --remote "openURL(http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701)"
+firefox --remote "openURL(http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701,new-window)"
 
 let query_fac_time=NUM_CLIENTS+2
 sleep ${query_fac_time}
diff --git a/swfcat.as b/swfcat.as
index c93c154..9f3f967 100644
--- a/swfcat.as
+++ b/swfcat.as
@@ -31,7 +31,7 @@ package
             port: 9002
         };
 
-        private const MAX_NUM_PROXY_PAIRS:uint = 10;
+        private const MAX_NUM_PROXY_PAIRS:uint = 100;
 
         // Milliseconds.
         private const FACILITATOR_POLL_INTERVAL:int = 1000;