- tor-commits - lists.torproject.org

[arm/master] fix: uncaught exceptions when resuming borken conf
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 1c0c1f3029fbde3441c881930b292a0176d4e02d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 23:19:34 2011 -0700 fix: uncaught exceptions when resuming borken conf When selecting 'Use Last Configuration' in the wizard or 'Start Tor' from the menu when the last torrc was broken caused uncaught exceptions. It's actually better if the starter function did logging itself instead so passing on a success boolean instead. --- src/cli/controller.py | 23 +++++++++++++++++------ src/cli/wizard.py | 18 +++++++----------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index a04bf99..e30af3f 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -459,7 +459,8 @@ class TorManager: def startManagedInstance(self): """ - Starts a managed instance of tor, raising an IOError if unsuccessful. + Starts a managed instance of tor, logging a warning if unsuccessful. This + returns True if successful and False otherwise. """ torrcLoc = self.getTorrcPath() @@ -472,16 +473,26 @@ class TorManager: while not torctlConn and time.time() - startTime < 5: try: torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) - except IOError, exc: time.sleep(0.5) + except IOError: time.sleep(0.5) if not torctlConn: - raise IOError("try running \"tor -f %s\" for error output" % torrcLoc) + msg = "Unable to start tor, try running \"tor -f %s\" to see the error output" % torrcLoc + log.log(log.WARN, msg) + return False if authType == TorCtl.AUTH_TYPE.COOKIE: - torctlConn.authenticate(authValue) - torTools.getConn().init(torctlConn) + try: + torctlConn.authenticate(authValue) + torTools.getConn().init(torctlConn) + return True + except Exception, exc: + msg = "Unable to connect to Tor: %s" % exc + log.log(log.WARN, msg) + return False else: - raise IOError("unexpected authentication type '%s'" % authType) + msg = "Unable to connect to Tor, unexpected authentication type '%s'" % authType + log.log(log.WARN, msg) + return False def shutdownDaemons(): """ diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 6d2e623..be7ac8a 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -294,17 +294,13 @@ def showWizard(): torrcFile.write(generatedTorrc) torrcFile.close() - try: - conn = torTools.getConn() - - # If we're connected to a managed instance then just need to - # issue a sighup to pick up the new settings. Otherwise starts - # a new tor instance. - - if manager.isManaged(conn): conn.reset() - else: manager.startManagedInstance() - except IOError, exc: - log.log(log.WARN, "Unable to start tor, %s" % exc) + # If we're connected to a managed instance then just need to + # issue a sighup to pick up the new settings. Otherwise starts + # a new tor instance. + + conn = torTools.getConn() + if manager.isManaged(conn): conn.reset() + else: manager.startManagedInstance() break elif confirmationSelection == CANCEL: break

1 0

[arm/master] Hiding unimplemented wizard options
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 98c0230194d1575f42759e3515354a3a2c30ab35 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 10 16:27:51 2011 -0700 Hiding unimplemented wizard options The 'run at startup' and 'tor weather notificaitons' wizard options won't be implemented for this next release so hiding them in the wizard. --- src/cli/wizard.py | 3 ++- src/settings.cfg | 4 ++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index be7ac8a..6539a82 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -85,6 +85,7 @@ CONFIG = {"wizard.message.role": "", "wizard.message.bridge": "", "wizard.message.client": "", "wizard.toggle": {}, + "wizard.disabled": [], "wizard.suboptions": [], "wizard.default": {}, "wizard.blankValue": {}, @@ -377,7 +378,7 @@ def promptConfigOptions(relayType, config): topContent = _splitStr(CONFIG.get("wizard.message.%s" % relayType.lower(), ""), 54) - options = [config[opt] for opt in RelayOptions[relayType]] + options = [config[opt] for opt in RelayOptions[relayType] if not opt in CONFIG["wizard.disabled"]] options.append(Options.DIVIDER) options.append(ConfigOption(BACK, "general", "(to role selection)")) options.append(ConfigOption(NEXT, "general", "(to confirm options)")) diff --git a/src/settings.cfg b/src/settings.cfg index 4551b43..2734c4a 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -362,6 +362,10 @@ wizard.toggle Plaintext => Allow, Block wizard.toggle Distribute => Automated, Manual wizard.toggle Bridged => Yes, No +# the following options haven't been implemented yet +wizard.disabled Notify +wizard.disabled Startup + wizard.suboptions Websites wizard.suboptions Email wizard.suboptions Im

1 0

[arm/master] fix: right of daybreak dividers hidden
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 1edaf1a6dcfb7e029ba1c35d701e8e5e36369f09 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 10 16:21:22 2011 -0700 fix: right of daybreak dividers hidden Raising the width attribute earlier caused an off by one error where the right bound of log daybreak divider wasn't visible. --- src/cli/logPanel.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 2561416..9ea4ecb 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -1014,8 +1014,8 @@ class LogPanel(panel.Panel, threading.Thread): if seenFirstDateDivider: if lineCount >= 1 and lineCount < height and showDaybreaks: self.addch(lineCount, dividerIndent, curses.ACS_LLCORNER, dividerAttr) - self.hline(lineCount, dividerIndent + 1, width - dividerIndent - 1, dividerAttr) - self.addch(lineCount, width, curses.ACS_LRCORNER, dividerAttr) + self.hline(lineCount, dividerIndent + 1, width - dividerIndent - 2, dividerAttr) + self.addch(lineCount, width - 1, curses.ACS_LRCORNER, dividerAttr) lineCount += 1 @@ -1026,7 +1026,7 @@ class LogPanel(panel.Panel, threading.Thread): self.addch(lineCount, dividerIndent + 1, curses.ACS_HLINE, dividerAttr) self.addstr(lineCount, dividerIndent + 2, timeLabel, curses.A_BOLD | dividerAttr) - lineLength = width - dividerIndent - len(timeLabel) - 2 + lineLength = width - dividerIndent - len(timeLabel) - 3 self.hline(lineCount, dividerIndent + len(timeLabel) + 2, lineLength, dividerAttr) self.addch(lineCount, dividerIndent + len(timeLabel) + 2 + lineLength, curses.ACS_URCORNER, dividerAttr) @@ -1054,7 +1054,7 @@ class LogPanel(panel.Panel, threading.Thread): drawLine = lineCount + lineOffset if lineOffset == maxEntriesPerLine: break - maxMsgSize = width - cursorLoc + maxMsgSize = width - cursorLoc - 1 if len(msg) > maxMsgSize: # message is too long - break it up if lineOffset == maxEntriesPerLine - 1: @@ -1068,7 +1068,7 @@ class LogPanel(panel.Panel, threading.Thread): if drawLine < height and drawLine >= 1: if seenFirstDateDivider and width - dividerIndent >= 3 and showDaybreaks: self.addch(drawLine, dividerIndent, curses.ACS_VLINE, dividerAttr) - self.addch(drawLine, width, curses.ACS_VLINE, dividerAttr) + self.addch(drawLine, width - 1, curses.ACS_VLINE, dividerAttr) self.addstr(drawLine, cursorLoc, msg, format) @@ -1084,8 +1084,8 @@ class LogPanel(panel.Panel, threading.Thread): if not deduplicatedLog and seenFirstDateDivider: if lineCount < height and showDaybreaks: self.addch(lineCount, dividerIndent, curses.ACS_LLCORNER, dividerAttr) - self.hline(lineCount, dividerIndent + 1, width - dividerIndent - 1, dividerAttr) - self.addch(lineCount, width, curses.ACS_LRCORNER, dividerAttr) + self.hline(lineCount, dividerIndent + 1, width - dividerIndent - 2, dividerAttr) + self.addch(lineCount, width - 1, curses.ACS_LRCORNER, dividerAttr) lineCount += 1

1 0

[arm/master] Copying exit notice to data dir when needed
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 9d473588c4aedcbc6832a4c3927210b876c5d4c9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 10 17:29:31 2011 -0700 Copying exit notice to data dir when needed If running an exit with an exit notice then copies the notice (an html file and image) to the data directory. --- src/cli/wizard.py | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 6539a82..9b8c1d7 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -295,12 +295,26 @@ def showWizard(): torrcFile.write(generatedTorrc) torrcFile.close() + # copies exit notice into data directory if it's being used + if Options.NOTICE in RelayOptions[relayType] and config[Options.NOTICE].getValue() and config[Options.LOWPORTS].getValue(): + dataDir = cli.controller.getController().getDataDirectory() + + pathPrefix = os.path.dirname(sys.argv[0]) + if pathPrefix and not pathPrefix.endswith("/"): + pathPrefix = pathPrefix + "/" + + src = "%sresources/exitNotice" % pathPrefix + dst = "%sexitNotice" % dataDir + + if not os.path.exists(dst): + shutil.copytree(src, dst) + # If we're connected to a managed instance then just need to # issue a sighup to pick up the new settings. Otherwise starts # a new tor instance. conn = torTools.getConn() - if manager.isManaged(conn): conn.reset() + if manager.isManaged(conn): conn.reload() else: manager.startManagedInstance() break @@ -490,9 +504,12 @@ def getTorrc(relayType, config): if isinstance(value, ConfigOption): value = value.getValue() - # truncates "/s" from the rate for RelayBandwidthRate entry if key == Options.BANDWIDTH and value.endswith("/s"): + # truncates "/s" from the rate for RelayBandwidthRate entry value = value[:-2] + elif key == Options.NOTICE: + # notice option is only applied if using low ports + value &= config[Options.LOWPORTS].getValue() templateOptions[key.upper()] = value @@ -508,7 +525,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["NOTICE_PATH"] = dataDir + "exitNotice/exit-notice.html" templateOptions["LOG_ENTRY"] = "notice file %stor_log" % dataDir policyCategories = []

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 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 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 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 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