- tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 04 May '16

04 May '16

commit 2384256a3719fbc31793228b0b34716b7817d15e Merge: e24c902 b8e8910 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:12:20 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18686 | 5 +++++ src/common/util.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor/master] Report success when not terminating an already terminated process.
by nickm＠torproject.org 04 May '16

04 May '16

commit c7b9e0b8ed7076525da185e25c2142b18b4d43e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:10:36 2016 -0400 Report success when not terminating an already terminated process. Also, document the actual behavior and return values of tor_terminate_process. Fixes bug18686; bugfix on 0.2.3.9-alpha. --- changes/bug18686 | 5 +++++ src/common/util.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/bug18686 b/changes/bug18686 new file mode 100644 index 0000000..23547d2 --- /dev/null +++ b/changes/bug18686 @@ -0,0 +1,5 @@ + o Minor bugfixes (pluggable transports): + - Avoid reporting a spurious error when we decide that we don't + need to terminate a pluggable transport because it has already + exited. Fixes bug 18686; bugfix on 0.2.5.5-alpha. + diff --git a/src/common/util.c b/src/common/util.c index 04cc6b1..65af8a6 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3626,8 +3626,13 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, /* Maximum number of file descriptors, if we cannot get it via sysconf() */ #define DEFAULT_MAX_FD 256 -/** Terminate the process of process_handle. - * Code borrowed from Python's os.kill. */ +/** Terminate the process of process_handle, if that process has not + * already exited. + * + * Return 0 if we succeeded in terminating the process (or if the process + * already exited), and -1 if we tried to kill the process but failed. + * + * Based on code originally borrowed from Python's os.kill. */ int tor_terminate_process(process_handle_t *process_handle) { @@ -3647,7 +3652,7 @@ tor_terminate_process(process_handle_t *process_handle) } #endif - return -1; + return 0; /* We didn't need to kill the process, so report success */ } /** Return the Process ID of process_handle. */

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 04 May '16

04 May '16

commit 27c1b0ea4330e4aee8b464543bbe03b932005368 Merge: 2384256 6027429 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:13:15 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18312 | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug18686_025' into maint-0.2.8
by nickm＠torproject.org 04 May '16

04 May '16

commit b8e8910d60e41844ce4ab37d9306cb8e8b5aec91 Merge: 31332a8 c7b9e0b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:12:11 2016 -0400 Merge branch 'bug18686_025' into maint-0.2.8 changes/bug18686 | 5 +++++ src/common/util.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.8] Do not recommend use of nicknames in MapAddress manpage
by nickm＠torproject.org 04 May '16

04 May '16

commit 92615f608c2fd1b5da29068498c5fe473105e88f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 20:30:59 2016 -0400 Do not recommend use of nicknames in MapAddress manpage --- changes/bug18312 | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug18312 b/changes/bug18312 new file mode 100644 index 0000000..7dcb326 --- /dev/null +++ b/changes/bug18312 @@ -0,0 +1,4 @@ + o Documentation: + - Stop recommending use of nicknames to identify relays in our + MapAddress documentation. Closes ticket 18312. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 262a36e..787223d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -961,12 +961,12 @@ The following options are useful only for clients (that is, if When a request for address arrives to Tor, it will transform to newaddress before processing it. For example, if you always want connections to www.example.com to exit via __torserver__ (where __torserver__ is the - nickname of the server), use "MapAddress www.example.com + fingerprint of the server), use "MapAddress www.example.com www.example.com.torserver.exit". If the value is prefixed with a "\*.", matches an entire domain. For example, if you always want connections to example.com and any if its subdomains to exit via - __torserver__ (where __torserver__ is the nickname of the server), use + __torserver__ (where __torserver__ is the fingerprint of the server), use "MapAddress \*.example.com \*.example.com.torserver.exit". (Note the leading "*." in each part of the directive.) You can also redirect all subdomains of a domain to a single address. For example, "MapAddress

1 0

[tor/maint-0.2.8] Report success when not terminating an already terminated process.
by nickm＠torproject.org 04 May '16

04 May '16

commit c7b9e0b8ed7076525da185e25c2142b18b4d43e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:10:36 2016 -0400 Report success when not terminating an already terminated process. Also, document the actual behavior and return values of tor_terminate_process. Fixes bug18686; bugfix on 0.2.3.9-alpha. --- changes/bug18686 | 5 +++++ src/common/util.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/bug18686 b/changes/bug18686 new file mode 100644 index 0000000..23547d2 --- /dev/null +++ b/changes/bug18686 @@ -0,0 +1,5 @@ + o Minor bugfixes (pluggable transports): + - Avoid reporting a spurious error when we decide that we don't + need to terminate a pluggable transport because it has already + exited. Fixes bug 18686; bugfix on 0.2.5.5-alpha. + diff --git a/src/common/util.c b/src/common/util.c index 04cc6b1..65af8a6 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3626,8 +3626,13 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, /* Maximum number of file descriptors, if we cannot get it via sysconf() */ #define DEFAULT_MAX_FD 256 -/** Terminate the process of process_handle. - * Code borrowed from Python's os.kill. */ +/** Terminate the process of process_handle, if that process has not + * already exited. + * + * Return 0 if we succeeded in terminating the process (or if the process + * already exited), and -1 if we tried to kill the process but failed. + * + * Based on code originally borrowed from Python's os.kill. */ int tor_terminate_process(process_handle_t *process_handle) { @@ -3647,7 +3652,7 @@ tor_terminate_process(process_handle_t *process_handle) } #endif - return -1; + return 0; /* We didn't need to kill the process, so report success */ } /** Return the Process ID of process_handle. */

1 0

[tor/maint-0.2.8] Merge branch 'bug18686_025' into maint-0.2.8
by nickm＠torproject.org 04 May '16

04 May '16

commit b8e8910d60e41844ce4ab37d9306cb8e8b5aec91 Merge: 31332a8 c7b9e0b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:12:11 2016 -0400 Merge branch 'bug18686_025' into maint-0.2.8 changes/bug18686 | 5 +++++ src/common/util.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.8] Merge branch 'doc18312' into maint-0.2.8
by nickm＠torproject.org 04 May '16

04 May '16

commit 60274296c3e012bb0ca5ad3214e2b8aa0fe19e82 Merge: b8e8910 92615f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:13:07 2016 -0400 Merge branch 'doc18312' into maint-0.2.8 changes/bug18312 | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug18710_025' into maint-0.2.8
by nickm＠torproject.org 04 May '16

04 May '16

commit 31332a878db0d8f8d53fe4e535ec9ae812675315 Merge: 8f292f1 0ca3f49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 14:47:04 2016 -0400 Merge branch 'bug18710_025' into maint-0.2.8 changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] Fix dnsserv.c assertion when no supported questions are requested.
by nickm＠torproject.org 04 May '16

04 May '16

commit 0ca3f495c6fad074606ab75942b64738ed61926a Author: Scott Dial <scott(a)scottdial.com> Date: Wed May 4 14:45:09 2016 -0400 Fix dnsserv.c assertion when no supported questions are requested. The problem is that "q" is always set on the first iteration even if the question is not a supported question. This set of "q" is not necessary, and will be handled after exiting the loop if there if a supported q->type was found. [Changes file by nickm] lease enter the commit message for your changes. Lines starting --- changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug18710 b/changes/bug18710 new file mode 100644 index 0000000..2693955 --- /dev/null +++ b/changes/bug18710 @@ -0,0 +1,6 @@ + o Major bugfixes (DNS proxy): + - Stop a crash that could occur when a client running with DNSPort + received a query with multiple address types, where the first + address type was not supported. Found and fixed by Scott Dial. + Fixes bug 18710; bugfix on 0.2.5.4-alpha. + diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index ecd45be..9b0368d 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -87,8 +87,6 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) for (i = 0; i < req->nquestions; ++i) { if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET) continue; - if (! q) - q = req->questions[i]; switch (req->questions[i]->type) { case EVDNS_TYPE_A: case EVDNS_TYPE_AAAA: @@ -96,7 +94,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) /* We always pick the first one of these questions, if there is one. */ if (! supported_q) - supported_q = q; + supported_q = req->questions[i]; break; default: break;

1 0