Skip to content

Commit 95a2b4e

Browse files
committed
Reveal the issue
1 parent 1af325b commit 95a2b4e

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

source/channel.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,8 @@ int aws_channel_slot_on_handler_shutdown_complete(
10051005
}
10061006

10071007
size_t aws_channel_slot_downstream_read_window(struct aws_channel_slot *slot) {
1008-
AWS_ASSERT(slot->adj_right);
1008+
AWS_LOGF_ERROR(AWS_LS_IO_CHANNEL, "=== Reading from slot %p (%p)", (void*)slot, (void*)slot->adj_right);
1009+
AWS_FATAL_ASSERT(slot->adj_right);
10091010
return slot->channel->read_back_pressure_enabled ? slot->adj_right->window_size : SIZE_MAX;
10101011
}
10111012

source/channel_bootstrap.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,11 +1563,13 @@ static void s_on_server_channel_on_setup_completed(struct aws_channel *channel,
15631563
AWS_LOGF_TRACE(
15641564
AWS_LS_IO_CHANNEL_BOOTSTRAP,
15651565
"id=%p: Setting up socket handler on channel "
1566-
"%p with handler %p on slot %p.",
1566+
"%p with handler %p on slot %p (%p, %p)",
15671567
(void *)channel_data->server_connection_args->bootstrap,
15681568
(void *)channel,
15691569
(void *)socket_channel_handler,
1570-
(void *)socket_slot);
1570+
(void *)socket_slot,
1571+
(void *)socket_slot->adj_right,
1572+
(void *)socket_slot->adj_left);
15711573

15721574
if (aws_channel_slot_set_handler(socket_slot, socket_channel_handler)) {
15731575
err_code = aws_last_error();
@@ -1583,6 +1585,9 @@ static void s_on_server_channel_on_setup_completed(struct aws_channel *channel,
15831585
* when a TLS connection has been successfully established. At that point, we signal a successful TLS
15841586
* handshake, which also makes the server name and protocol available (if provided).
15851587
*/
1588+
// FIXME A code path used in the tls_server_hangup_during_negotiation test needs slots from that are set up
1589+
// by s_setup_server_tls.
1590+
// FIXME AWS_ASSERT compiles to noop in our CI.
15861591
s_tls_server_on_negotiation_result(socket_channel_handler, socket_slot, err_code, channel_data);
15871592
return;
15881593
}

0 commit comments

Comments
 (0)