diff options
author | 2018-03-21 16:35:36 -0700 | |
---|---|---|
committer | 2018-03-21 16:35:36 -0700 | |
commit | a10634cadc5562c660724084ebc8c4baa1532fbf (patch) | |
tree | 4112a026c3546e608d34c34dfb3833485d1313da /test/core/end2end/fixtures | |
parent | 31e957632fc59457b061f72e98951e293c8c0851 (diff) | |
parent | 92d11e368bdd7859058180da615f0d4af3f83f8d (diff) |
Merge branch 'master' of github.com:grpc/grpc into authority_header
Diffstat (limited to 'test/core/end2end/fixtures')
-rw-r--r-- | test/core/end2end/fixtures/http_proxy_fixture.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 58353376f3..f02fa9d998 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -535,10 +535,10 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( GPR_ASSERT(error == GRPC_ERROR_NONE); // Bind to port. grpc_resolved_address resolved_addr; - struct sockaddr_in* addr = - reinterpret_cast<struct sockaddr_in*>(resolved_addr.addr); + grpc_sockaddr_in* addr = + reinterpret_cast<grpc_sockaddr_in*>(resolved_addr.addr); memset(&resolved_addr, 0, sizeof(resolved_addr)); - addr->sin_family = AF_INET; + addr->sin_family = GRPC_AF_INET; grpc_sockaddr_set_port(&resolved_addr, proxy_port); int port; error = grpc_tcp_server_add_port(proxy->server, &resolved_addr, &port); |