Skip to content

Commit 5c8b3e0

Browse files
Actually commited changes this time. (#31)
1 parent eeb0597 commit 5c8b3e0

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

bin/elasticurl/main.c

+7-2
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,11 @@ int main(int argc, char **argv) {
552552

553553
struct aws_event_loop_group el_group;
554554
aws_event_loop_group_default_init(&el_group, allocator, 1);
555-
struct aws_client_bootstrap *bootstrap = aws_client_bootstrap_new(allocator, &el_group, NULL, NULL);
555+
556+
struct aws_host_resolver resolver;
557+
aws_host_resolver_init_default(&resolver, allocator, 8, &el_group);
558+
559+
struct aws_client_bootstrap *bootstrap = aws_client_bootstrap_new(allocator, &el_group, &resolver, NULL);
556560

557561
struct aws_socket_options socket_options = {
558562
.type = AWS_SOCKET_STREAM,
@@ -580,7 +584,8 @@ int main(int argc, char **argv) {
580584
aws_mutex_lock(&app_ctx.mutex);
581585
aws_condition_variable_wait_pred(&app_ctx.c_var, &app_ctx.mutex, s_completion_predicate, &app_ctx);
582586

583-
aws_client_bootstrap_destroy(bootstrap);
587+
aws_client_bootstrap_release(bootstrap);
588+
aws_host_resolver_clean_up(&resolver);
584589
aws_event_loop_group_clean_up(&el_group);
585590

586591
if (tls_ctx) {

tests/test_connection.c

+7-4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ struct tester {
5252
struct aws_allocator *alloc;
5353
struct aws_logger logger;
5454
struct aws_event_loop_group event_loop_group;
55+
struct aws_host_resolver host_resolver;
5556
struct aws_server_bootstrap *server_bootstrap;
5657
struct aws_http_server *server;
5758
struct aws_client_bootstrap *client_bootstrap;
@@ -205,7 +206,7 @@ static int s_tester_init(struct tester *tester, const struct tester_options *opt
205206
ASSERT_SUCCESS(aws_condition_variable_init(&tester->wait_cvar));
206207

207208
ASSERT_SUCCESS(aws_event_loop_group_default_init(&tester->event_loop_group, tester->alloc, 1));
208-
209+
ASSERT_SUCCESS(aws_host_resolver_init_default(&tester->host_resolver, tester->alloc, 8, &tester->event_loop_group));
209210
tester->server_bootstrap = aws_server_bootstrap_new(tester->alloc, &tester->event_loop_group);
210211
ASSERT_NOT_NULL(tester->server_bootstrap);
211212

@@ -244,7 +245,8 @@ static int s_tester_init(struct tester *tester, const struct tester_options *opt
244245
return AWS_OP_SUCCESS;
245246
}
246247

247-
tester->client_bootstrap = aws_client_bootstrap_new(tester->alloc, &tester->event_loop_group, NULL, NULL);
248+
tester->client_bootstrap =
249+
aws_client_bootstrap_new(tester->alloc, &tester->event_loop_group, &tester->host_resolver, NULL);
248250
ASSERT_NOT_NULL(tester->client_bootstrap);
249251

250252
/* Connect */
@@ -274,11 +276,12 @@ static int s_tester_clean_up(struct tester *tester) {
274276

275277
ASSERT_SUCCESS(s_tester_wait(tester, s_tester_connection_shutdown_pred));
276278

277-
aws_client_bootstrap_destroy(tester->client_bootstrap);
279+
aws_client_bootstrap_release(tester->client_bootstrap);
278280
}
279281

280282
aws_http_server_destroy(tester->server);
281-
aws_server_bootstrap_destroy(tester->server_bootstrap);
283+
aws_server_bootstrap_release(tester->server_bootstrap);
284+
aws_host_resolver_clean_up(&tester->host_resolver);
282285
aws_event_loop_group_clean_up(&tester->event_loop_group);
283286
aws_http_library_clean_up();
284287
aws_logger_clean_up(&tester->logger);

0 commit comments

Comments
 (0)