未完成:在ssl_stream_free中检测pinning。

This commit is contained in:
zhengchao
2019-06-10 21:27:27 +08:00
parent f18c5efdb1
commit a396bec434
4 changed files with 85 additions and 41 deletions

View File

@@ -380,8 +380,7 @@ static void __conn_private_destory_with_ssl(struct event_base * ev_base,
struct tfe_conn_private * conn, struct ssl_stream * ssl_stream)
{
if (ssl_stream == NULL) return __conn_private_destory(conn);
evutil_socket_t __to_closed_fd = __conn_private_release_fd(conn);
ssl_stream_free_and_close_fd(ssl_stream, ev_base, __to_closed_fd);
ssl_stream_free_and_close_fd(ssl_stream, ev_base, conn->bev);
return __conn_private_destory(conn);
}
@@ -1046,14 +1045,12 @@ void tfe_stream_destory(struct tfe_stream_private * stream)
if (__is_ssl(stream) && stream->ssl_upstream)
{
evutil_socket_t __to_closed_fd = __conn_private_release_fd(stream->conn_upstream);
ssl_stream_free_and_close_fd(stream->ssl_upstream, ev_base, __to_closed_fd);
ssl_stream_free_and_close_fd(stream->ssl_upstream, ev_base, stream->conn_upstream->bev);
}
if (__is_ssl(stream) && stream->ssl_downstream)
{
evutil_socket_t __to_closed_fd = __conn_private_release_fd(stream->conn_downstream);
ssl_stream_free_and_close_fd(stream->ssl_downstream, ev_base, __to_closed_fd);
ssl_stream_free_and_close_fd(stream->ssl_downstream, ev_base, stream->conn_downstream->bev);
}
if (stream->conn_upstream)