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

[tor/master] Try to improve documentation for DirAuthority's port field.
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit 42e787817cc78aba714bed683f8a7a9efd7d4f30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 12:58:51 2017 -0400 Try to improve documentation for DirAuthority's port field. Closes ticket 20152 --- changes/doc20152 | 3 +++ doc/tor.1.txt | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/doc20152 b/changes/doc20152 new file mode 100644 index 000000000..8b044e56d --- /dev/null +++ b/changes/doc20152 @@ -0,0 +1,3 @@ + o Documentation: + - Improve the documentation for the directory port part of the + DirAuthority line. Closes ticket 20152. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f0b7fa8e4..2f4337630 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -436,9 +436,11 @@ GENERAL OPTIONS authority is listening for IPv6 connections on the indicated IPv6 address and OR Port. + + - Tor will contact the authority at __address__:__port__ (the DirPort) to - download directory documents. If an IPv6 address is supplied, Tor will - also download directory documents at the IPv6 address on the DirPort. + + Tor will contact the authority at __address__ to + download directory documents. The provided __port__ value is a dirport; + clients ignore this in favor of the specified "orport=" value. If an + IPv6 address is supplied, Tor will + also download directory documents at the IPv6 address on the ORPort. + + If no **DirAuthority** line is given, Tor will use the default directory authorities. NOTE: this option is intended for setting up a private Tor

1 0

[tor/master] Changes suggested by teor.
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit a437080d379bb7a6c723edec163b16a7ca3d2cf9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 10:11:17 2017 -0400 Changes suggested by teor. --- doc/tor.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2f4337630..10af7ddae 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -439,8 +439,8 @@ GENERAL OPTIONS Tor will contact the authority at __address__ to download directory documents. The provided __port__ value is a dirport; clients ignore this in favor of the specified "orport=" value. If an - IPv6 address is supplied, Tor will - also download directory documents at the IPv6 address on the ORPort. + + IPv6 ORPort is supplied, Tor will + also download directory documents at the IPv6 ORPort. + + If no **DirAuthority** line is given, Tor will use the default directory authorities. NOTE: this option is intended for setting up a private Tor

1 0

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

03 Aug '17

commit fabc3deb7570837f0969f8023c6927900263d313 Merge: 96cf608b2 a437080d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 10:11:44 2017 -0400 Merge branch 'bug20152' changes/doc20152 | 3 +++ doc/tor.1.txt | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[tor/master] Don't send missing X-Desc-Gen-Reason on startup
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit 7f329206488cf844aee33fbd2e9724c72421b6af Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 11 10:36:55 2017 -0400 Don't send missing X-Desc-Gen-Reason on startup Since we start with desc_clean_since = 0, we should have been starting with non-null desc_dirty_reason. Fixes bug 22884; bugfix on 0.2.3.4-alpha when X-Desc-Gen-Reason was added. --- changes/bug22885 | 5 +++++ src/or/router.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22885 b/changes/bug22885 new file mode 100644 index 000000000..d95e879eb --- /dev/null +++ b/changes/bug22885 @@ -0,0 +1,5 @@ + o Minor bugfixes (relay): + - When uploading our descriptor for the first time after startup, + report the reason for uploading as "Tor just started" rather than + leaving it blank. Fixes bug 22885; bugfix on 0.2.3.4-alpha. + diff --git a/src/or/router.c b/src/or/router.c index 100c4cc94..1944420a0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1856,7 +1856,7 @@ static const char *desc_gen_reason = NULL; * now. */ static time_t desc_clean_since = 0; /** Why did we mark the descriptor dirty? */ -static const char *desc_dirty_reason = NULL; +static const char *desc_dirty_reason = "Tor just started"; /** Boolean: do we need to regenerate the above? */ static int desc_needs_upload = 0;

1 0

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

03 Aug '17

commit 96cf608b2eeb4643290917b093ae9bd1c1364700 Merge: 40c7871f4 7f3292064 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:33:40 2017 -0400 Merge branch 'bug22885_squashed' changes/bug22885 | 5 +++++ src/or/router.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] 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/release-0.3.1] Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
by nickm＠torproject.org 03 Aug '17

03 Aug '17

commit b548371f76f5284d3f96f13b52a3f46b38d14960 Merge: f33c96610 ff9c52966 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:12:23 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0 changes/bug23078 | 7 +++++++ src/or/hs_intropoint.c | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-)

1 0

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

03 Aug '17

commit 1168e21b45cb981463fa77a45c2e697bb75d573c Merge: b13bf6506 b548371f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23078 | 7 +++++++ src/or/hs_intropoint.c | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-)

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 f248a4a38ee74663a1223dc2f1d083d50dc1f18d Merge: 8e451c5c7 1168e21b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23078 | 7 +++++++ src/or/hs_intropoint.c | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-)

1 0

[tor/master] 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