diff options
author | 2018-06-01 10:42:08 -0700 | |
---|---|---|
committer | 2018-06-01 10:42:08 -0700 | |
commit | b26b2af1dbd88a0b0d5ca6f6e0db5de368757b09 (patch) | |
tree | 819dae67daa43ed087bc8a900a8e8e40f3778fe7 /src/core | |
parent | c0a89c71ff7a64aa967a2e4f437eecf0b69af5e7 (diff) | |
parent | 56500bed623aac5d0afecf865cec1f7f5f091fdc (diff) |
Merge remote-tracking branch 'upstream/v1.12.x' into upmerge_changes
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/lib/iomgr/tcp_client_custom.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lib/iomgr/tcp_client_custom.cc b/src/core/lib/iomgr/tcp_client_custom.cc index 932c79ea0b..9389861d07 100644 --- a/src/core/lib/iomgr/tcp_client_custom.cc +++ b/src/core/lib/iomgr/tcp_client_custom.cc @@ -140,12 +140,12 @@ static void tcp_connect(grpc_closure* closure, grpc_endpoint** ep, socket, connect->addr_name); } - grpc_custom_socket_vtable->connect( - socket, (const grpc_sockaddr*)resolved_addr->addr, resolved_addr->len, - custom_connect_callback); GRPC_CLOSURE_INIT(&connect->on_alarm, on_alarm, socket, grpc_schedule_on_exec_ctx); grpc_timer_init(&connect->alarm, deadline, &connect->on_alarm); + grpc_custom_socket_vtable->connect( + socket, (const grpc_sockaddr*)resolved_addr->addr, resolved_addr->len, + custom_connect_callback); } grpc_tcp_client_vtable custom_tcp_client_vtable = {tcp_connect}; |