- tor-commits - lists.torproject.org

[tor/master] Avoid double-free in bufferevent read/write cbs
by nickm＠torproject.org 07 Jul '11

07 Jul '11

commit 57822cbbbe85410785716fa62667b674b35602df Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 7 11:00:21 2011 -0400 Avoid double-free in bufferevent read/write cbs Fixes bug 3404; bugfix on 0.2.3.1-alpha. --- changes/bug3404 | 3 +++ src/or/connection.c | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug3404 b/changes/bug3404 new file mode 100644 index 0000000..4e2e21b --- /dev/null +++ b/changes/bug3404 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix a class of double-mark-for-close bugs when bufferevents + are enabled. Fixes bug 3404; bugfix on 0.2.3.1-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index e8969e0..c84ee04 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2957,9 +2957,11 @@ connection_handle_read_cb(struct bufferevent *bufev, void *arg) { connection_t *conn = arg; (void) bufev; - if (!conn->marked_for_close) + if (!conn->marked_for_close) { if (connection_process_inbuf(conn, 1)<0) /* XXXX Always 1? */ - connection_mark_for_close(conn); + if (!conn->marked_for_close) + connection_mark_for_close(conn); + } } /** Callback: invoked whenever a bufferevent has written data. */ @@ -2969,7 +2971,8 @@ connection_handle_write_cb(struct bufferevent *bufev, void *arg) connection_t *conn = arg; struct evbuffer *output; if (connection_flushed_some(conn)<0) { - connection_mark_for_close(conn); + if (!conn->marked_for_close) + connection_mark_for_close(conn); return; }

1 0

[tor/master] Remove unused var in write_to_evbuffer_zlib
by nickm＠torproject.org 07 Jul '11

07 Jul '11

commit 31120ff692cba0c663a144ae9ece4b80ae8877a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 7 11:00:51 2011 -0400 Remove unused var in write_to_evbuffer_zlib --- src/or/buffers.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 8f5fb1e..7312749 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -2240,7 +2240,6 @@ write_to_evbuffer_zlib(struct evbuffer *buf, tor_zlib_state_t *state, int over = 0, n; struct evbuffer_iovec vec[1]; do { - int need_new_chunk = 0; { size_t cap = data_len / 4; if (cap < 128) @@ -2269,7 +2268,6 @@ write_to_evbuffer_zlib(struct evbuffer *buf, tor_zlib_state_t *state, if (avail) { /* Zlib says we need more room (ZLIB_BUF_FULL). Start a new chunk * automatically, whether were going to or not. */ - need_new_chunk = 1; } break; }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 07 Jul '11

07 Jul '11

commit f883ec09b5b2f48cd4186658e0b92f1511358f21 Merge: eee942c 3ab0976 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 7 09:56:01 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3536 | 5 +++++ src/or/connection_edge.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/master] Correctly send a SUCCEEDED event for rdns requests
by nickm＠torproject.org 07 Jul '11

07 Jul '11

commit 3ab09763ced6d892cd72956e53f2dfb804ec0a7c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 7 05:27:20 2011 +0200 Correctly send a SUCCEEDED event for rdns requests The issue was that we overlooked the possibility of reverse DNS success at the end of connection_ap_handshake_socks_resolved(). Issue discovered by katmagic, thanks! --- changes/bug3536 | 5 +++++ src/or/connection_edge.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug3536 b/changes/bug3536 new file mode 100644 index 0000000..d3cec13 --- /dev/null +++ b/changes/bug3536 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Send a SUCCEEDED stream event to the controller when a reverse + resolve succeeded. Fixes bug 3536; bugfix on 0.0.8pre1. Issue + discovered by katmagic. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 78b1b92..d4d7e1c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2611,7 +2611,8 @@ connection_ap_handshake_socks_resolved(edge_connection_t *conn, } connection_ap_handshake_socks_reply(conn, buf, replylen, (answer_type == RESOLVED_TYPE_IPV4 || - answer_type == RESOLVED_TYPE_IPV6) ? + answer_type == RESOLVED_TYPE_IPV6 || + answer_type == RESOLVED_TYPE_HOSTNAME) ? 0 : END_STREAM_REASON_RESOLVEFAILED); }

1 0

[tor/maint-0.2.2] Correctly send a SUCCEEDED event for rdns requests
by nickm＠torproject.org 07 Jul '11

07 Jul '11

commit 3ab09763ced6d892cd72956e53f2dfb804ec0a7c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 7 05:27:20 2011 +0200 Correctly send a SUCCEEDED event for rdns requests The issue was that we overlooked the possibility of reverse DNS success at the end of connection_ap_handshake_socks_resolved(). Issue discovered by katmagic, thanks! --- changes/bug3536 | 5 +++++ src/or/connection_edge.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug3536 b/changes/bug3536 new file mode 100644 index 0000000..d3cec13 --- /dev/null +++ b/changes/bug3536 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Send a SUCCEEDED stream event to the controller when a reverse + resolve succeeded. Fixes bug 3536; bugfix on 0.0.8pre1. Issue + discovered by katmagic. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 78b1b92..d4d7e1c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2611,7 +2611,8 @@ connection_ap_handshake_socks_resolved(edge_connection_t *conn, } connection_ap_handshake_socks_reply(conn, buf, replylen, (answer_type == RESOLVED_TYPE_IPV4 || - answer_type == RESOLVED_TYPE_IPV6) ? + answer_type == RESOLVED_TYPE_IPV6 || + answer_type == RESOLVED_TYPE_HOSTNAME) ? 0 : END_STREAM_REASON_RESOLVEFAILED); }

1 0

r24869: {website} updated docs/de/sidenav.wmi from Sacro (website/trunk/docs/de)
by Runa Sandvik 07 Jul '11

07 Jul '11

Author: runa Date: 2011-07-07 13:34:09 +0000 (Thu, 07 Jul 2011) New Revision: 24869 Modified: website/trunk/docs/de/sidenav.wmi Log: updated docs/de/sidenav.wmi from Sacro Modified: website/trunk/docs/de/sidenav.wmi =================================================================== --- website/trunk/docs/de/sidenav.wmi 2011-07-07 11:43:12 UTC (rev 24868) +++ website/trunk/docs/de/sidenav.wmi 2011-07-07 13:34:09 UTC (rev 24869) @@ -30,6 +30,12 @@ {'url' => 'docs/tor-doc-unix', 'txt' => 'Installation auf Linux/BSD/Unix', }, + {'url' => 'docs/debian', + 'txt' => 'Installation von Tor auf Debian/Ubuntu', + }, + {'url' => 'docs/debian-vidalia', + 'txt' => 'Installation von Vidalia auf Debian/Ubuntu', + }, {'url' => 'docs/tor-doc-osx', 'txt' => 'Installation auf Mac OS X', }, @@ -96,3 +102,4 @@ ]; :> +

1 0

r24868: {website} Fix typo (website/trunk/docs/en)
by Robert Ransom 07 Jul '11

07 Jul '11

Author: rransom Date: 2011-07-07 11:43:12 +0000 (Thu, 07 Jul 2011) New Revision: 24868 Modified: website/trunk/docs/en/installguide.wml Log: Fix typo Modified: website/trunk/docs/en/installguide.wml =================================================================== --- website/trunk/docs/en/installguide.wml 2011-07-07 11:33:52 UTC (rev 24867) +++ website/trunk/docs/en/installguide.wml 2011-07-07 11:43:12 UTC (rev 24868) @@ -2,7 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 2-medium -#include "head.wmi" TITLE="Tor Project: Installtion Instructions" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor Project: Installation Instructions" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a>

1 0

r24867: {website} fix a missing > (website/trunk/docs/en)
by Andrew Lewman 07 Jul '11

07 Jul '11

Author: phobos Date: 2011-07-07 11:33:52 +0000 (Thu, 07 Jul 2011) New Revision: 24867 Modified: website/trunk/docs/en/tor-doc-unix.wml Log: fix a missing > Modified: website/trunk/docs/en/tor-doc-unix.wml =================================================================== --- website/trunk/docs/en/tor-doc-unix.wml 2011-07-07 11:32:10 UTC (rev 24866) +++ website/trunk/docs/en/tor-doc-unix.wml 2011-07-07 11:33:52 UTC (rev 24867) @@ -16,7 +16,7 @@ Note that these are the installation instructions for running a Tor client. The easiest way to do this is to simply download the <a - href="<page projects/torbrowser>"Tor Browser Bundle</a> and you are + href="<page projects/torbrowser>">Tor Browser Bundle</a> and you are done.

1 0

r24866: {website} finish purging polipo from the docs. (website/trunk/docs/en)
by Andrew Lewman 07 Jul '11

07 Jul '11

Author: phobos Date: 2011-07-07 11:32:10 +0000 (Thu, 07 Jul 2011) New Revision: 24866 Modified: website/trunk/docs/en/tor-doc-unix.wml Log: finish purging polipo from the docs. Modified: website/trunk/docs/en/tor-doc-unix.wml =================================================================== --- website/trunk/docs/en/tor-doc-unix.wml 2011-07-07 11:26:25 UTC (rev 24865) +++ website/trunk/docs/en/tor-doc-unix.wml 2011-07-07 11:32:10 UTC (rev 24866) @@ -14,10 +14,10 @@ - Note that these are the installation instructions for running a Tor - client. If you want to relay traffic for others to help the network grow - (please do), read the <a - href="<page docs/tor-doc-relay>">Configuring a relay</a> guide. + Note that these are the installation instructions for running a + Tor client. The easiest way to do this is to simply download the <a + href="<page projects/torbrowser>"Tor Browser Bundle</a> and you are + done. <hr> @@ -78,20 +78,16 @@ entry for running Tor on a different computer</a>. - To Torify other applications that support HTTP proxies, just - point them at Polipo (that is, localhost port 8118). To use SOCKS - directly (for instant messaging, Jabber, IRC, etc), you can point - your application directly at Tor (localhost port 9050), but see <a - href="<wikifaq>#SOCKSAndDNS">this - FAQ entry</a> for why this may be dangerous. For applications - that support neither SOCKS nor HTTP, take a look at <a - href="https://code.google.com/p/torsocks/">torsocks</a> or <a - href="<wiki>doc/TorifyHOWTO#socat">socat</a>. + To Torify other applications that support SOCKS proxies, just + point them at Tor's SOCKS port (127.0.0.1 port 9050). See <a + href="<wikifaq>#SOCKSAndDNS">this FAQ entry</a> for why this may be + dangerous. For applications that support neither SOCKS nor HTTP, take + a look at <a href="https://code.google.com/p/torsocks/">torsocks</a> + or <a href="<wiki>doc/TorifyHOWTO#socat">socat</a>. For information on how to Torify other applications, check out the - <a href="<wiki>doc/TorifyHOWTO">Torify - HOWTO</a>. + <a href="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>. <hr> @@ -101,30 +97,26 @@ Next, you should try using your browser with Tor and make - sure that your IP address is being anonymized. Click on - <a href="https://check.torproject.org/">the - Tor detector</a> - and see whether it thinks you're using Tor or not. - #<a href="http://ipchicken.com/">this site</a> - #to see what IP address it thinks you're using. - (If that site is down, see <a - href="<wikifaq>#IsMyConnectionPrivate">this - FAQ entry</a> for more suggestions on how to test your Tor.) + sure that your IP address is being anonymized. Click on <a + href="https://check.torproject.org/">the Tor detector</a> + and see whether it thinks you're using Tor or not. #<a + href="http://ipchicken.com/">this site</a> #to see what IP + address it thinks you're using. (If that site is down, see <a + href="<wikifaq>#IsMyConnectionPrivate">this FAQ entry</a> for more + suggestions on how to test your Tor.) - If you have a personal firewall that limits your computer's - ability to connect to itself (this includes something like SELinux on - Fedora Core 4), be sure to allow connections from - your local applications to Polipo (local port 8118) and Tor (local port - 9050). If - your firewall blocks outgoing connections, punch a hole so - it can connect to at least TCP ports 80 and 443, and then see <a - href="<wikifaq>#FirewalledClient">this - FAQ entry</a>. If your SELinux config is not allowing tor or privoxy to - run correctly, create a file named booleans.local in the directory - /etc/selinux/targeted. Edit this file in your favorite text editor and - insert "allow_ypbind=1". Restart your machine for this change to take - effect. + If you have a personal firewall that limits your computer's ability + to connect to itself (this includes something like SELinux on Fedora + Core 4), be sure to allow connections from your local applications to + Tor (local port 9050). If your firewall blocks outgoing connections, + punch a hole so it can connect to at least TCP ports 80 and 443, and + then see <a href="<wikifaq>#FirewalledClient">this FAQ entry</a>. + If your SELinux config is not allowing tor or privoxy to run + correctly, create a file named booleans.local in the directory + /etc/selinux/targeted. Edit this file in your favorite text editor + and insert "allow_ypbind=1". Restart your machine for this change + to take effect. If it's still not working, look at <a @@ -139,19 +131,18 @@ The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 20 kilobytes/s each way, please help out Tor by configuring your + at least 20 KiloBytes/s each way, please help out Tor by configuring your Tor to be a relay too. We have many features that make Tor relays easy and convenient, including rate limiting for bandwidth, exit policies so you can limit your exposure to abuse complaints, and support for dynamic IP addresses. Having relays in many different places on the Internet is what - makes Tor users secure. <a - href="<wikifaq>#RelayAnonymity">You - may also get stronger anonymity yourself</a>, - since remote sites can't know whether connections originated at your - computer or were relayed from others. - + makes Tor users secure. <a href="<wikifaq>#RelayAnonymity">You may + also get stronger anonymity yourself</a>, since remote sites can't + know whether connections originated at your computer or were relayed + from others. + Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.

1 0

r24865: {website} link to the debian/ubuntu docs in the sidenav so people have (website/trunk/docs/en)
by Andrew Lewman 07 Jul '11

07 Jul '11

Author: phobos Date: 2011-07-07 11:26:25 +0000 (Thu, 07 Jul 2011) New Revision: 24865 Modified: website/trunk/docs/en/sidenav.wmi Log: link to the debian/ubuntu docs in the sidenav so people have some hope of finding it. Modified: website/trunk/docs/en/sidenav.wmi =================================================================== --- website/trunk/docs/en/sidenav.wmi 2011-07-07 11:23:55 UTC (rev 24864) +++ website/trunk/docs/en/sidenav.wmi 2011-07-07 11:26:25 UTC (rev 24865) @@ -30,14 +30,20 @@ {'url' => 'docs/tor-doc-unix', 'txt' => 'Installing on Linux/BSD/Unix', }, + {'url' => 'docs/debian', + 'txt' => 'Installing Tor on Debian/Ubuntu', + }, + {'url' => 'docs/debian-vidalia', + 'txt' => 'Installing Vidalia on Debian/Ubuntu', + }, {'url' => 'docs/tor-doc-osx', - 'txt' => 'Installing on Mac OS X', + 'txt' => 'Installing Tor on Mac OS X', }, {'url' => 'docs/android', - 'txt' => 'Installing on Android', + 'txt' => 'Installing Tor on Android', }, {'url' => 'docs/N900', - 'txt' => 'Installing on Maemo/N900', + 'txt' => 'Installing Tor on Maemo/N900', }, {'url' => 'docs/verifying-signatures', 'txt' => 'Verify our GPG signatures',

1 0