July 2011 - tor-commits - lists.torproject.org

[arm/master] Giving better error output when tor startup fails
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 000d5d9efda100758b2e8f703a13ebd76bcb457a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:43:57 2011 -0700 Giving better error output when tor startup fails The error out was pointless (any startup failure reported as being unable to connect to the control port) so giving the user the command to manually start tor. I should try to capture the logged err msg but this is gonna be a little tricky... --- src/cli/controller.py | 12 ++++++------ src/cli/wizard.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index d4ee3e3..a04bf99 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -462,20 +462,20 @@ class TorManager: Starts a managed instance of tor, raising an IOError if unsuccessful. """ - os.system("tor --quiet -f %s&" % self.getTorrcPath()) + torrcLoc = self.getTorrcPath() + os.system("tor --quiet -f %s&" % torrcLoc) startTime = time.time() # attempts to connect for five seconds (tor might or might not be # immediately available) - torctlConn, authType, authValue, raisedExc = None, None, None, None + torctlConn, authType, authValue = None, None, None while not torctlConn and time.time() - startTime < 5: try: torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) - except IOError, exc: - raisedExc = exc - time.sleep(0.5) + except IOError, exc: time.sleep(0.5) - if not torctlConn: raise raisedExc + if not torctlConn: + raise IOError("try running \"tor -f %s\" for error output" % torrcLoc) if authType == TorCtl.AUTH_TYPE.COOKIE: torctlConn.authenticate(authValue) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 8aa1a23..6d2e623 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -304,7 +304,7 @@ def showWizard(): if manager.isManaged(conn): conn.reset() else: manager.startManagedInstance() except IOError, exc: - log.log(log.WARN, "Unable to start tor: %s" % exc) + log.log(log.WARN, "Unable to start tor, %s" % exc) break elif confirmationSelection == CANCEL: break @@ -512,7 +512,7 @@ def getTorrc(relayType, config): # exit notice will be in our data directory dataDir = cli.controller.getController().getDataDirectory() templateOptions["NOTICE_PATH"] = dataDir + "exit-notice.html" - templateOptions["LOG_ENTRY"] = "notice file %stor-log" % dataDir + templateOptions["LOG_ENTRY"] = "notice file %stor_log" % dataDir policyCategories = [] if not config[Options.POLICY].getValue():

1 0

[arm/master] fix: tor startup errors caused stacktrace
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 7bd3af6a9da4afac92ab1b72cbb315e68e0b394e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:37:34 2011 -0700 fix: tor startup errors caused stacktrace Simple typo caused raised exceptions value to be left None. --- src/cli/controller.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 5ba7f42..d4ee3e3 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -472,7 +472,7 @@ class TorManager: try: torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) except IOError, exc: - raisedExc == exc + raisedExc = exc time.sleep(0.5) if not torctlConn: raise raisedExc

1 0

[arm/master] Excluding tor config options if they match default
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 0c0a54387a2c6f562b65d15820a8753f244c9b7a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:14:46 2011 -0700 Excluding tor config options if they match default When the wizard is generating a torrc it's now excluding options if they match the defaults. This'll take some more work to get right. --- src/cli/wizard.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index e2419e8..cf544a5 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -75,6 +75,10 @@ MSG_COLOR = "green" OPTION_COLOR = "yellow" DISABLED_COLOR = "cyan" +# tor's defaults for config options, used to filter unneeded options +TOR_DEFAULTS = {Options.BANDWIDTH: "5 MB", + Options.REUSE: "10 minutes"} + CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", "wizard.message.exit": "", @@ -551,6 +555,11 @@ def getTorrc(relayType, config): templateOptions["BRIDGES"] = "\n".join(bridgeLines) + # removes options if they match the tor defaults + for opt in TOR_DEFAULTS: + if templateOptions[opt.upper()] == TOR_DEFAULTS[opt]: + del templateOptions[opt.upper()] + return torConfig.renderTorrc(template, templateOptions) def showConfirmationDialog(torrcContents, torrcLocation):

1 0

[flashproxy/master] Put the traceback in the log in case of connector exception.
by dcf＠torproject.org 12 Jul '11

12 Jul '11

commit 9a5509f0bda5b29ce666a4744928a49adc1507e3 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 11 23:04:52 2011 -0700 Put the traceback in the log in case of connector exception. --- connector.py | 158 ++++++++++++++++++++++++++++++--------------------------- 1 files changed, 83 insertions(+), 75 deletions(-) diff --git a/connector.py b/connector.py index 27fff61..878e252 100755 --- a/connector.py +++ b/connector.py @@ -9,6 +9,7 @@ import socket import struct import sys import time +import traceback import urllib import xml.sax.saxutils @@ -322,84 +323,91 @@ if options.daemonize: register() -while True: - rset = [remote_s, local_s] + crossdomain_pending + socks_pending + remote_for.keys() + local_for.keys() + locals + remotes - rset, _, _ = select.select(rset, [], [], CROSSDOMAIN_TIMEOUT) - for fd in rset: - if fd == remote_s: - remote_c, addr = fd.accept() - log(u"Remote connection from %s." % format_addr(addr)) - crossdomain_pending.append(BufferSocket(remote_c)) - elif fd == local_s: - local_c, addr = fd.accept() - log(u"Local connection from %s." % format_addr(addr)) - socks_pending.append(local_c) - register() - elif fd in crossdomain_pending: - log(u"Data from crossdomain-pending %s." % format_addr(addr)) - if handle_policy_request(fd): - remotes.append(fd) - handle_remote_connection(fd) - else: - fd.close() - crossdomain_pending.remove(fd) - report_pending() - elif fd in socks_pending: - log(u"SOCKS request from %s." % format_addr(addr)) - if handle_socks_request(fd): - locals.append(BufferSocket(fd)) - handle_local_connection(fd) - else: - fd.close() - socks_pending.remove(fd) - report_pending() - elif fd in local_for: - local = local_for[fd] - if not proxy_chunk(fd, local, "remote"): - del local_for[fd] - del remote_for[local] +def main(): + while True: + rset = [remote_s, local_s] + crossdomain_pending + socks_pending + remote_for.keys() + local_for.keys() + locals + remotes + rset, _, _ = select.select(rset, [], [], CROSSDOMAIN_TIMEOUT) + for fd in rset: + if fd == remote_s: + remote_c, addr = fd.accept() + log(u"Remote connection from %s." % format_addr(addr)) + crossdomain_pending.append(BufferSocket(remote_c)) + elif fd == local_s: + local_c, addr = fd.accept() + log(u"Local connection from %s." % format_addr(addr)) + socks_pending.append(local_c) register() - elif fd in remote_for: - remote = remote_for[fd] - if not proxy_chunk(fd, remote, "local"): - del remote_for[fd] - del local_for[remote] - register() - elif fd in locals: - data = fd.recv(1024) - if not data: - log(u"EOF from unconnected local %s with %d bytes buffered." % (format_addr(fd.getpeername()), len(fd.buf))) - locals.remove(fd) - fd.close() - else: - log(u"Data from unconnected local %s (%d bytes)." % (format_addr(fd.getpeername()), len(data))) - fd.buf += data - if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: - log(u"Refusing to buffer more than %d bytes from local %s." % (UNCONNECTED_BUFFER_LIMIT, format_addr(fd.getpeername()))) + elif fd in crossdomain_pending: + log(u"Data from crossdomain-pending %s." % format_addr(addr)) + if handle_policy_request(fd): + remotes.append(fd) + handle_remote_connection(fd) + else: + fd.close() + crossdomain_pending.remove(fd) + report_pending() + elif fd in socks_pending: + log(u"SOCKS request from %s." % format_addr(addr)) + if handle_socks_request(fd): + locals.append(BufferSocket(fd)) + handle_local_connection(fd) + else: + fd.close() + socks_pending.remove(fd) + report_pending() + elif fd in local_for: + local = local_for[fd] + if not proxy_chunk(fd, local, "remote"): + del local_for[fd] + del remote_for[local] + register() + elif fd in remote_for: + remote = remote_for[fd] + if not proxy_chunk(fd, remote, "local"): + del remote_for[fd] + del local_for[remote] + register() + elif fd in locals: + data = fd.recv(1024) + if not data: + log(u"EOF from unconnected local %s with %d bytes buffered." % (format_addr(fd.getpeername()), len(fd.buf))) locals.remove(fd) fd.close() - report_pending() - elif fd in remotes: - data = fd.recv(1024) - if not data: - log(u"EOF from unconnected remote %s with %d bytes buffered." % (format_addr(fd.getpeername()), len(fd.buf))) - remotes.remove(fd) - fd.close() - else: - log(u"Data from unconnected remote %s (%d bytes)." % (format_addr(fd.getpeername()), len(data))) - fd.buf += data - if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: - log(u"Refusing to buffer more than %d bytes from local %s." % (UNCONNECTED_BUFFER_LIMIT, format_addr(fd.getpeername()))) + else: + log(u"Data from unconnected local %s (%d bytes)." % (format_addr(fd.getpeername()), len(data))) + fd.buf += data + if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: + log(u"Refusing to buffer more than %d bytes from local %s." % (UNCONNECTED_BUFFER_LIMIT, format_addr(fd.getpeername()))) + locals.remove(fd) + fd.close() + report_pending() + elif fd in remotes: + data = fd.recv(1024) + if not data: + log(u"EOF from unconnected remote %s with %d bytes buffered." % (format_addr(fd.getpeername()), len(fd.buf))) remotes.remove(fd) fd.close() + else: + log(u"Data from unconnected remote %s (%d bytes)." % (format_addr(fd.getpeername()), len(data))) + fd.buf += data + if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: + log(u"Refusing to buffer more than %d bytes from local %s." % (UNCONNECTED_BUFFER_LIMIT, format_addr(fd.getpeername()))) + remotes.remove(fd) + fd.close() + report_pending() + match_proxies() + while crossdomain_pending: + pending = crossdomain_pending[0] + if not pending.is_expired(CROSSDOMAIN_TIMEOUT): + break + log(u"Expired pending crossdomain from %s." % format_addr(pending.getpeername())) + crossdomain_pending.pop(0) + remotes.append(pending) + handle_remote_connection(pending) report_pending() - match_proxies() - while crossdomain_pending: - pending = crossdomain_pending[0] - if not pending.is_expired(CROSSDOMAIN_TIMEOUT): - break - log(u"Expired pending crossdomain from %s." % format_addr(pending.getpeername())) - crossdomain_pending.pop(0) - remotes.append(pending) - handle_remote_connection(pending) - report_pending() + +try: + main() +except Exception: + exc = traceback.format_exc() + log("".join(exc))

1 0

[flashproxy/master] Catch socket errors for crossdomain- and SOCKS-pending too.
by dcf＠torproject.org 12 Jul '11

12 Jul '11

commit 9275698b268fd3c82d1cd8156569857438426490 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 12 08:36:08 2011 -0700 Catch socket errors for crossdomain- and SOCKS-pending too. --- connector.py | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/connector.py b/connector.py index bb86046..f85aeca 100755 --- a/connector.py +++ b/connector.py @@ -197,8 +197,12 @@ def handle_policy_request(fd): """Returns True iff the socket is still open and usable (wasn't a crossdomain request and wasn't closed.""" log(u"handle_policy_request") - addr = fd.getpeername() - data = fd.recv(100) + try: + addr = fd.getpeername() + data = fd.recv(100) + except socket.error, e: + log(u"Socket error from crossdomain-pending: %s" % repr(str(e))) + return False if data == "<policy-file-request/>\0": log(u"Sending crossdomain policy to %s." % format_addr(addr)) fd.sendall(""" @@ -251,8 +255,12 @@ def parse_socks_request(data): def handle_socks_request(fd): log(u"handle_socks_request") - addr = fd.getpeername() - data = fd.recv(100) + try: + addr = fd.getpeername() + data = fd.recv(100) + except socket.error, e: + log(u"Socket error from SOCKS-pending: %s" % repr(str(e))) + return False dest_addr = parse_socks_request(data) if dest_addr is None: # Error reply.

1 0

[flashproxy/master] Factor out a function for receiving on a yet-unlinked socket.
by dcf＠torproject.org 12 Jul '11

12 Jul '11

commit 684f884b8b35e66772cc890fe778001b7e079536 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 12 08:17:35 2011 -0700 Factor out a function for receiving on a yet-unlinked socket. --- connector.py | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/connector.py b/connector.py index 878e252..0537b90 100755 --- a/connector.py +++ b/connector.py @@ -302,6 +302,25 @@ def proxy_chunk(fd_r, fd_w, label): fd_w.sendall(data) return True +def receive_unconnected(fd, label): + """Receive and buffer data on a socket that has not been linked yet. Returns + True iff there was no error and the socket may still be used; otherwise, the + socket will be closed before returning.""" + + data = fd.recv(1024) + if not data: + log(u"EOF from unconnected %s %s with %d bytes buffered." % (label, format_addr(fd.getpeername()), len(fd.buf))) + fd.close() + return False + else: + log(u"Data from unconnected %s %s (%d bytes)." % (label, format_addr(fd.getpeername()), len(data))) + fd.buf += data + if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: + log(u"Refusing to buffer more than %d bytes from %s %s." % (UNCONNECTED_BUFFER_LIMIT, label, format_addr(fd.getpeername()))) + fd.close() + return False + return True + def match_proxies(): while locals and remotes: remote = remotes.pop(0) @@ -368,32 +387,12 @@ def main(): del local_for[remote] register() elif fd in locals: - data = fd.recv(1024) - if not data: - log(u"EOF from unconnected local %s with %d bytes buffered." % (format_addr(fd.getpeername()), len(fd.buf))) + if not receive_unconnected(fd, "local"): locals.remove(fd) - fd.close() - else: - log(u"Data from unconnected local %s (%d bytes)." % (format_addr(fd.getpeername()), len(data))) - fd.buf += data - if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: - log(u"Refusing to buffer more than %d bytes from local %s." % (UNCONNECTED_BUFFER_LIMIT, format_addr(fd.getpeername()))) - locals.remove(fd) - fd.close() report_pending() elif fd in remotes: - data = fd.recv(1024) - if not data: - log(u"EOF from unconnected remote %s with %d bytes buffered." % (format_addr(fd.getpeername()), len(fd.buf))) + if not receive_unconnected(fd, "remote"): remotes.remove(fd) - fd.close() - else: - log(u"Data from unconnected remote %s (%d bytes)." % (format_addr(fd.getpeername()), len(data))) - fd.buf += data - if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: - log(u"Refusing to buffer more than %d bytes from local %s." % (UNCONNECTED_BUFFER_LIMIT, format_addr(fd.getpeername()))) - remotes.remove(fd) - fd.close() report_pending() match_proxies() while crossdomain_pending:

1 0

[flashproxy/master] Catch socket errors when receiving on a yet-unlinked socket.
by dcf＠torproject.org 12 Jul '11

12 Jul '11

commit dbc6864c5a0c49c06b4cf80e2f5a987d3be24b0c Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 12 08:19:18 2011 -0700 Catch socket errors when receiving on a yet-unlinked socket. Specifically I have seen ENOTCONN and ECONNRESET. It was possible to crash the connector by ending a stream with RST instead of FIN. --- connector.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index 0537b90..bb86046 100755 --- a/connector.py +++ b/connector.py @@ -307,7 +307,12 @@ def receive_unconnected(fd, label): True iff there was no error and the socket may still be used; otherwise, the socket will be closed before returning.""" - data = fd.recv(1024) + try: + data = fd.recv(1024) + except socket.error, e: + log(u"Socket error from %s: %s" % (label, repr(str(e)))) + fd.close() + return False if not data: log(u"EOF from unconnected %s %s with %d bytes buffered." % (label, format_addr(fd.getpeername()), len(fd.buf))) fd.close()

1 0

[flashproxy/master] Factor out a format_peername function.
by dcf＠torproject.org 12 Jul '11

12 Jul '11

commit 2916c922e235841d01b4e3d368fdc80f079f973a Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 12 08:47:23 2011 -0700 Factor out a format_peername function. This affords a little brevity and catches the exception in case the socket is not connected. --- connector.py | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/connector.py b/connector.py index f85aeca..5434f84 100755 --- a/connector.py +++ b/connector.py @@ -168,6 +168,12 @@ def listen_socket(addr): s.setblocking(0) return s +def format_peername(s): + try: + return format_addr(s.getpeername()) + except socket.error, e: + return "<unconnected>" + # How long to wait for a crossdomain policy request before deciding that this is # a normal socket. CROSSDOMAIN_TIMEOUT = 2.0 @@ -281,8 +287,8 @@ def handle_local_connection(fd): match_proxies() def report_pending(): - log(u"locals (%d): %s" % (len(locals), [format_addr(x.getpeername()) for x in locals])) - log(u"remotes (%d): %s" % (len(remotes), [format_addr(x.getpeername()) for x in remotes])) + log(u"locals (%d): %s" % (len(locals), [format_peername(x) for x in locals])) + log(u"remotes (%d): %s" % (len(remotes), [format_peername(x) for x in remotes])) def register(): if options.facilitator_addr is None: @@ -302,7 +308,7 @@ def proxy_chunk(fd_r, fd_w, label): fd_w.close() return False if not data: - log(u"EOF from %s %s." % (label, format_addr(fd_r.getpeername()))) + log(u"EOF from %s %s." % (label, format_peername(fd_r))) fd_r.close() fd_w.close() return False @@ -322,14 +328,14 @@ def receive_unconnected(fd, label): fd.close() return False if not data: - log(u"EOF from unconnected %s %s with %d bytes buffered." % (label, format_addr(fd.getpeername()), len(fd.buf))) + log(u"EOF from unconnected %s %s with %d bytes buffered." % (label, format_peername(fd), len(fd.buf))) fd.close() return False else: - log(u"Data from unconnected %s %s (%d bytes)." % (label, format_addr(fd.getpeername()), len(data))) + log(u"Data from unconnected %s %s (%d bytes)." % (label, format_peername(fd), len(data))) fd.buf += data if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: - log(u"Refusing to buffer more than %d bytes from %s %s." % (UNCONNECTED_BUFFER_LIMIT, label, format_addr(fd.getpeername()))) + log(u"Refusing to buffer more than %d bytes from %s %s." % (UNCONNECTED_BUFFER_LIMIT, label, format_peername(fd))) fd.close() return False return True @@ -340,7 +346,7 @@ def match_proxies(): local = locals.pop(0) remote_addr, remote_port = remote.getpeername() local_addr, local_port = local.getpeername() - log(u"Linking %s and %s." % (format_addr(local.getpeername()), format_addr(remote.getpeername()))) + log(u"Linking %s and %s." % (format_peername(local), format_peername(remote))) if local.buf: remote.sendall(local.buf) if remote.buf: @@ -412,7 +418,7 @@ def main(): pending = crossdomain_pending[0] if not pending.is_expired(CROSSDOMAIN_TIMEOUT): break - log(u"Expired pending crossdomain from %s." % format_addr(pending.getpeername())) + log(u"Expired pending crossdomain from %s." % format_peername(pending)) crossdomain_pending.pop(0) remotes.append(pending) handle_remote_connection(pending)

1 0

[flashproxy/master] Decreased poll interval to 1 second for speeding up the experiments
by dcf＠torproject.org 12 Jul '11

12 Jul '11

commit 82d2e3b6d9ad297818a740dff5d808a33a9016f7 Author: Jonathan Ellithorpe <jdellit(a)stanford.edu> Date: Mon Jul 11 18:06:04 2011 -0700 Decreased poll interval to 1 second for speeding up the experiments --- swfcat.as | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/swfcat.as b/swfcat.as index 14c2d8c..5be06fd 100644 --- a/swfcat.as +++ b/swfcat.as @@ -31,10 +31,10 @@ package port: 9002 }; - private const MAX_NUM_PROXY_PAIRS:uint = 2; + private const MAX_NUM_PROXY_PAIRS:uint = 10; // Milliseconds. - private const FACILITATOR_POLL_INTERVAL:int = 10000; + private const FACILITATOR_POLL_INTERVAL:int = 1000; // Bytes per second. Set to undefined to disable limit. public const RATE_LIMIT:Number = undefined;

1 0

[flashproxy/master] This experiment 01 includes RTMFP, and takes an argument NUM_CLIENTS
by dcf＠torproject.org 12 Jul '11

12 Jul '11

commit db8e6cbfab6b4d86ea20eeb2e9e151126f90b286 Author: Jonathan Ellithorpe <jdellit(a)stanford.edu> Date: Mon Jul 11 18:19:31 2011 -0700 This experiment 01 includes RTMFP, and takes an argument NUM_CLIENTS --- experiments/01 | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/experiments/01 b/experiments/01 new file mode 100755 index 0000000..5b446b8 --- /dev/null +++ b/experiments/01 @@ -0,0 +1,73 @@ +#!/bin/bash + +# Get arguments +if [ $1 ]; then + NUM_CLIENTS=$1 +else + NUM_CLIENTS=1 +fi + +# Go to flashproxy repo root dir +cd .. + +# Create 1GB dump file +echo "creating dump file..." +rm dump +dd if=/dev/null of=dump bs=1G seek=1 & + +# Start http server +echo "starting http server..." +thttpd -p 1080 + +# Start crossdomain policy server +echo "starting cross domain policy server..." +sudo ./crossdomaind.py & + +# Start the facilitator +echo "starting facilitator..." +./facilitator.py 4701 -r 127.0.0.1:1080 + +# Start socat adapters +echo "starting socat adapters..." +i=1 +until [ $i -gt $NUM_CLIENTS ]; do + let local_port=2000+i + let remote_port=9000+i + socat TCP-LISTEN:${remote_port},reuseaddr,fork TCP-LISTEN:${local_port},reuseaddr & + let i=i+1 +done + +# Start the flash proxy, client side +echo "starting flash proxy client side..." +i=1 +until [ $i -gt $NUM_CLIENTS ]; do + let local_port=9000+i + google-chrome --app="http://localhost:1080/swfcat.swf?local=127.0.0.1:${local_port}&client=1&fac…" + let i=i+1 + sleep 2 +done + +# Start the flash proxy, server side +echo "starting flash proxy server side..." +google-chrome --app="http://localhost:1080/swfcat.swf?debug=1&facilitator=127.0.0.1:4701" + +let query_fac_time=NUM_CLIENTS+2 +sleep ${query_fac_time} + +# wget the dump file +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 http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'" + let i=i+1 +done + +# Use this one for delaying the termination of experiment below +wget http://localhost:2001/dump -O - > /dev/null + +# Slaughter the processes +sudo killall thttpd +ps -ef | sed -n '/crossdomaind.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} +ps -ef | sed -n '/facilitator.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} +sudo killall socat

1 0