diff options
| author |  Mark D. Roth <roth@google.com> | 2016-07-21 09:52:12 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-07-21 09:52:12 -0700 |
| commit | 9136bb1c1c8eb10f3ab7b26b0b947c1889d42ea6 (patch) | |
| tree | 0f731a62e3d69cfc0371a04efd09aa0c23ecd6db /src/core | |
| parent | 5332c4badadb95048a1172a5757097271ef6b316 (diff) | |
Fix API from merge.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/client_config/http_connect_handshaker.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/core/ext/client_config/http_connect_handshaker.c b/src/core/ext/client_config/http_connect_handshaker.c index 3590805beb..2b71ca60f6 100644 --- a/src/core/ext/client_config/http_connect_handshaker.c +++ b/src/core/ext/client_config/http_connect_handshaker.c @@ -55,14 +55,6 @@ typedef struct http_connect_handshaker { grpc_closure response_read_closure; } http_connect_handshaker; -static void http_connect_handshaker_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker) { -} - -static void http_connect_handshaker_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker) { -} - // Callback invoked for reading HTTP CONNECT response. static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { @@ -84,13 +76,24 @@ static void on_write_done(grpc_exec_ctx* exec_ctx, void* arg, &h->response_read_closure); } -static void http_connect_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, - grpc_endpoint* endpoint, - grpc_channel_args* args, - gpr_timespec deadline, - grpc_handshaker_done_cb cb, - void* user_data) { +// +// Public handshaker methods +// + +static void http_connect_handshaker_destroy(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker) { + gpr_free(handshaker); +} + +static void http_connect_handshaker_shutdown(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker) { +} + +static void http_connect_handshaker_do_handshake( + grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker, + grpc_endpoint* endpoint, grpc_channel_args* args, gpr_timespec deadline, + grpc_tcp_server_acceptor* acceptor, grpc_handshaker_done_cb cb, + void* user_data) { http_connect_handshaker* h = (http_connect_handshaker*)handshaker; // Save state in the handshaker object. h->endpoint = endpoint; |