From 74a4d38fbae2a6b8f426e600420e13b3787de47e Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Mon, 10 Sep 2018 16:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3SSL=5FSTREAM=E4=B8=AD?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=87=BD=E6=95=B0=E5=9B=A0promise=5Fctx=5Fde?= =?UTF-8?q?story=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=BC=95=E8=B5=B7=E7=9A=84=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/src/ssl_stream.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/src/ssl_stream.cpp b/platform/src/ssl_stream.cpp index 6e81a55..6537eb2 100644 --- a/platform/src/ssl_stream.cpp +++ b/platform/src/ssl_stream.cpp @@ -486,9 +486,9 @@ void peek_client_hello_ctx_free(struct peek_client_hello_ctx * _ctx) free(_ctx); } -void peek_client_hello_ctx_free(struct promise * p) +void peek_client_hello_ctx_free_cb(void * p) { - struct peek_client_hello_ctx * _ctx = (struct peek_client_hello_ctx *) promise_dettach_ctx(p); + struct peek_client_hello_ctx * _ctx = (struct peek_client_hello_ctx *)p; return peek_client_hello_ctx_free(_ctx); } @@ -576,7 +576,7 @@ static void ssl_async_peek_client_hello(struct future * future, evutil_socket_t ctx->logger = logger; event_add(ctx->ev, NULL); - promise_set_ctx(p, (void *) ctx, peek_client_hello_ctx_free); + promise_set_ctx(p, (void *) ctx, peek_client_hello_ctx_free_cb); return; } @@ -660,9 +660,9 @@ void ssl_connect_origin_ctx_free(struct ssl_connect_origin_ctx * ctx) return; } -void ssl_connect_origin_ctx_free(struct promise * p) +void ssl_connect_origin_ctx_free(void *p) { - struct ssl_connect_origin_ctx * ctx = (struct ssl_connect_origin_ctx *) promise_dettach_ctx(p); + struct ssl_connect_origin_ctx * ctx = (struct ssl_connect_origin_ctx *)p; ssl_connect_origin_ctx_free(ctx); } @@ -1109,9 +1109,9 @@ void query_cert_ctx_free(struct ask_keyring_ctx * ctx) return; } -void query_cert_ctx_free(struct promise * p) +void query_cert_ctx_free_cb(void * p) { - struct ask_keyring_ctx * ctx = (struct ask_keyring_ctx *) promise_dettach_ctx(p); + struct ask_keyring_ctx * ctx = (struct ask_keyring_ctx *)p; query_cert_ctx_free(ctx); } @@ -1185,7 +1185,7 @@ void ssl_async_downstream_create(struct future * f, struct ssl_mgr * mgr, struct } struct promise * p = future_to_promise(f); - promise_set_ctx(p, ctx, query_cert_ctx_free); + promise_set_ctx(p, ctx, query_cert_ctx_free_cb); ctx->is_origin_crt_vaild = ssl_conn_verify_cert(mgr->trust_CA_store, upstream->ssl); if(!ctx->is_origin_crt_vaild) {