diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-03 09:14:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-03 09:14:12 -0400 |
| commit | 1168e21b45cb981463fa77a45c2e697bb75d573c (patch) | |
| tree | 0dabc017d49c4a38f07ab8a671523579c7f483bb | |
| parent | b13bf65062c5918e90cb72c622ef8bdc29d53c20 (diff) | |
| parent | b548371f76f5284d3f96f13b52a3f46b38d14960 (diff) | |
| download | tor-1168e21b45cb981463fa77a45c2e697bb75d573c.tar.gz tor-1168e21b45cb981463fa77a45c2e697bb75d573c.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
| -rw-r--r-- | changes/bug23078 | 7 | ||||
| -rw-r--r-- | 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 0000000000..67624007cf --- /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 2abbfcd6c3..636b345b5b 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -191,7 +191,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; } @@ -249,9 +249,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; @@ -481,7 +478,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; @@ -494,8 +491,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; } |