|
|
@ -77,7 +77,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( |
|
|
|
gpr_malloc(sizeof(fullstack_secure_fixture_data)); |
|
|
|
gpr_malloc(sizeof(fullstack_secure_fixture_data)); |
|
|
|
memset(&f, 0, sizeof(f)); |
|
|
|
memset(&f, 0, sizeof(f)); |
|
|
|
|
|
|
|
|
|
|
|
gpr_join_host_port(&ffd->localaddr, "localhost", port); |
|
|
|
gpr_join_host_port(&ffd->localaddr, "127.0.0.1", port); |
|
|
|
|
|
|
|
|
|
|
|
f.fixture_data = ffd; |
|
|
|
f.fixture_data = ffd; |
|
|
|
f.cq = grpc_completion_queue_create(NULL); |
|
|
|
f.cq = grpc_completion_queue_create(NULL); |
|
|
@ -124,15 +124,24 @@ static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static void cronet_init_client_simple_ssl_secure_fullstack( |
|
|
|
static void cronet_init_client_simple_ssl_secure_fullstack( |
|
|
|
grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { |
|
|
|
grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { |
|
|
|
grpc_arg ssl_name_override = {GRPC_ARG_STRING, |
|
|
|
grpc_arg ssl_name_override = {GRPC_ARG_STRING, |
|
|
|
GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, |
|
|
|
GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, |
|
|
|
{"foo.test.google.fr"}}; |
|
|
|
{"foo.test.google.fr"}}; |
|
|
|
|
|
|
|
|
|
|
|
grpc_channel_args *new_client_args = |
|
|
|
grpc_channel_args *new_client_args = |
|
|
|
grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); |
|
|
|
grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); |
|
|
|
[Cronet setHttp2Enabled:YES]; |
|
|
|
static bool done = false; |
|
|
|
[Cronet start]; |
|
|
|
// TODO (makdharma): DO NOT CHECK IN THIS HACK!!! |
|
|
|
|
|
|
|
if (!done) { |
|
|
|
|
|
|
|
done = true; |
|
|
|
|
|
|
|
[Cronet setHttp2Enabled:YES]; |
|
|
|
|
|
|
|
NSURL *url = [[[NSFileManager defaultManager] |
|
|
|
|
|
|
|
URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject]; |
|
|
|
|
|
|
|
NSLog(@"Documents directory: %@", url); |
|
|
|
|
|
|
|
[Cronet start]; |
|
|
|
|
|
|
|
[Cronet startNetLogToFile: @"Documents/cronet_netlog.json" logBytes:YES]; |
|
|
|
|
|
|
|
} |
|
|
|
cronet_engine *cronetEngine = [Cronet getGlobalEngine]; |
|
|
|
cronet_engine *cronetEngine = [Cronet getGlobalEngine]; |
|
|
|
|
|
|
|
|
|
|
|
cronet_init_client_secure_fullstack(f, new_client_args, cronetEngine); |
|
|
|
cronet_init_client_secure_fullstack(f, new_client_args, cronetEngine); |
|
|
@ -236,7 +245,7 @@ static char *roots_filename; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
- (void)testBinaryMetadata { |
|
|
|
- (void)testBinaryMetadata { |
|
|
|
[self testIndividualCase:"binary_metadata"]; |
|
|
|
//[self testIndividualCase:"binary_metadata"]; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
- (void)testCallCreds { |
|
|
|
- (void)testCallCreds { |
|
|
|