diff options
| author | David Goulet <dgoulet@torproject.org> | 2024-04-29 16:02:12 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2024-04-29 16:02:12 -0400 |
| commit | 927cd24a7928e41c6b797230726a39b1cc588aa6 (patch) | |
| tree | 00f3deb2b09b6cc4a43ac3bfcd9b9f48406c136a | |
| parent | fa312de1ec250282a732b7a97de502c66bb75677 (diff) | |
| parent | bedc6a90d236f00f91597c67e1fd74a13de01808 (diff) | |
| download | tor-927cd24a7928e41c6b797230726a39b1cc588aa6.tar.gz tor-927cd24a7928e41c6b797230726a39b1cc588aa6.zip | |
Merge branch 'maint-0.4.8' into release-0.4.8
| -rw-r--r-- | changes/ticket40932 | 3 | ||||
| -rw-r--r-- | src/core/or/relay.c | 1 | ||||
| -rw-r--r-- | src/feature/hs/hs_intropoint.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/changes/ticket40932 b/changes/ticket40932 new file mode 100644 index 0000000000..10e1b651c4 --- /dev/null +++ b/changes/ticket40932 @@ -0,0 +1,3 @@ + o Minor bugfix (circuit): + - Remove a log_warn being triggered by a protocol violation that already + emits a protocol warning log. Fixes bug 40932; bugfix on 0.4.8.1-alpha. diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 8e6fddf18b..3670353ad3 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -751,7 +751,6 @@ relay_send_command_from_edge_,(streamid_t stream_id, circuit_t *orig_circ, cpath_layer, stream_id, filename, lineno); if (ret < 0) { - log_warn(LD_BUG,"circuit_package_relay_cell failed. Closing."); circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL); return -1; } else if (ret == 0) { diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c index 02b5b4866b..e799a4c7e4 100644 --- a/src/feature/hs/hs_intropoint.c +++ b/src/feature/hs/hs_intropoint.c @@ -710,7 +710,6 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request, RELAY_COMMAND_INTRODUCE2, (char *) request, request_len, NULL)) { relay_increment_intro1_action(INTRO1_CIRCUIT_DEAD); - log_warn(LD_PROTOCOL, "Unable to send INTRODUCE2 cell to the service."); /* Inform the client that we can't relay the cell. Use the unknown ID * status code since it means that we do not know the service. */ status = TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID; |