diff options
| author |  David Garcia Quintas <dgq@google.com> | 2018-03-21 16:35:36 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2018-03-21 16:35:36 -0700 |
| commit | a10634cadc5562c660724084ebc8c4baa1532fbf (patch) | |
| tree | 4112a026c3546e608d34c34dfb3833485d1313da /test/core/surface | |
| parent | 31e957632fc59457b061f72e98951e293c8c0851 (diff) | |
| parent | 92d11e368bdd7859058180da615f0d4af3f83f8d (diff) | |
Merge branch 'master' of github.com:grpc/grpc into authority_header
Diffstat (limited to 'test/core/surface')
| -rw-r--r-- | test/core/surface/concurrent_connectivity_test.cc | 5 | ||||
| -rw-r--r-- | test/core/surface/public_headers_must_be_c89.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index c1298b6636..fbc5ec4c54 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -124,14 +124,13 @@ void bad_server_thread(void* vargs) { grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; - struct sockaddr_storage* addr = - reinterpret_cast<struct sockaddr_storage*>(resolved_addr.addr); + grpc_sockaddr* addr = reinterpret_cast<grpc_sockaddr*>(resolved_addr.addr); int port; grpc_tcp_server* s; grpc_error* error = grpc_tcp_server_create(nullptr, nullptr, &s); GPR_ASSERT(error == GRPC_ERROR_NONE); memset(&resolved_addr, 0, sizeof(resolved_addr)); - addr->ss_family = AF_INET; + addr->sa_family = GRPC_AF_INET; error = grpc_tcp_server_add_port(s, &resolved_addr, &port); GPR_ASSERT(GRPC_LOG_IF_ERROR("grpc_tcp_server_add_port", error)); GPR_ASSERT(port > 0); diff --git a/test/core/surface/public_headers_must_be_c89.c b/test/core/surface/public_headers_must_be_c89.c index bd4dc0b60e..38a7d7e709 100644 --- a/test/core/surface/public_headers_must_be_c89.c +++ b/test/core/surface/public_headers_must_be_c89.c @@ -141,6 +141,9 @@ int main(int argc, char **argv) { printf("%lx", (unsigned long) grpc_auth_context_add_property); printf("%lx", (unsigned long) grpc_auth_context_add_cstring_property); printf("%lx", (unsigned long) grpc_auth_context_set_peer_identity_property_name); + printf("%lx", (unsigned long) grpc_ssl_session_cache_create_lru); + printf("%lx", (unsigned long) grpc_ssl_session_cache_destroy); + printf("%lx", (unsigned long) grpc_ssl_session_cache_create_channel_arg); printf("%lx", (unsigned long) grpc_channel_credentials_release); printf("%lx", (unsigned long) grpc_google_default_credentials_create); printf("%lx", (unsigned long) grpc_set_ssl_roots_override_callback); |