Module: libav Branch: master Commit: 5055035670bd1a1eaca64bd3bc71fb07de9df2c3
Author: Martin Storsjö <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Sun Sep 22 01:02:36 2013 +0300 tls: Do not abort on non-fatal TLS alerts with gnutls Signed-off-by: Martin Storsjö <[email protected]> --- libavformat/tls.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavformat/tls.c b/libavformat/tls.c index fecf096..7fa6fc2 100644 --- a/libavformat/tls.c +++ b/libavformat/tls.c @@ -72,7 +72,14 @@ static int do_tls_poll(URLContext *h, int ret) TLSContext *c = h->priv_data; struct pollfd p = { c->fd, 0, 0 }; #if CONFIG_GNUTLS - if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) { + switch (ret) { + case GNUTLS_E_AGAIN: + case GNUTLS_E_INTERRUPTED: + break; + case GNUTLS_E_WARNING_ALERT_RECEIVED: + av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret)); + break; + default: av_log(h, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret)); return AVERROR(EIO); } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
