- tor-commits - lists.torproject.org

[arm/master] Toggling config flad to allow detached startups
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit e19872a84c02e3d755cccf0668b0ccc3396bba8e Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 10:26:52 2011 -0700 Toggling config flad to allow detached startups Toggling default for the 'features.allowDetachedStartup' flag so users, by default, will see the relay setup wizard if there's no control connection. It's complete minus the root startup script... --- armrc.sample | 2 +- src/starter.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/armrc.sample b/armrc.sample index 23092d7..0a7b0e1 100644 --- a/armrc.sample +++ b/armrc.sample @@ -62,7 +62,7 @@ features.confirmQuit true # Allows arm to start when there's no running tor instance if true, otherwise # we terminate right away. -features.allowDetachedStartup false +features.allowDetachedStartup true # Paremters for the log panel # --------------------------- diff --git a/src/starter.py b/src/starter.py index 58bc6b1..d2d0f2a 100644 --- a/src/starter.py +++ b/src/starter.py @@ -40,7 +40,7 @@ CONFIG = {"startup.controlPassword": None, "startup.events": "N3", "startup.dataDirectory": "~/.arm", "wizard.default": {}, - "features.allowDetachedStartup": False, + "features.allowDetachedStartup": True, "features.config.descriptions.enabled": True, "features.config.descriptions.persist": True, "log.configDescriptions.readManPageSuccess": util.log.INFO,

1 0

[arm/master] Dropping "/s" when making torrc for rates
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit ec0cdb0f1499910fc85337ac20c2ab6352578cb6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:25:12 2011 -0700 Dropping "/s" when making torrc for rates The wizard shows bandwidth rates (for instance "5 MB/s") but the torrc just wants the volume part. Dropping the "/s" for RelayBandwidthRate and RelayBandwidthBurst. --- src/cli/wizard.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index cf544a5..8aa1a23 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -493,14 +493,21 @@ 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"): + value = value[:-2] + templateOptions[key.upper()] = value templateOptions[relayType.upper()] = True templateOptions["LOW_PORTS"] = config[Options.LOWPORTS] # uses double the relay rate for bursts - relayRateComp = config[Options.BANDWIDTH].getValue().split(" ") - templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) + bwOpt = Options.BANDWIDTH.upper() + + if templateOptions[bwOpt] != TOR_DEFAULTS[Options.BANDWIDTH]: + relayRateComp = templateOptions[bwOpt].split(" ") + templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) # exit notice will be in our data directory dataDir = cli.controller.getController().getDataDirectory()

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

[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] 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: 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