From: Steven Liu <lingjiujianke-at-gmail.com@ffmpeg.org>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Jack Lau <jacklau1222@qq.com>
Subject: Re: [FFmpeg-devel] [PATCH v2 3/4] avformat/tls_openssl: remove all redundant "TLS: " in log with AVClass
Date: Fri, 11 Jul 2025 23:05:52 +0800
Message-ID: <CADxeRw=B1c9aB2GMJZFMRM7Krd7JaE_2OUKk=f1GboO-_8E0dA@mail.gmail.com> (raw)
In-Reply-To: <20250711132120.38507-4-jacklau1222@qq.com>
Jack Lau <jacklau1222gm-at-gmail.com@ffmpeg.org> 于2025年7月11日周五 21:22写道:
>
> Signed-off-by: Jack Lau <jacklau1222@qq.com>
> ---
> libavformat/tls_openssl.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
> index ffd9cd51d2..a519c8c880 100644
> --- a/libavformat/tls_openssl.c
> +++ b/libavformat/tls_openssl.c
> @@ -509,7 +509,7 @@ int ff_dtls_export_materials(URLContext *h, char *dtls_srtp_materials, size_t ma
> ret = SSL_export_keying_material(c->ssl, dtls_srtp_materials, materials_sz,
> dst, strlen(dst), NULL, 0, 0);
> if (!ret) {
> - av_log(c, AV_LOG_ERROR, "TLS: Failed to export SRTP material, %s\n", openssl_get_error(c));
> + av_log(c, AV_LOG_ERROR, "Failed to export SRTP material, %s\n", openssl_get_error(c));
> return -1;
> }
> return 0;
> @@ -727,7 +727,7 @@ static int dtls_handshake(URLContext *h)
> goto end;
> }
> } else {
> - av_log(p, AV_LOG_TRACE, "TLS: Read %d bytes, r0=%d, r1=%d\n", r0, r0, r1);
> + av_log(p, AV_LOG_TRACE, "Read %d bytes, r0=%d, r1=%d\n", r0, r0, r1);
> }
>
> /* Check whether the DTLS is completed. */
> @@ -768,7 +768,7 @@ static av_cold int openssl_init_ca_key_cert(URLContext *h)
> return ret;
> }
> } else if (c->is_dtls){
> - av_log(p, AV_LOG_ERROR, "TLS: Init cert failed, %s\n", openssl_get_error(p));
> + av_log(p, AV_LOG_ERROR, "Init cert failed, %s\n", openssl_get_error(p));
> ret = AVERROR(EINVAL);
> goto fail;
> }
> @@ -784,12 +784,12 @@ static av_cold int openssl_init_ca_key_cert(URLContext *h)
> } else if (c->key_buf) {
> p->pkey = pkey = pkey_from_pem_string(c->key_buf, 1);
> if (SSL_CTX_use_PrivateKey(p->ctx, pkey) != 1) {
> - av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_use_PrivateKey failed, %s\n", openssl_get_error(p));
> + av_log(p, AV_LOG_ERROR, "Init SSL_CTX_use_PrivateKey failed, %s\n", openssl_get_error(p));
> ret = AVERROR(EINVAL);
> return ret;
> }
> } else if (c->is_dtls) {
> - av_log(p, AV_LOG_ERROR, "TLS: Init pkey failed, %s\n", openssl_get_error(p));
> + av_log(p, AV_LOG_ERROR, "Init pkey failed, %s\n", openssl_get_error(p));
> ret = AVERROR(EINVAL);
> goto fail;
> }
> @@ -826,7 +826,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary **
>
> /* For ECDSA, we could set the curves list. */
> if (SSL_CTX_set1_curves_list(p->ctx, curves) != 1) {
> - av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_set1_curves_list failed, curves=%s, %s\n",
> + av_log(p, AV_LOG_ERROR, "Init SSL_CTX_set1_curves_list failed, curves=%s, %s\n",
> curves, openssl_get_error(p));
> ret = AVERROR(EINVAL);
> return ret;
> @@ -837,7 +837,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary **
> * ensuring maximum compatibility.
> */
> if (SSL_CTX_set_cipher_list(p->ctx, ciphers) != 1) {
> - av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_set_cipher_list failed, ciphers=%s, %s\n",
> + av_log(p, AV_LOG_ERROR, "Init SSL_CTX_set_cipher_list failed, ciphers=%s, %s\n",
> ciphers, openssl_get_error(p));
> ret = AVERROR(EINVAL);
> return ret;
> @@ -854,7 +854,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary **
> SSL_CTX_set_read_ahead(p->ctx, 1);
> /* Setup the SRTP context */
> if (SSL_CTX_set_tlsext_use_srtp(p->ctx, profiles)) {
> - av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_set_tlsext_use_srtp failed, profiles=%s, %s\n",
> + av_log(p, AV_LOG_ERROR, "Init SSL_CTX_set_tlsext_use_srtp failed, profiles=%s, %s\n",
> profiles, openssl_get_error(p));
> ret = AVERROR(EINVAL);
> return ret;
> @@ -906,12 +906,12 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary **
> ret = dtls_handshake(h);
> // Fatal SSL error, for example, no available suite when peer is DTLS 1.0 while we are DTLS 1.2.
> if (ret < 0) {
> - av_log(p, AV_LOG_ERROR, "TLS: Failed to drive SSL context, ret=%d\n", ret);
> + av_log(p, AV_LOG_ERROR, "Failed to drive SSL context, ret=%d\n", ret);
> return AVERROR(EIO);
> }
> }
>
> - av_log(p, AV_LOG_VERBOSE, "TLS: Setup ok, MTU=%d\n", p->tls_shared.mtu);
> + av_log(p, AV_LOG_VERBOSE, "Setup ok, MTU=%d\n", p->tls_shared.mtu);
>
> ret = 0;
> fail:
> --
> 2.49.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
LGTM
Thanks
Steven
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2025-07-11 15:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-11 13:20 [FFmpeg-devel] [PATCH v2 0/4] Fix some issues in tls_openssl and udp Jack Lau
2025-07-11 13:20 ` [FFmpeg-devel] [PATCH v2 1/4] avformat/tls_openssl: add record trace function Jack Lau
2025-07-11 15:03 ` Steven Liu
2025-07-11 13:20 ` [FFmpeg-devel] [PATCH v2 2/4] avformat/tls_openssl: fix dtls_handshake return code Jack Lau
2025-07-11 15:05 ` Steven Liu
2025-07-11 13:20 ` [FFmpeg-devel] [PATCH v2 3/4] avformat/tls_openssl: remove all redundant "TLS: " in log with AVClass Jack Lau
2025-07-11 15:05 ` Steven Liu [this message]
2025-07-11 13:20 ` [FFmpeg-devel] [PATCH v2 4/4] avformat/udp: fix udp server mode haven't dest_addr Jack Lau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADxeRw=B1c9aB2GMJZFMRM7Krd7JaE_2OUKk=f1GboO-_8E0dA@mail.gmail.com' \
--to=lingjiujianke-at-gmail.com@ffmpeg.org \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=jacklau1222@qq.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git