tor-commits

tor-commits@lists.torproject.org

January 2012

14 participants
852 discussions

r25279: {website} update the makefile to current versions of tor. (website/trunk)
by Andrew Lewman 01 Jan '12

01 Jan '12

Author: phobos Date: 2012-01-01 16:40:45 +0000 (Sun, 01 Jan 2012) New Revision: 25279 Modified: website/trunk/Makefile Log: update the makefile to current versions of tor. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-12-30 16:06:25 UTC (rev 25278) +++ website/trunk/Makefile 2012-01-01 16:40:45 UTC (rev 25279) @@ -11,8 +11,8 @@ # 5. ./publish export TORGIT=set this to your tor.git path -export STABLETAG=tor-0.2.2.34 -export DEVTAG=tor-0.2.3.7-alpha +export STABLETAG=tor-0.2.2.35 +export DEVTAG=tor-0.2.3.10-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

[flashproxy/master] Be consistent in the use of "linked" terminology.
by dcf＠torproject.org 01 Jan '12

01 Jan '12

commit d0ce6ed4d29fb2e6da49d89f90db43d6ec39a7ef Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 23 09:54:03 2011 -0800 Be consistent in the use of "linked" terminology. Use "connect" for local and remote TCP connections, and "link" for when we make a proxy pair between two of them. This changes the potentially confusing message "EOF from unconnected remote..." to the potentially less confusing "EOF from unlinked remote...". --- connector.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/connector.py b/connector.py index 3b08272..68f1ce4 100755 --- a/connector.py +++ b/connector.py @@ -43,7 +43,7 @@ exists, data is ferried between them until one side is closed. By default LOCAL is "%(local)s" and REMOTE is "%(remote)s". The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS -request are ignored and the local connection is always joined to a remote +request are ignored and the local connection is always linked to a remote connection. If the -f option is given, then the REMOTE address is advertised to the given @@ -325,7 +325,7 @@ def proxy_chunk(fd_r, fd_w, label): fd_w.sendall(data) return True -def receive_unconnected(fd, label): +def receive_unlinked(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.""" @@ -337,11 +337,11 @@ 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_peername(fd), len(fd.buf))) + log(u"EOF from unlinked %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_peername(fd), len(data))) + log(u"Data from unlinked %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_peername(fd))) @@ -420,11 +420,11 @@ def main(): del local_for[remote] register() elif fd in locals: - if not receive_unconnected(fd, "local"): + if not receive_unlinked(fd, "local"): locals.remove(fd) report_pending() elif fd in remotes: - if not receive_unconnected(fd, "remote"): + if not receive_unlinked(fd, "remote"): remotes.remove(fd) report_pending() match_proxies()

1 0

Jump to page: