* [FFmpeg-devel] [PATCH] avformat/tls_mbedtls: Pass FLAG_NONBLOCK to underlying transport
@ 2024-04-08 13:26 Zhao Zhili
2024-04-08 13:32 ` Dennis Mungai
2024-04-11 12:19 ` Zhao Zhili
0 siblings, 2 replies; 4+ messages in thread
From: Zhao Zhili @ 2024-04-08 13:26 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Zhao Zhili
From: Zhao Zhili <zhilizhao@tencent.com>
This fix rtmps failure since rtmps requires nonblocking read.
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
---
libavformat/tls_mbedtls.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c
index 8503523b6d..f51cf43b1c 100644
--- a/libavformat/tls_mbedtls.c
+++ b/libavformat/tls_mbedtls.c
@@ -309,6 +309,8 @@ static int tls_read(URLContext *h, uint8_t *buf, int size)
TLSContext *tls_ctx = h->priv_data;
int ret;
+ tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
+ tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
if ((ret = mbedtls_ssl_read(&tls_ctx->ssl_context, buf, size)) > 0) {
// return read length
return ret;
@@ -322,6 +324,8 @@ static int tls_write(URLContext *h, const uint8_t *buf, int size)
TLSContext *tls_ctx = h->priv_data;
int ret;
+ tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
+ tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
if ((ret = mbedtls_ssl_write(&tls_ctx->ssl_context, buf, size)) > 0) {
// return written length
return ret;
--
2.25.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/tls_mbedtls: Pass FLAG_NONBLOCK to underlying transport
2024-04-08 13:26 [FFmpeg-devel] [PATCH] avformat/tls_mbedtls: Pass FLAG_NONBLOCK to underlying transport Zhao Zhili
@ 2024-04-08 13:32 ` Dennis Mungai
2024-04-08 13:40 ` Zhao Zhili
2024-04-11 12:19 ` Zhao Zhili
1 sibling, 1 reply; 4+ messages in thread
From: Dennis Mungai @ 2024-04-08 13:32 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Zhao Zhili
On Mon, 8 Apr 2024 at 16:26, Zhao Zhili <quinkblack@foxmail.com> wrote:
> From: Zhao Zhili <zhilizhao@tencent.com>
>
> This fix rtmps failure since rtmps requires nonblocking read.
>
> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
> ---
> libavformat/tls_mbedtls.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c
> index 8503523b6d..f51cf43b1c 100644
> --- a/libavformat/tls_mbedtls.c
> +++ b/libavformat/tls_mbedtls.c
> @@ -309,6 +309,8 @@ static int tls_read(URLContext *h, uint8_t *buf, int
> size)
> TLSContext *tls_ctx = h->priv_data;
> int ret;
>
> + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
> if ((ret = mbedtls_ssl_read(&tls_ctx->ssl_context, buf, size)) > 0) {
> // return read length
> return ret;
> @@ -322,6 +324,8 @@ static int tls_write(URLContext *h, const uint8_t
> *buf, int size)
> TLSContext *tls_ctx = h->priv_data;
> int ret;
>
> + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
> if ((ret = mbedtls_ssl_write(&tls_ctx->ssl_context, buf, size)) > 0) {
> // return written length
> return ret;
> --
> 2.25.1
>
Are other TLS layers affected, say OpenSSL, etc?
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/tls_mbedtls: Pass FLAG_NONBLOCK to underlying transport
2024-04-08 13:32 ` Dennis Mungai
@ 2024-04-08 13:40 ` Zhao Zhili
0 siblings, 0 replies; 4+ messages in thread
From: Zhao Zhili @ 2024-04-08 13:40 UTC (permalink / raw)
To: FFmpeg development discussions and patches
> On Apr 8, 2024, at 21:32, Dennis Mungai <dmngaie@gmail.com> wrote:
>
> On Mon, 8 Apr 2024 at 16:26, Zhao Zhili <quinkblack@foxmail.com> wrote:
>
>> From: Zhao Zhili <zhilizhao@tencent.com>
>>
>> This fix rtmps failure since rtmps requires nonblocking read.
>>
>> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
>> ---
>> libavformat/tls_mbedtls.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c
>> index 8503523b6d..f51cf43b1c 100644
>> --- a/libavformat/tls_mbedtls.c
>> +++ b/libavformat/tls_mbedtls.c
>> @@ -309,6 +309,8 @@ static int tls_read(URLContext *h, uint8_t *buf, int
>> size)
>> TLSContext *tls_ctx = h->priv_data;
>> int ret;
>>
>> + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
>> if ((ret = mbedtls_ssl_read(&tls_ctx->ssl_context, buf, size)) > 0) {
>> // return read length
>> return ret;
>> @@ -322,6 +324,8 @@ static int tls_write(URLContext *h, const uint8_t
>> *buf, int size)
>> TLSContext *tls_ctx = h->priv_data;
>> int ret;
>>
>> + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
>> if ((ret = mbedtls_ssl_write(&tls_ctx->ssl_context, buf, size)) > 0) {
>> // return written length
>> return ret;
>> --
>> 2.25.1
>>
>
> Are other TLS layers affected, say OpenSSL, etc?
openssl and gnutls don’t get affected, since they have done the same operation.
I don’t know about schannel and securetransport.
> _______________________________________________
> 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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/tls_mbedtls: Pass FLAG_NONBLOCK to underlying transport
2024-04-08 13:26 [FFmpeg-devel] [PATCH] avformat/tls_mbedtls: Pass FLAG_NONBLOCK to underlying transport Zhao Zhili
2024-04-08 13:32 ` Dennis Mungai
@ 2024-04-11 12:19 ` Zhao Zhili
1 sibling, 0 replies; 4+ messages in thread
From: Zhao Zhili @ 2024-04-11 12:19 UTC (permalink / raw)
To: FFmpeg development discussions and patches
> On Apr 8, 2024, at 21:26, Zhao Zhili <quinkblack@foxmail.com> wrote:
>
> From: Zhao Zhili <zhilizhao@tencent.com>
>
> This fix rtmps failure since rtmps requires nonblocking read.
>
> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
> ---
> libavformat/tls_mbedtls.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c
> index 8503523b6d..f51cf43b1c 100644
> --- a/libavformat/tls_mbedtls.c
> +++ b/libavformat/tls_mbedtls.c
> @@ -309,6 +309,8 @@ static int tls_read(URLContext *h, uint8_t *buf, int size)
> TLSContext *tls_ctx = h->priv_data;
> int ret;
>
> + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
> if ((ret = mbedtls_ssl_read(&tls_ctx->ssl_context, buf, size)) > 0) {
> // return read length
> return ret;
> @@ -322,6 +324,8 @@ static int tls_write(URLContext *h, const uint8_t *buf, int size)
> TLSContext *tls_ctx = h->priv_data;
> int ret;
>
> + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
> if ((ret = mbedtls_ssl_write(&tls_ctx->ssl_context, buf, size)) > 0) {
> // return written length
> return ret;
> --
> 2.25.1
Will apply tomorrow.
>
> _______________________________________________
> 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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-11 12:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-08 13:26 [FFmpeg-devel] [PATCH] avformat/tls_mbedtls: Pass FLAG_NONBLOCK to underlying transport Zhao Zhili
2024-04-08 13:32 ` Dennis Mungai
2024-04-08 13:40 ` Zhao Zhili
2024-04-11 12:19 ` Zhao Zhili
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