December 2016 - tor-commits - lists.torproject.org

[tor/master] Remove an unneccessary FetchUselessDescriptors check in client_would_use_router
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit e061cf4d1d7e9d8533cde936f0904d4f7b877746 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 30 11:43:04 2016 +1100 Remove an unneccessary FetchUselessDescriptors check in client_would_use_router --- src/or/networkstatus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 10157c6..bfb3641 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2407,9 +2407,9 @@ int client_would_use_router(const routerstatus_t *rs, time_t now, const or_options_t *options) { - if (!rs->is_flagged_running && !options->FetchUselessDescriptors) { + if (!rs->is_flagged_running) { /* If we had this router descriptor, we wouldn't even bother using it. - * But, if we want to have a complete list, fetch it anyway. */ + * (Fetching and storing depends on by we_want_to_fetch_flavor().) */ return 0; } if (rs->published_on + options->TestingEstimatedDescriptorPropagationTime

1 0

[tor/master] Merge remote-tracking branch 'teor/bug20667'
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit ed4213fa08a92af6fed2ddc5dda1747f2af25e50 Merge: d7ec170 04f7944 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 12:07:10 2016 -0500 Merge remote-tracking branch 'teor/bug20667' changes/bug20667 | 5 +++++ changes/bug20839 | 5 +++++ doc/tor.1.txt | 12 +++++++----- src/or/control.c | 2 +- src/or/dirserv.c | 9 +++++++-- src/or/networkstatus.c | 42 ++++++++++++++++++++++++++++++++++-------- src/or/networkstatus.h | 2 ++ src/or/routerlist.c | 20 +++++++++++--------- 8 files changed, 72 insertions(+), 25 deletions(-)

1 0

[tor/master] Man page update and changes file for 20667
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit 24e293c3c6228c0038360471e9bbd4b4b4daed05 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 30 11:18:38 2016 +1100 Man page update and changes file for 20667 --- changes/bug20667 | 5 +++++ doc/tor.1.txt | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/bug20667 b/changes/bug20667 new file mode 100644 index 0000000..93b293a --- /dev/null +++ b/changes/bug20667 @@ -0,0 +1,5 @@ + o Minor bugfixes (directory downloads): + - Download all consensus flavors, descriptors, and authority certificates + when FetchUselessDescriptors is set, regardless of whether tor is a + directory cache or not. + Fixes bug 20667; bugfix on all recent tor versions. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 670c75d..aa3859e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -504,11 +504,13 @@ GENERAL OPTIONS (Default: 1) [[FetchUselessDescriptors]] **FetchUselessDescriptors** **0**|**1**:: - If set to 1, Tor will fetch every non-obsolete descriptor from the - authorities that it hears about. Otherwise, it will avoid fetching useless - descriptors, for example for routers that are not running. This option is - useful if you're using the contributed "exitlist" script to enumerate Tor - nodes that exit to certain addresses. (Default: 0) + If set to 1, Tor will fetch every consensus flavor, descriptor, and + certificate that it hears about. Otherwise, it will avoid fetching useless + descriptors: flavors that it is not using to build circuits, and authority + certificates it does not trust. This option is useful if you're using a + tor client with an external parser that uses a full consensus. + This option fetches all documents, **DirCache** fetches and serves + all documents. (Default: 0) [[HTTPProxy]] **HTTPProxy** __host__[:__port__]:: Tor will make all its directory requests through this host:port (or host:80

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit d7ec1708b1a6bc659e5671463dc493fcf0a9f482 Merge: 0ef5b8d 8b93cbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 12:00:53 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20716 | 3 +++ src/or/connection.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-)

1 0

[tor/master] Fix memory leak in bug 20716
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit 3b6da3f90ccad60517f5b639d5340a7e6489be27 Author: overcaffeinated <overcaffeinated(a)airmail.cc> Date: Sat Nov 19 19:32:08 2016 +0000 Fix memory leak in bug 20716 newconn->address is strdup'ed twice when new_type == CONN_TYPE_AP and conn->socket_family == AF_UNIX. Whilst here, juggle code to make sure newconn->port is assigned from an initialised value in the above case. --- changes/bug20716 | 3 +++ src/or/connection.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes/bug20716 b/changes/bug20716 new file mode 100644 index 0000000..37fd6fe --- /dev/null +++ b/changes/bug20716 @@ -0,0 +1,3 @@ + o Minor bugfixes (client, memory leak): + - Fix a small memory leak when receiving AF_UNIX connections on + a SocksPort. Fixes bug 20716; bugfix on 0.2.6.3-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index 721ee20..3fe7f45 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1497,16 +1497,19 @@ connection_handle_listener_read(connection_t *conn, int new_type) /* remember the remote address */ tor_addr_copy(&newconn->addr, &addr); - newconn->port = port; - newconn->address = tor_dup_addr(&addr); + if (new_type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { + newconn->port = 0; + newconn->address = tor_strdup(conn->address); + } else { + newconn->port = port; + newconn->address = tor_dup_addr(&addr); + } if (new_type == CONN_TYPE_AP && conn->socket_family != AF_UNIX) { log_info(LD_NET, "New SOCKS connection opened from %s.", fmt_and_decorate_addr(&addr)); } if (new_type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { - newconn->port = 0; - newconn->address = tor_strdup(conn->address); log_info(LD_NET, "New SOCKS AF_UNIX connection opened"); } if (new_type == CONN_TYPE_CONTROL) {

1 0

[tor/maint-0.2.9] Merge branch 'bug20716_026' into maint-0.2.9
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit 8b93cbc16d2ec0b64ce9d48482a2cf2164ed1199 Merge: 70d3985 3b6da3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 12:00:46 2016 -0500 Merge branch 'bug20716_026' into maint-0.2.9 changes/bug20716 | 3 +++ src/or/connection.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --cc src/or/connection.c index 49cb78e,3fe7f45..d30ec46 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1594,8 -1497,13 +1594,13 @@@ connection_handle_listener_read(connect /* remember the remote address */ tor_addr_copy(&newconn->addr, &addr); - newconn->port = port; - newconn->address = tor_addr_to_str_dup(&addr); + if (new_type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { + newconn->port = 0; + newconn->address = tor_strdup(conn->address); + } else { + newconn->port = port; - newconn->address = tor_dup_addr(&addr); ++ newconn->address = tor_addr_to_str_dup(&addr); + } if (new_type == CONN_TYPE_AP && conn->socket_family != AF_UNIX) { log_info(LD_NET, "New SOCKS connection opened from %s.",

1 0

[tor/maint-0.2.9] Fix memory leak in bug 20716
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit 3b6da3f90ccad60517f5b639d5340a7e6489be27 Author: overcaffeinated <overcaffeinated(a)airmail.cc> Date: Sat Nov 19 19:32:08 2016 +0000 Fix memory leak in bug 20716 newconn->address is strdup'ed twice when new_type == CONN_TYPE_AP and conn->socket_family == AF_UNIX. Whilst here, juggle code to make sure newconn->port is assigned from an initialised value in the above case. --- changes/bug20716 | 3 +++ src/or/connection.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes/bug20716 b/changes/bug20716 new file mode 100644 index 0000000..37fd6fe --- /dev/null +++ b/changes/bug20716 @@ -0,0 +1,3 @@ + o Minor bugfixes (client, memory leak): + - Fix a small memory leak when receiving AF_UNIX connections on + a SocksPort. Fixes bug 20716; bugfix on 0.2.6.3-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index 721ee20..3fe7f45 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1497,16 +1497,19 @@ connection_handle_listener_read(connection_t *conn, int new_type) /* remember the remote address */ tor_addr_copy(&newconn->addr, &addr); - newconn->port = port; - newconn->address = tor_dup_addr(&addr); + if (new_type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { + newconn->port = 0; + newconn->address = tor_strdup(conn->address); + } else { + newconn->port = port; + newconn->address = tor_dup_addr(&addr); + } if (new_type == CONN_TYPE_AP && conn->socket_family != AF_UNIX) { log_info(LD_NET, "New SOCKS connection opened from %s.", fmt_and_decorate_addr(&addr)); } if (new_type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { - newconn->port = 0; - newconn->address = tor_strdup(conn->address); log_info(LD_NET, "New SOCKS AF_UNIX connection opened"); } if (new_type == CONN_TYPE_CONTROL) {

1 0

[tor/master] Merge branch 'bug20716_026' into maint-0.2.9
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit 8b93cbc16d2ec0b64ce9d48482a2cf2164ed1199 Merge: 70d3985 3b6da3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 12:00:46 2016 -0500 Merge branch 'bug20716_026' into maint-0.2.9 changes/bug20716 | 3 +++ src/or/connection.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --cc src/or/connection.c index 49cb78e,3fe7f45..d30ec46 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1594,8 -1497,13 +1594,13 @@@ connection_handle_listener_read(connect /* remember the remote address */ tor_addr_copy(&newconn->addr, &addr); - newconn->port = port; - newconn->address = tor_addr_to_str_dup(&addr); + if (new_type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { + newconn->port = 0; + newconn->address = tor_strdup(conn->address); + } else { + newconn->port = port; - newconn->address = tor_dup_addr(&addr); ++ newconn->address = tor_addr_to_str_dup(&addr); + } if (new_type == CONN_TYPE_AP && conn->socket_family != AF_UNIX) { log_info(LD_NET, "New SOCKS connection opened from %s.",

1 0

[tor/release-0.2.9] Fix memory leak in bug 20716
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit 3b6da3f90ccad60517f5b639d5340a7e6489be27 Author: overcaffeinated <overcaffeinated(a)airmail.cc> Date: Sat Nov 19 19:32:08 2016 +0000 Fix memory leak in bug 20716 newconn->address is strdup'ed twice when new_type == CONN_TYPE_AP and conn->socket_family == AF_UNIX. Whilst here, juggle code to make sure newconn->port is assigned from an initialised value in the above case. --- changes/bug20716 | 3 +++ src/or/connection.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes/bug20716 b/changes/bug20716 new file mode 100644 index 0000000..37fd6fe --- /dev/null +++ b/changes/bug20716 @@ -0,0 +1,3 @@ + o Minor bugfixes (client, memory leak): + - Fix a small memory leak when receiving AF_UNIX connections on + a SocksPort. Fixes bug 20716; bugfix on 0.2.6.3-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index 721ee20..3fe7f45 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1497,16 +1497,19 @@ connection_handle_listener_read(connection_t *conn, int new_type) /* remember the remote address */ tor_addr_copy(&newconn->addr, &addr); - newconn->port = port; - newconn->address = tor_dup_addr(&addr); + if (new_type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { + newconn->port = 0; + newconn->address = tor_strdup(conn->address); + } else { + newconn->port = port; + newconn->address = tor_dup_addr(&addr); + } if (new_type == CONN_TYPE_AP && conn->socket_family != AF_UNIX) { log_info(LD_NET, "New SOCKS connection opened from %s.", fmt_and_decorate_addr(&addr)); } if (new_type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { - newconn->port = 0; - newconn->address = tor_strdup(conn->address); log_info(LD_NET, "New SOCKS AF_UNIX connection opened"); } if (new_type == CONN_TYPE_CONTROL) {

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 02 Dec '16

02 Dec '16

commit ef7df109720b80a534f187099e834e9a8d0ecb88 Merge: b236e18 8b93cbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 12:01:00 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug20716 | 3 +++ src/or/connection.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-)

1 0