diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-03 09:12:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-03 09:12:23 -0400 |
| commit | b548371f76f5284d3f96f13b52a3f46b38d14960 (patch) | |
| tree | 3bd9cae4ae66963f035a7dcbcce67dd9241d21d8 /src | |
| parent | f33c96610f143c71c0309c1021821ab05878f8a0 (diff) | |
| parent | ff9c52966796bae56cd216697ba879c06f806034 (diff) | |
| download | tor-b548371f76f5284d3f96f13b52a3f46b38d14960.tar.gz tor-b548371f76f5284d3f96f13b52a3f46b38d14960.zip | |
Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/hs_intropoint.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index db4ba7982a..e065ef64f4 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; } |