]> git.sesse.net Git - ffmpeg/commitdiff
tls: Do not abort on non-fatal TLS alerts with gnutls
authorMartin Storsjö <martin@martin.st>
Sat, 21 Sep 2013 22:02:36 +0000 (01:02 +0300)
committerMartin Storsjö <martin@martin.st>
Sun, 22 Sep 2013 13:10:21 +0000 (16:10 +0300)
Signed-off-by: Martin Storsjö <martin@martin.st>
libavformat/tls.c

index fecf096b021ab2dd52b4dc65d97eff5157bb21a0..7fa6fc2caeb86164aa671ea0bbd8392601551eee 100644 (file)
@@ -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);
     }