修正SSL_STREAM中部分函数因promise_ctx_destory回调函数类型变更引起的编译错误。

This commit is contained in:
Lu Qiuwen
2018-09-10 16:40:25 +08:00
parent f4c6e75614
commit 74a4d38fba

View File

@@ -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)
{