- tor-commits - lists.torproject.org

r24930: {website} update links to vidalia packages (website/trunk/projects/en)
by Runa Sandvik 28 Jul '11

28 Jul '11

Author: runa Date: 2011-07-28 13:56:00 +0000 (Thu, 28 Jul 2011) New Revision: 24930 Modified: website/trunk/projects/en/vidalia.wml Log: update links to vidalia packages Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2011-07-25 14:57:17 UTC (rev 24929) +++ website/trunk/projects/en/vidalia.wml 2011-07-28 13:56:00 UTC (rev 24930) @@ -58,16 +58,16 @@ <p> The most recent stable release is: 0.2.12</p> <ul> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12.exe">Windows Installer</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12.exe.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12.exe">Windows Installer</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12.exe.asc">sig</a>) </li> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-i386.dmg">Mac OS X x86 Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-i386.dmg.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg">Mac OS X x86 Only</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg.asc">sig</a>) </li> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-ppc.dmg">Mac OS X PPC Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-ppc.dmg.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg">Mac OS X PPC Only</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.30-rc-0.2.12-i386.dmg.asc">sig</a>) </li> <li> <a href="<page docs/debian-vidalia>">Instructions for Debian/Ubuntu/Knoppix Repositories</a>

1 0

r24929: {} Add some photographs of whiteboard scribblings (in projects/misc/rransom: . 2011 2011/dev-meeting-photos-2011-07-25-01 2011/dev-meeting-photos-2011-07-25-01/orig)
by Robert Ransom 25 Jul '11

25 Jul '11

Author: rransom Date: 2011-07-25 14:57:17 +0000 (Mon, 25 Jul 2011) New Revision: 24929 Added: projects/misc/rransom/2011/ projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/ projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/ projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2363.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2364.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2365.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2368.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2369.jpg projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2372.jpg Log: Add some photographs of whiteboard scribblings Added: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2363.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2363.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2364.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2364.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2365.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2365.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2368.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2368.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2369.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2369.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2372.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/rransom/2011/dev-meeting-photos-2011-07-25-01/orig/100_2372.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r24928: {} Create a directory for rransom's miscellany (projects/misc)
by Robert Ransom 25 Jul '11

25 Jul '11

Author: rransom Date: 2011-07-25 14:41:30 +0000 (Mon, 25 Jul 2011) New Revision: 24928 Added: projects/misc/rransom/ Log: Create a directory for rransom's miscellany

1 0

[flashproxy/master] Remove new-window from remote commands.
by dcf＠torproject.org 24 Jul '11

24 Jul '11

commit 950b999f5abbf38cc70551ba1e22b877e87df772 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 23 02:26:05 2011 +0000 Remove new-window from remote commands. This is necessary when using the browser.link.open_newwindow=1 setting, but the default setting of 3 has the pages open in new tabs. --- experiments/01 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experiments/01 b/experiments/01 index 0c273e7..ff0179d 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,new-window)" + firefox --remote "openURL(http://localhost:1080/swfcat.swf?local=127.0.0.1:${local_port}&client=1&facilitator=127.0.0.1:4701)" 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,new-window)" +firefox --remote "openURL(http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701)" let query_fac_time=NUM_CLIENTS+2 sleep ${query_fac_time}

1 0

[flashproxy/master] Allow relaying data while one end of a ProxyPair is disconnected.
by dcf＠torproject.org 24 Jul '11

24 Jul '11

commit ea1618074e82e45542fbf2be79334b2517eadbd5 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 23 04:44:12 2011 +0000 Allow relaying data while one end of a ProxyPair is disconnected. Data could be left stranded when one end became closed after data had been read but before it had been flushed to the other side. --- ProxyPair.as | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/ProxyPair.as b/ProxyPair.as index 10c4263..237ab69 100644 --- a/ProxyPair.as +++ b/ProxyPair.as @@ -86,13 +86,13 @@ package public function connect():void { s_r.addEventListener(Event.CONNECT, relay_connected); - s_r.addEventListener(Event.CLOSE, socket_error("Relay: closed", s_c)); + s_r.addEventListener(Event.CLOSE, relay_closed); s_r.addEventListener(IOErrorEvent.IO_ERROR, socket_error("Relay: I/O error", s_c)); s_r.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socket_error("Relay: security error", s_c)); s_r.addEventListener(ProgressEvent.SOCKET_DATA, relay_to_client); s_c.addEventListener(Event.CONNECT, client_connected); - s_c.addEventListener(Event.CLOSE, socket_error("Client: closed", s_r)); + s_c.addEventListener(Event.CLOSE, client_closed); s_c.addEventListener(IOErrorEvent.IO_ERROR, socket_error("Client: I/O error", s_r)); s_c.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socket_error("Client: security error", s_r)); s_c.addEventListener(ProgressEvent.SOCKET_DATA, client_to_relay); @@ -113,6 +113,18 @@ package log("Client: connected."); } + private function relay_closed(e:Event):void + { + log("Relay: closed."); + flush(); + } + + private function client_closed(e:Event):void + { + log("Client: closed."); + flush(); + } + private function relay_to_client(e:ProgressEvent):void { r2c_schedule.push(e.bytesLoaded); @@ -141,24 +153,41 @@ package /* Send as much data as the rate limit currently allows. */ private function flush():void { + var busy:Boolean; + if (flush_id) clearTimeout(flush_id); flush_id = undefined; - if (!(s_r.connected && s_c.connected)) - /* Can't do anything until both sockets are connected. */ + if (!s_r.connected && !s_c.connected) + /* Can't do anything while both sockets are disconnected. */ return; - while (!ui.rate_limit.is_limited() && - (r2c_schedule.length > 0 || c2r_schedule.length > 0)) { - if (r2c_schedule.length > 0) + busy = true; + while (busy && !ui.rate_limit.is_limited()) { + busy = false; + if (s_c.connected && r2c_schedule.length > 0) { transfer_chunk(s_r, s_c, r2c_schedule.shift(), "Relay"); - if (c2r_schedule.length > 0) + busy = true; + } + if (s_r.connected && c2r_schedule.length > 0) { transfer_chunk(s_c, s_r, c2r_schedule.shift(), "Client"); + busy = true; + } + } + + if (!s_r.connected && r2c_schedule.length == 0) { + log("Client: closing."); + s_c.close(); + } + if (!s_c.connected && c2r_schedule.length == 0) { + log("Relay: closing."); + s_r.close(); } - /* Call again when safe, if necessary. */ - if (r2c_schedule.length > 0 || c2r_schedule.length > 0) + if (!s_c.connected && !s_r.connected) + dispatchEvent(new Event(Event.COMPLETE)); + else if (r2c_schedule.length > 0 || c2r_schedule.length > 0) flush_id = setTimeout(flush, ui.rate_limit.when() * 1000); } }

1 0

[flashproxy/master] Make sure a firefox instance exists to begin with.
by dcf＠torproject.org 24 Jul '11

24 Jul '11

commit 29d773a87bec8344a10d7631dae365d4c8e2aec9 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 23 06:06:38 2011 +0000 Make sure a firefox instance exists to begin with. --- experiments/01 | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/experiments/01 b/experiments/01 index 1ffadaa..8718e0d 100755 --- a/experiments/01 +++ b/experiments/01 @@ -37,6 +37,12 @@ until [ $i -gt $NUM_CLIENTS ]; do let i=i+1 done +# Start the flash proxy, server side +echo "starting flash proxy server side..." +firefox & +sleep 2 +firefox --remote "openURL(http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701)" + # Start the flash proxy, client side echo "starting flash proxy client side..." i=1 @@ -47,10 +53,6 @@ until [ $i -gt $NUM_CLIENTS ]; do 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)" - let query_fac_time=NUM_CLIENTS+2 sleep ${query_fac_time} @@ -59,7 +61,7 @@ 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

1 0

[flashproxy/master] Wait for user input after the last wget finishes.
by dcf＠torproject.org 24 Jul '11

24 Jul '11

commit dda30e0b6a34db4738782548d08253ea7386f7f2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 23 06:02:18 2011 +0000 Wait for user input after the last wget finishes. The last wget could finish the download first in some cases, and it would end the script by killing all the other processes, interrupting the downloads of the other wgets. --- experiments/00 | 3 +++ experiments/01 | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/experiments/00 b/experiments/00 index bc4befb..e7994df 100755 --- a/experiments/00 +++ b/experiments/00 @@ -67,6 +67,9 @@ done # Use this one for delaying the termination of experiment below wget -t1 http://localhost:2001/dump -O - > /dev/null +echo "Press enter to continue." +read + # Slaughter the processes ps -ef | sed -n '/thttpd/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} ps -ef | sed -n '/crossdomaind.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} diff --git a/experiments/01 b/experiments/01 index ff0179d..1ffadaa 100755 --- a/experiments/01 +++ b/experiments/01 @@ -67,6 +67,9 @@ done # Use this one for delaying the termination of experiment below wget -t1 http://localhost:2001/dump -O - > /dev/null +echo "Press enter to continue." +read + # Slaughter the processes sudo killall thttpd ps -ef | sed -n '/crossdomaind.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {}

1 0

[flashproxy/master] Reset the "connected" property on NetConnection.Connect.Closed.
by dcf＠torproject.org 24 Jul '11

24 Jul '11

commit dabfe03e024e9f940391f2b5c8c5ed1df1bb6251 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 23 16:56:59 2011 +0000 Reset the "connected" property on NetConnection.Connect.Closed. --- RTMFPSocket.as | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/RTMFPSocket.as b/RTMFPSocket.as index 4de3502..4dd54c5 100644 --- a/RTMFPSocket.as +++ b/RTMFPSocket.as @@ -78,6 +78,7 @@ package { switch (e.info.code) { case "NetConnection.Connect.Closed": + connected = false; dispatchEvent(new Event(Event.CLOSE)); break; case "NetStream.Connect.Closed":

1 0

[flashproxy/master] Simpler reclaiming of RTMFPSocket buffer space.
by dcf＠torproject.org 24 Jul '11

24 Jul '11

commit ee02ad3fb904c10aaabdde44fd4dffbf3cde442e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 24 03:21:48 2011 +0000 Simpler reclaiming of RTMFPSocket buffer space. --- RTMFPSocket.as | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/RTMFPSocket.as b/RTMFPSocket.as index 4dd54c5..421f9cc 100644 --- a/RTMFPSocket.as +++ b/RTMFPSocket.as @@ -192,8 +192,7 @@ package buffer.readBytes(output, offset, length); if (buffer.bytesAvailable == 0) { /* Reclaim memory space. */ - buffer.position = 0; - buffer.length = 0; + buffer.clear(); } }

1 0

[flashproxy/master] Print "read" log messages only in debugging mode.
by dcf＠torproject.org 24 Jul '11

24 Jul '11

commit 06d95087533353642e8c733d82db64c4ba1193d4 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 23 01:25:01 2011 +0000 Print "read" log messages only in debugging mode. --- ProxyPair.as | 8 +++++++- swfcat.as | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ProxyPair.as b/ProxyPair.as index 2b66532..10c4263 100644 --- a/ProxyPair.as +++ b/ProxyPair.as @@ -42,6 +42,12 @@ package ui.puts(msg) } + public function logdebug(msg:String):void + { + if (ui.debug) + log(msg); + } + public function set_name(name:String):void { this.name = name; @@ -129,7 +135,7 @@ package s_to.writeBytes(bytes); s_to.flush(); ui.rate_limit.update(n); - log(label + ": read " + bytes.length + "."); + logdebug(label + ": read " + bytes.length + "."); } /* Send as much data as the rate limit currently allows. */ diff --git a/swfcat.as b/swfcat.as index 9f3f967..73f3760 100644 --- a/swfcat.as +++ b/swfcat.as @@ -54,6 +54,8 @@ package private var local_addr:Object; + public var debug:Boolean; + public var rate_limit:RateLimit; public function puts(s:String):void @@ -85,7 +87,9 @@ package private function loaderinfo_complete(e:Event):void { - if (this.loaderInfo.parameters["debug"] || this.loaderInfo.parameters["client"]) { + debug = this.loaderInfo.parameters["debug"]; + + if (debug || this.loaderInfo.parameters["client"]) { output_text = new TextField(); output_text.width = stage.stageWidth; output_text.height = stage.stageHeight;

1 0