virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/tls_openssl: make tls and dtls use one close function

Browse Source 
Signed-off-by: Jack Lau <jacklau1222@qq.com>
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
Jack Lau
2025-07-12 17:03:02 +08:00
committed by Timo Rothenpieler
parent bc8d06d541
commit abb274b154
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/tls_openssl.c
View File

@ -578,7 +578,8 @@ static int tls_close(URLContext *h)
} }
if (c->ctx) if (c->ctx)
SSL_CTX_free(c->ctx); SSL_CTX_free(c->ctx);
ffurl_closep(&c->tls_shared.tcp); if (!c->tls_shared.external_sock)
ffurl_closep(c->tls_shared.is_dtls ? &c->tls_shared.udp : &c->tls_shared.tcp);
if (c->url_bio_method) if (c->url_bio_method)
BIO_meth_free(c->url_bio_method); BIO_meth_free(c->url_bio_method);
return 0; return 0;
@ -908,19 +909,6 @@ fail:
return ret; return ret;
} }
/**
* Cleanup the DTLS context.
*/
static av_cold int dtls_close(URLContext *h)
{
TLSContext *ctx = h->priv_data;
SSL_free(ctx->ssl);
SSL_CTX_free(ctx->ctx);
av_freep(&ctx->tls_shared.cert_buf);
av_freep(&ctx->tls_shared.key_buf);
return 0;
}
static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **options) static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **options)
{ {
TLSContext *p = h->priv_data; TLSContext *p = h->priv_data;
@ -1069,7 +1057,7 @@ const URLProtocol ff_dtls_protocol = {
.name = "dtls", .name = "dtls",
.url_open2 = dtls_start, .url_open2 = dtls_start,
.url_handshake = dtls_handshake, .url_handshake = dtls_handshake,
.url_close = dtls_close, .url_close = tls_close,
.url_read = tls_read, .url_read = tls_read,
.url_write = tls_write, .url_write = tls_write,
.url_get_file_handle = tls_get_file_handle, .url_get_file_handle = tls_get_file_handle,