ffmpeg | branch: master | Matthieu Bouron <matthieu.bou...@gmail.com> | Mon May
23 12:44:33 2022 +0200| [6dd6c58d8976d9c43828af45d7c47ab7f0c983e6] | committer:
Marton Balint
libavformat/tls_libtls: handle TLS_WANT_{POLLIN, POLLOUT} in read/write
functions
According to the tls documentation: tls_read() and tls_write() can
return TLS_WANT_POLLIN and TLS_WANT_POLLOUT which indicates that the
same operation must be repeated immediately.
This commit prevents the libtls backend from failing when libtls returns
TLS_WANT_POLLIN or TLS_WANT_POLLOUT with the following error:
[tls @ 0x7f6e20005a00] (null)
Signed-off-by: Marton Balint <c...@passwd.hu>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dd6c58d8976d9c43828af45d7c47ab7f0c983e6
---
libavformat/tls_libtls.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/tls_libtls.c b/libavformat/tls_libtls.c
index 911c8094b0..22858d4867 100644
--- a/libavformat/tls_libtls.c
+++ b/libavformat/tls_libtls.c
@@ -158,6 +158,8 @@ static int ff_tls_read(URLContext *h, uint8_t *buf, int
size)
return ret;
else if (ret == 0)
return AVERROR_EOF;
+ else if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT)
+ return AVERROR(EAGAIN);
av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx));
return AVERROR(EIO);
}
@@ -171,6 +173,8 @@ static int ff_tls_write(URLContext *h, const uint8_t *buf,
int size)
return ret;
else if (ret == 0)
return AVERROR_EOF;
+ else if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT)
+ return AVERROR(EAGAIN);
av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx));
return AVERROR(EIO);
}
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
