Skip to content

Commit cc97e64

Browse files
committed
remove retrieve check
1 parent 213aca3 commit cc97e64

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

Diff for: source/channel_bootstrap.c

+11-15
Original file line numberDiff line numberDiff line change
@@ -665,11 +665,9 @@ static void s_on_client_connection_established(struct aws_socket *socket, int er
665665
* where the parameters used to create the Apple Network Framework socket require TLS options. */
666666
static void s_retrieve_client_tls_options(struct tls_connection_context *context, void *user_data) {
667667
struct client_connection_args *connection_args = user_data;
668-
if (connection_args->channel_data.tls_options) {
669-
context->host_name = connection_args->channel_data.tls_options.server_name;
670-
context->alpn_list = connection_args->channel_data.tls_options.alpn_list;
671-
context->tls_ctx = connection_args->channel_data.tls_options.ctx;
672-
}
668+
context->host_name = connection_args->channel_data.tls_options.server_name;
669+
context->alpn_list = connection_args->channel_data.tls_options.alpn_list;
670+
context->tls_ctx = connection_args->channel_data.tls_options.ctx;
673671
}
674672

675673
struct connection_task_data {
@@ -1092,16 +1090,14 @@ struct server_connection_args {
10921090

10931091
static void s_retrieve_server_tls_options(struct tls_connection_context *context, void *user_data) {
10941092
struct server_connection_args *connection_args = user_data;
1095-
if (connection_args->tls_options) {
1096-
context->host_name = connection_args->tls_options.server_name;
1097-
context->alpn_list = connection_args->tls_options.alpn_list;
1098-
context->tls_ctx = connection_args->tls_options.ctx;
1099-
1100-
// verify block in an Apple Network TLS negotiation requires a dispatch loop contained within an event loop.
1101-
context->event_loop = connection_args->requested_event_loop;
1102-
if (context->event_loop == NULL) {
1103-
context->event_loop = aws_event_loop_group_get_next_loop(connection_args->bootstrap->event_loop_group);
1104-
}
1093+
context->host_name = connection_args->tls_options.server_name;
1094+
context->alpn_list = connection_args->tls_options.alpn_list;
1095+
context->tls_ctx = connection_args->tls_options.ctx;
1096+
1097+
// verify block in an Apple Network TLS negotiation requires a dispatch loop contained within an event loop.
1098+
context->event_loop = connection_args->requested_event_loop;
1099+
if (context->event_loop == NULL) {
1100+
context->event_loop = aws_event_loop_group_get_next_loop(connection_args->bootstrap->event_loop_group);
11051101
}
11061102
}
11071103

0 commit comments

Comments
 (0)