* [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream
@ 2024-06-03 20:28 Timo Rothenpieler
2024-06-11 13:10 ` Timo Rothenpieler
2024-06-23 22:07 ` Timo Rothenpieler
0 siblings, 2 replies; 8+ messages in thread
From: Timo Rothenpieler @ 2024-06-03 20:28 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: BtbN
From: BtbN <btbn@btbn.de>
Fixes for example rtmps streaming over schannel.
---
libavformat/tls_schannel.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c
index 214a47a218..7265a9794d 100644
--- a/libavformat/tls_schannel.c
+++ b/libavformat/tls_schannel.c
@@ -113,6 +113,7 @@ static int tls_shutdown_client(URLContext *h)
c->request_flags, 0, 0, NULL, 0, &c->ctxt_handle,
&outbuf_desc, &c->context_flags, &c->ctxt_timestamp);
if (sspi_ret == SEC_E_OK || sspi_ret == SEC_I_CONTEXT_EXPIRED) {
+ s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
ret = ffurl_write(s->tcp, outbuf.pvBuffer, outbuf.cbBuffer);
FreeContextBuffer(outbuf.pvBuffer);
if (ret < 0 || ret != outbuf.cbBuffer)
@@ -316,6 +317,7 @@ static int tls_client_handshake(URLContext *h)
goto fail;
}
+ s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
ret = ffurl_write(s->tcp, outbuf.pvBuffer, outbuf.cbBuffer);
FreeContextBuffer(outbuf.pvBuffer);
if (ret < 0 || ret != outbuf.cbBuffer) {
@@ -416,11 +418,16 @@ static int tls_read(URLContext *h, uint8_t *buf, int len)
}
}
+ s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
+ s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
+
ret = ffurl_read(s->tcp, c->enc_buf + c->enc_buf_offset,
c->enc_buf_size - c->enc_buf_offset);
if (ret == AVERROR_EOF) {
c->connection_closed = 1;
ret = 0;
+ } else if (ret == AVERROR(EAGAIN)) {
+ ret = 0;
} else if (ret < 0) {
av_log(h, AV_LOG_ERROR, "Unable to read from socket\n");
return ret;
@@ -564,8 +571,14 @@ static int tls_write(URLContext *h, const uint8_t *buf, int len)
sspi_ret = EncryptMessage(&c->ctxt_handle, 0, &outbuf_desc, 0);
if (sspi_ret == SEC_E_OK) {
len = outbuf[0].cbBuffer + outbuf[1].cbBuffer + outbuf[2].cbBuffer;
+
+ s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
+ s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
+
ret = ffurl_write(s->tcp, data, len);
- if (ret < 0 || ret != len) {
+ if (ret == AVERROR(EAGAIN)) {
+ goto done;
+ } else if (ret < 0 || ret != len) {
ret = AVERROR(EIO);
av_log(h, AV_LOG_ERROR, "Writing encrypted data to socket failed\n");
goto done;
--
2.43.2
_______________________________________________
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] 8+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream
2024-06-03 20:28 [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream Timo Rothenpieler
@ 2024-06-11 13:10 ` Timo Rothenpieler
2024-06-18 16:30 ` Timo Rothenpieler
2024-06-23 22:07 ` Timo Rothenpieler
1 sibling, 1 reply; 8+ messages in thread
From: Timo Rothenpieler @ 2024-06-11 13:10 UTC (permalink / raw)
To: ffmpeg-devel
On 03.06.2024 22:28, Timo Rothenpieler wrote:
> From: BtbN <btbn@btbn.de>
This is fixed locally
> Fixes for example rtmps streaming over schannel.
> ---
> libavformat/tls_schannel.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c
> index 214a47a218..7265a9794d 100644
> --- a/libavformat/tls_schannel.c
> +++ b/libavformat/tls_schannel.c
> @@ -113,6 +113,7 @@ static int tls_shutdown_client(URLContext *h)
> c->request_flags, 0, 0, NULL, 0, &c->ctxt_handle,
> &outbuf_desc, &c->context_flags, &c->ctxt_timestamp);
> if (sspi_ret == SEC_E_OK || sspi_ret == SEC_I_CONTEXT_EXPIRED) {
> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> ret = ffurl_write(s->tcp, outbuf.pvBuffer, outbuf.cbBuffer);
> FreeContextBuffer(outbuf.pvBuffer);
> if (ret < 0 || ret != outbuf.cbBuffer)
> @@ -316,6 +317,7 @@ static int tls_client_handshake(URLContext *h)
> goto fail;
> }
>
> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> ret = ffurl_write(s->tcp, outbuf.pvBuffer, outbuf.cbBuffer);
> FreeContextBuffer(outbuf.pvBuffer);
> if (ret < 0 || ret != outbuf.cbBuffer) {
> @@ -416,11 +418,16 @@ static int tls_read(URLContext *h, uint8_t *buf, int len)
> }
> }
>
> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
> +
> ret = ffurl_read(s->tcp, c->enc_buf + c->enc_buf_offset,
> c->enc_buf_size - c->enc_buf_offset);
> if (ret == AVERROR_EOF) {
> c->connection_closed = 1;
> ret = 0;
> + } else if (ret == AVERROR(EAGAIN)) {
> + ret = 0;
> } else if (ret < 0) {
> av_log(h, AV_LOG_ERROR, "Unable to read from socket\n");
> return ret;
> @@ -564,8 +571,14 @@ static int tls_write(URLContext *h, const uint8_t *buf, int len)
> sspi_ret = EncryptMessage(&c->ctxt_handle, 0, &outbuf_desc, 0);
> if (sspi_ret == SEC_E_OK) {
> len = outbuf[0].cbBuffer + outbuf[1].cbBuffer + outbuf[2].cbBuffer;
> +
> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
> +
> ret = ffurl_write(s->tcp, data, len);
> - if (ret < 0 || ret != len) {
> + if (ret == AVERROR(EAGAIN)) {
> + goto done;
> + } else if (ret < 0 || ret != len) {
> ret = AVERROR(EIO);
> av_log(h, AV_LOG_ERROR, "Writing encrypted data to socket failed\n");
> goto done;
ping
I'm specifically unsure if implementing the sending-side like this is
valid and would appreciate review from someone familiar with the code
and schannel.
_______________________________________________
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] 8+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream
2024-06-11 13:10 ` Timo Rothenpieler
@ 2024-06-18 16:30 ` Timo Rothenpieler
2024-06-18 16:56 ` Gyan Doshi
0 siblings, 1 reply; 8+ messages in thread
From: Timo Rothenpieler @ 2024-06-18 16:30 UTC (permalink / raw)
To: ffmpeg-devel
On 11.06.2024 15:10, Timo Rothenpieler wrote:
> On 03.06.2024 22:28, Timo Rothenpieler wrote:
>> From: BtbN <btbn@btbn.de>
>
> This is fixed locally
>
>> Fixes for example rtmps streaming over schannel.
>> ---
>> libavformat/tls_schannel.c | 15 ++++++++++++++-
>> 1 file changed, 14 insertions(+), 1 deletion(-)
>>
>> diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c
>> index 214a47a218..7265a9794d 100644
>> --- a/libavformat/tls_schannel.c
>> +++ b/libavformat/tls_schannel.c
>> @@ -113,6 +113,7 @@ static int tls_shutdown_client(URLContext *h)
>> c->request_flags, 0, 0,
>> NULL, 0, &c->ctxt_handle,
>> &outbuf_desc,
>> &c->context_flags, &c->ctxt_timestamp);
>> if (sspi_ret == SEC_E_OK || sspi_ret ==
>> SEC_I_CONTEXT_EXPIRED) {
>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> ret = ffurl_write(s->tcp, outbuf.pvBuffer,
>> outbuf.cbBuffer);
>> FreeContextBuffer(outbuf.pvBuffer);
>> if (ret < 0 || ret != outbuf.cbBuffer)
>> @@ -316,6 +317,7 @@ static int tls_client_handshake(URLContext *h)
>> goto fail;
>> }
>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> ret = ffurl_write(s->tcp, outbuf.pvBuffer, outbuf.cbBuffer);
>> FreeContextBuffer(outbuf.pvBuffer);
>> if (ret < 0 || ret != outbuf.cbBuffer) {
>> @@ -416,11 +418,16 @@ static int tls_read(URLContext *h, uint8_t *buf,
>> int len)
>> }
>> }
>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
>> +
>> ret = ffurl_read(s->tcp, c->enc_buf + c->enc_buf_offset,
>> c->enc_buf_size - c->enc_buf_offset);
>> if (ret == AVERROR_EOF) {
>> c->connection_closed = 1;
>> ret = 0;
>> + } else if (ret == AVERROR(EAGAIN)) {
>> + ret = 0;
>> } else if (ret < 0) {
>> av_log(h, AV_LOG_ERROR, "Unable to read from socket\n");
>> return ret;
>> @@ -564,8 +571,14 @@ static int tls_write(URLContext *h, const uint8_t
>> *buf, int len)
>> sspi_ret = EncryptMessage(&c->ctxt_handle, 0, &outbuf_desc, 0);
>> if (sspi_ret == SEC_E_OK) {
>> len = outbuf[0].cbBuffer + outbuf[1].cbBuffer +
>> outbuf[2].cbBuffer;
>> +
>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
>> +
>> ret = ffurl_write(s->tcp, data, len);
>> - if (ret < 0 || ret != len) {
>> + if (ret == AVERROR(EAGAIN)) {
>> + goto done;
>> + } else if (ret < 0 || ret != len) {
>> ret = AVERROR(EIO);
>> av_log(h, AV_LOG_ERROR, "Writing encrypted data to
>> socket failed\n");
>> goto done;
>
> ping
>
>
> I'm specifically unsure if implementing the sending-side like this is
> valid and would appreciate review from someone familiar with the code
> and schannel.
ping
_______________________________________________
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] 8+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream
2024-06-18 16:30 ` Timo Rothenpieler
@ 2024-06-18 16:56 ` Gyan Doshi
2024-06-18 18:23 ` Timo Rothenpieler
0 siblings, 1 reply; 8+ messages in thread
From: Gyan Doshi @ 2024-06-18 16:56 UTC (permalink / raw)
To: ffmpeg-devel
On 2024-06-18 10:00 pm, Timo Rothenpieler wrote:
> On 11.06.2024 15:10, Timo Rothenpieler wrote:
>> On 03.06.2024 22:28, Timo Rothenpieler wrote:
>>> From: BtbN <btbn@btbn.de>
>>
>> This is fixed locally
>>
>>> Fixes for example rtmps streaming over schannel.
>>> ---
>>> libavformat/tls_schannel.c | 15 ++++++++++++++-
>>> 1 file changed, 14 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c
>>> index 214a47a218..7265a9794d 100644
>>> --- a/libavformat/tls_schannel.c
>>> +++ b/libavformat/tls_schannel.c
>>> @@ -113,6 +113,7 @@ static int tls_shutdown_client(URLContext *h)
>>> c->request_flags, 0, 0, NULL, 0, &c->ctxt_handle,
>>> &outbuf_desc, &c->context_flags, &c->ctxt_timestamp);
>>> if (sspi_ret == SEC_E_OK || sspi_ret ==
>>> SEC_I_CONTEXT_EXPIRED) {
>>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>>> ret = ffurl_write(s->tcp, outbuf.pvBuffer,
>>> outbuf.cbBuffer);
>>> FreeContextBuffer(outbuf.pvBuffer);
>>> if (ret < 0 || ret != outbuf.cbBuffer)
>>> @@ -316,6 +317,7 @@ static int tls_client_handshake(URLContext *h)
>>> goto fail;
>>> }
>>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>>> ret = ffurl_write(s->tcp, outbuf.pvBuffer, outbuf.cbBuffer);
>>> FreeContextBuffer(outbuf.pvBuffer);
>>> if (ret < 0 || ret != outbuf.cbBuffer) {
>>> @@ -416,11 +418,16 @@ static int tls_read(URLContext *h, uint8_t
>>> *buf, int len)
>>> }
>>> }
>>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>>> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
>>> +
>>> ret = ffurl_read(s->tcp, c->enc_buf + c->enc_buf_offset,
>>> c->enc_buf_size - c->enc_buf_offset);
>>> if (ret == AVERROR_EOF) {
>>> c->connection_closed = 1;
>>> ret = 0;
>>> + } else if (ret == AVERROR(EAGAIN)) {
>>> + ret = 0;
>>> } else if (ret < 0) {
>>> av_log(h, AV_LOG_ERROR, "Unable to read from socket\n");
>>> return ret;
>>> @@ -564,8 +571,14 @@ static int tls_write(URLContext *h, const
>>> uint8_t *buf, int len)
>>> sspi_ret = EncryptMessage(&c->ctxt_handle, 0, &outbuf_desc, 0);
>>> if (sspi_ret == SEC_E_OK) {
>>> len = outbuf[0].cbBuffer + outbuf[1].cbBuffer +
>>> outbuf[2].cbBuffer;
>>> +
>>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>>> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
>>> +
>>> ret = ffurl_write(s->tcp, data, len);
>>> - if (ret < 0 || ret != len) {
>>> + if (ret == AVERROR(EAGAIN)) {
>>> + goto done;
>>> + } else if (ret < 0 || ret != len) {
>>> ret = AVERROR(EIO);
>>> av_log(h, AV_LOG_ERROR, "Writing encrypted data to
>>> socket failed\n");
>>> goto done;
>>
>> ping
>>
>>
>> I'm specifically unsure if implementing the sending-side like this is
>> valid and would appreciate review from someone familiar with the code
>> and schannel.
FWIW, I had to do the same for securetransport on a project a couple of
years back to get rtmps working. Worked fine, and did not get any
reports of ill-effects.
Regards,
Gyan
_______________________________________________
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] 8+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream
2024-06-18 16:56 ` Gyan Doshi
@ 2024-06-18 18:23 ` Timo Rothenpieler
2024-06-19 4:38 ` Gyan Doshi
0 siblings, 1 reply; 8+ messages in thread
From: Timo Rothenpieler @ 2024-06-18 18:23 UTC (permalink / raw)
To: ffmpeg-devel
On 18.06.2024 18:56, Gyan Doshi wrote:
> FWIW, I had to do the same for securetransport on a project a couple of
> years back to get rtmps working. Worked fine, and did not get any
> reports of ill-effects.
You mean the FFmpeg implementation of rtmps?
Cause if so, I think that only makes use of nonblocking mode for
receiving, not sending.
So it wouldn't run into this if it was wrong.
Just making the reading side support non-blocking would definitely also
be an option, it would at least fix rtmps.
_______________________________________________
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] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream
2024-06-18 18:23 ` Timo Rothenpieler
@ 2024-06-19 4:38 ` Gyan Doshi
0 siblings, 0 replies; 8+ messages in thread
From: Gyan Doshi @ 2024-06-19 4:38 UTC (permalink / raw)
To: ffmpeg-devel
On 2024-06-18 11:53 pm, Timo Rothenpieler wrote:
> On 18.06.2024 18:56, Gyan Doshi wrote:
>> FWIW, I had to do the same for securetransport on a project a couple
>> of years back to get rtmps working. Worked fine, and did not get any
>> reports of ill-effects.
>
> You mean the FFmpeg implementation of rtmps?
> Cause if so, I think that only makes use of nonblocking mode for
> receiving, not sending.
> So it wouldn't run into this if it was wrong.
IIRC, the setup/handshake phase would never complete.
Adding this fixed it
--------
+ TLSShared *s = &c->tls_shared;
+ int set_flag_nonblock = 0;
+
+ if (h->flags & AVIO_FLAG_NONBLOCK && !(s->tcp->flags &
AVIO_FLAG_NONBLOCK)) {
+ s->tcp->flags |= AVIO_FLAG_NONBLOCK;
+ set_flag_nonblock = 1;
+ }
+
int read = ffurl_read(c->tls_shared.tcp, data, requested);
+
+ if (set_flag_nonblock)
+ s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
--------
Regards,
Gyan
_______________________________________________
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] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream
2024-06-03 20:28 [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream Timo Rothenpieler
2024-06-11 13:10 ` Timo Rothenpieler
@ 2024-06-23 22:07 ` Timo Rothenpieler
2024-06-24 13:06 ` Timo Rothenpieler
1 sibling, 1 reply; 8+ messages in thread
From: Timo Rothenpieler @ 2024-06-23 22:07 UTC (permalink / raw)
To: ffmpeg-devel
On 03.06.2024 22:28, Timo Rothenpieler wrote:
> From: BtbN <btbn@btbn.de>
>
> Fixes for example rtmps streaming over schannel.
> ---
> libavformat/tls_schannel.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c
> index 214a47a218..7265a9794d 100644
> --- a/libavformat/tls_schannel.c
> +++ b/libavformat/tls_schannel.c
> @@ -113,6 +113,7 @@ static int tls_shutdown_client(URLContext *h)
> c->request_flags, 0, 0, NULL, 0, &c->ctxt_handle,
> &outbuf_desc, &c->context_flags, &c->ctxt_timestamp);
> if (sspi_ret == SEC_E_OK || sspi_ret == SEC_I_CONTEXT_EXPIRED) {
> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> ret = ffurl_write(s->tcp, outbuf.pvBuffer, outbuf.cbBuffer);
> FreeContextBuffer(outbuf.pvBuffer);
> if (ret < 0 || ret != outbuf.cbBuffer)
> @@ -316,6 +317,7 @@ static int tls_client_handshake(URLContext *h)
> goto fail;
> }
>
> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> ret = ffurl_write(s->tcp, outbuf.pvBuffer, outbuf.cbBuffer);
> FreeContextBuffer(outbuf.pvBuffer);
> if (ret < 0 || ret != outbuf.cbBuffer) {
> @@ -416,11 +418,16 @@ static int tls_read(URLContext *h, uint8_t *buf, int len)
> }
> }
>
> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
> +
> ret = ffurl_read(s->tcp, c->enc_buf + c->enc_buf_offset,
> c->enc_buf_size - c->enc_buf_offset);
> if (ret == AVERROR_EOF) {
> c->connection_closed = 1;
> ret = 0;
> + } else if (ret == AVERROR(EAGAIN)) {
> + ret = 0;
> } else if (ret < 0) {
> av_log(h, AV_LOG_ERROR, "Unable to read from socket\n");
> return ret;
> @@ -564,8 +571,14 @@ static int tls_write(URLContext *h, const uint8_t *buf, int len)
> sspi_ret = EncryptMessage(&c->ctxt_handle, 0, &outbuf_desc, 0);
> if (sspi_ret == SEC_E_OK) {
> len = outbuf[0].cbBuffer + outbuf[1].cbBuffer + outbuf[2].cbBuffer;
> +
> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
> +
> ret = ffurl_write(s->tcp, data, len);
> - if (ret < 0 || ret != len) {
> + if (ret == AVERROR(EAGAIN)) {
> + goto done;
> + } else if (ret < 0 || ret != len) {
> ret = AVERROR(EIO);
> av_log(h, AV_LOG_ERROR, "Writing encrypted data to socket failed\n");
> goto done;
will apply soon
_______________________________________________
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] 8+ messages in thread* Re: [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream
2024-06-23 22:07 ` Timo Rothenpieler
@ 2024-06-24 13:06 ` Timo Rothenpieler
0 siblings, 0 replies; 8+ messages in thread
From: Timo Rothenpieler @ 2024-06-24 13:06 UTC (permalink / raw)
To: ffmpeg-devel
On 24/06/2024 00:07, Timo Rothenpieler wrote:
> On 03.06.2024 22:28, Timo Rothenpieler wrote:
>> From: BtbN <btbn@btbn.de>
>>
>> Fixes for example rtmps streaming over schannel.
>> ---
>> libavformat/tls_schannel.c | 15 ++++++++++++++-
>> 1 file changed, 14 insertions(+), 1 deletion(-)
>>
>> diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c
>> index 214a47a218..7265a9794d 100644
>> --- a/libavformat/tls_schannel.c
>> +++ b/libavformat/tls_schannel.c
>> @@ -113,6 +113,7 @@ static int tls_shutdown_client(URLContext *h)
>> c->request_flags, 0, 0,
>> NULL, 0, &c->ctxt_handle,
>> &outbuf_desc,
>> &c->context_flags, &c->ctxt_timestamp);
>> if (sspi_ret == SEC_E_OK || sspi_ret ==
>> SEC_I_CONTEXT_EXPIRED) {
>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> ret = ffurl_write(s->tcp, outbuf.pvBuffer,
>> outbuf.cbBuffer);
>> FreeContextBuffer(outbuf.pvBuffer);
>> if (ret < 0 || ret != outbuf.cbBuffer)
>> @@ -316,6 +317,7 @@ static int tls_client_handshake(URLContext *h)
>> goto fail;
>> }
>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> ret = ffurl_write(s->tcp, outbuf.pvBuffer, outbuf.cbBuffer);
>> FreeContextBuffer(outbuf.pvBuffer);
>> if (ret < 0 || ret != outbuf.cbBuffer) {
>> @@ -416,11 +418,16 @@ static int tls_read(URLContext *h, uint8_t *buf,
>> int len)
>> }
>> }
>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
>> +
>> ret = ffurl_read(s->tcp, c->enc_buf + c->enc_buf_offset,
>> c->enc_buf_size - c->enc_buf_offset);
>> if (ret == AVERROR_EOF) {
>> c->connection_closed = 1;
>> ret = 0;
>> + } else if (ret == AVERROR(EAGAIN)) {
>> + ret = 0;
>> } else if (ret < 0) {
>> av_log(h, AV_LOG_ERROR, "Unable to read from socket\n");
>> return ret;
>> @@ -564,8 +571,14 @@ static int tls_write(URLContext *h, const uint8_t
>> *buf, int len)
>> sspi_ret = EncryptMessage(&c->ctxt_handle, 0, &outbuf_desc, 0);
>> if (sspi_ret == SEC_E_OK) {
>> len = outbuf[0].cbBuffer + outbuf[1].cbBuffer +
>> outbuf[2].cbBuffer;
>> +
>> + s->tcp->flags &= ~AVIO_FLAG_NONBLOCK;
>> + s->tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
>> +
>> ret = ffurl_write(s->tcp, data, len);
>> - if (ret < 0 || ret != len) {
>> + if (ret == AVERROR(EAGAIN)) {
>> + goto done;
>> + } else if (ret < 0 || ret != len) {
>> ret = AVERROR(EIO);
>> av_log(h, AV_LOG_ERROR, "Writing encrypted data to
>> socket failed\n");
>> goto done;
>
> will apply soon
applied
_______________________________________________
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] 8+ messages in thread
end of thread, other threads:[~2024-06-24 13:05 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-03 20:28 [FFmpeg-devel] [PATCH] avformat/tls_schannel: forward AVIO_FLAG_NONBLOCK to tcp stream Timo Rothenpieler
2024-06-11 13:10 ` Timo Rothenpieler
2024-06-18 16:30 ` Timo Rothenpieler
2024-06-18 16:56 ` Gyan Doshi
2024-06-18 18:23 ` Timo Rothenpieler
2024-06-19 4:38 ` Gyan Doshi
2024-06-23 22:07 ` Timo Rothenpieler
2024-06-24 13:06 ` Timo Rothenpieler
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