August 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.0] hs: Cleanup logging statement in hs_intropoint.c
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit ff9c52966796bae56cd216697ba879c06f806034 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 1 14:15:47 2017 -0400 hs: Cleanup logging statement in hs_intropoint.c One log statement was a warning and has been forgotten. It is triggered for a successful attempt at introducting from a client. It has been reported here: https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html Three other log_warn() statement changed to protocol warning because they are errors that basically can come from the network and thus triggered by anyone. Fixes #23078. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23078 | 7 +++++++ src/or/hs_intropoint.c | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/changes/bug23078 b/changes/bug23078 new file mode 100644 index 000000000..67624007c --- /dev/null +++ b/changes/bug23078 @@ -0,0 +1,7 @@ + o Minor bugfixes (logging, relay): + - Remove a log_warn() that has been forgotten when an introduction point + successfully established a hidden service prop224 circuit with a client. + - Three other log_warn() for an introduction point have been changed to + protocol warning because they can be failure from the network and are + not relevant to the operator. Fixes bug 23078; bugfix on + tor-0.3.0.1-alpha and tor-0.3.0.2-alpha. diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index db4ba7982..e065ef64f 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -190,7 +190,7 @@ handle_verified_establish_intro_cell(or_circuit_t *circ, /* Then notify the hidden service that the intro point is established by sending an INTRO_ESTABLISHED cell */ if (hs_intro_send_intro_established_cell(circ)) { - log_warn(LD_BUG, "Couldn't send INTRO_ESTABLISHED cell."); + log_warn(LD_PROTOCOL, "Couldn't send INTRO_ESTABLISHED cell."); return -1; } @@ -248,9 +248,6 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request, goto err; } - log_warn(LD_GENERAL, "Established prop224 intro point on circuit %" PRIu32, - circ->p_circ_id); - /* We are done! */ retval = 0; goto done; @@ -480,7 +477,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request, if (relay_send_command_from_edge(CONTROL_CELL_ID, TO_CIRCUIT(service_circ), RELAY_COMMAND_INTRODUCE2, (char *) request, request_len, NULL)) { - log_warn(LD_REND, "Unable to send INTRODUCE2 cell to the service."); + log_warn(LD_PROTOCOL, "Unable to send INTRODUCE2 cell to the service."); /* Inform the client that we can't relay the cell. */ status = HS_INTRO_ACK_STATUS_CANT_RELAY; goto send_ack; @@ -493,8 +490,8 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request, send_ack: /* Send INTRODUCE_ACK or INTRODUCE_NACK to client */ if (send_introduce_ack_cell(client_circ, status) < 0) { - log_warn(LD_REND, "Unable to send an INTRODUCE ACK status %d to client.", - status); + log_warn(LD_PROTOCOL, "Unable to send an INTRODUCE ACK status %d " + "to client.", status); /* Circuit has been closed on failure of transmission. */ goto done; }

1 0

[tor/master] Merge branch 'bug23081_025' into maint-0.3.1
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit b13bf65062c5918e90cb72c622ef8bdc29d53c20 Merge: e220e6e43 3e68db02c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:10:58 2017 -0400 Merge branch 'bug23081_025' into maint-0.3.1 changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

1 0

[tor/release-0.3.1] In ntmain, call set_main_thread() before running the loop.
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit 3e68db02c45ea06c3f20854df1f76894424d4357 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:07:28 2017 -0400 In ntmain, call set_main_thread() before running the loop. Patch from Vort; fixes bug 23081; bugfix on fd992deeea76972 in 0.2.1.16-rc when set_main_thread() was introduced. See the changes file for a list of all the symptoms this bug has been causing when running Tor as a Windows Service. --- changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+) diff --git a/changes/bug23081 b/changes/bug23081 new file mode 100644 index 000000000..76c4e3097 --- /dev/null +++ b/changes/bug23081 @@ -0,0 +1,8 @@ + o Minor bugfixes (Windows service): + - When running as a Windows service, set the ID of the main thread + correctly. Failure to do so made us fail to send log messages + to the controller in 0.2.1.16-rc, slowed down controller + event delivery in 0.2.7.3-rc and later, and crash with an assertion + failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha. + Patch and diagnosis from "Vort". + diff --git a/src/or/ntmain.c b/src/or/ntmain.c index e84831404..ddbe7a3e4 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -281,6 +281,7 @@ nt_service_body(int argc, char **argv) * event loop */ service_status.dwCurrentState = SERVICE_RUNNING; service_fns.SetServiceStatus_fn(hStatus, &service_status); + set_main_thread(); do_main_loop(); tor_cleanup(); }

1 0

[tor/release-0.3.1] Merge branch 'bug23081_025' into maint-0.3.1
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit b13bf65062c5918e90cb72c622ef8bdc29d53c20 Merge: e220e6e43 3e68db02c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:10:58 2017 -0400 Merge branch 'bug23081_025' into maint-0.3.1 changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit 17073d7234031c318108300007d2f540c0c6c859 Merge: 2624cd63e b13bf6506 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:11:03 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit 8e451c5c7c22ed2f48d2378aecfbbc9ae851090a Merge: e084fa419 b13bf6506 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:11:03 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

1 0

[tor/master] In ntmain, call set_main_thread() before running the loop.
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit 3e68db02c45ea06c3f20854df1f76894424d4357 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:07:28 2017 -0400 In ntmain, call set_main_thread() before running the loop. Patch from Vort; fixes bug 23081; bugfix on fd992deeea76972 in 0.2.1.16-rc when set_main_thread() was introduced. See the changes file for a list of all the symptoms this bug has been causing when running Tor as a Windows Service. --- changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+) diff --git a/changes/bug23081 b/changes/bug23081 new file mode 100644 index 000000000..76c4e3097 --- /dev/null +++ b/changes/bug23081 @@ -0,0 +1,8 @@ + o Minor bugfixes (Windows service): + - When running as a Windows service, set the ID of the main thread + correctly. Failure to do so made us fail to send log messages + to the controller in 0.2.1.16-rc, slowed down controller + event delivery in 0.2.7.3-rc and later, and crash with an assertion + failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha. + Patch and diagnosis from "Vort". + diff --git a/src/or/ntmain.c b/src/or/ntmain.c index e84831404..ddbe7a3e4 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -281,6 +281,7 @@ nt_service_body(int argc, char **argv) * event loop */ service_status.dwCurrentState = SERVICE_RUNNING; service_fns.SetServiceStatus_fn(hStatus, &service_status); + set_main_thread(); do_main_loop(); tor_cleanup(); }

1 0

[tor/maint-0.3.1] In ntmain, call set_main_thread() before running the loop.
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit 3e68db02c45ea06c3f20854df1f76894424d4357 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:07:28 2017 -0400 In ntmain, call set_main_thread() before running the loop. Patch from Vort; fixes bug 23081; bugfix on fd992deeea76972 in 0.2.1.16-rc when set_main_thread() was introduced. See the changes file for a list of all the symptoms this bug has been causing when running Tor as a Windows Service. --- changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+) diff --git a/changes/bug23081 b/changes/bug23081 new file mode 100644 index 000000000..76c4e3097 --- /dev/null +++ b/changes/bug23081 @@ -0,0 +1,8 @@ + o Minor bugfixes (Windows service): + - When running as a Windows service, set the ID of the main thread + correctly. Failure to do so made us fail to send log messages + to the controller in 0.2.1.16-rc, slowed down controller + event delivery in 0.2.7.3-rc and later, and crash with an assertion + failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha. + Patch and diagnosis from "Vort". + diff --git a/src/or/ntmain.c b/src/or/ntmain.c index e84831404..ddbe7a3e4 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -281,6 +281,7 @@ nt_service_body(int argc, char **argv) * event loop */ service_status.dwCurrentState = SERVICE_RUNNING; service_fns.SetServiceStatus_fn(hStatus, &service_status); + set_main_thread(); do_main_loop(); tor_cleanup(); }

1 0

[tor/maint-0.3.1] Merge branch 'bug23081_025' into maint-0.3.1
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit b13bf65062c5918e90cb72c622ef8bdc29d53c20 Merge: e220e6e43 3e68db02c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:10:58 2017 -0400 Merge branch 'bug23081_025' into maint-0.3.1 changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

1 0

[tor/master] add changes file for STRUCT_OFFSET removeal (22521)
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit 2624cd63eeeb72323db1d8ab39d6e1829d77d3c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 08:57:52 2017 -0400 add changes file for STRUCT_OFFSET removeal (22521) --- changes/ticket22521 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket22521 b/changes/ticket22521 new file mode 100644 index 000000000..15a6218fa --- /dev/null +++ b/changes/ticket22521 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Replace our STRUCT_OFFSET() macro with offsetof(). Closes + ticket 22521. Patch from Neel Chauhan.

1 0