From patchwork Wed Mar 27 12:03:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Remita Amine X-Patchwork-Id: 12492 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0A9634482EB for ; Wed, 27 Mar 2019 14:09:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E11E3689DD1; Wed, 27 Mar 2019 14:09:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD6BE6807A3 for ; Wed, 27 Mar 2019 14:09:17 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id k17so10315971wrx.10 for ; Wed, 27 Mar 2019 05:09:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lllrO1lxO1j6SHuNI4J77LNVeA0ZRkEiSrK53M5oKS4=; b=ULgWuNb7Ph34xBhNqP+2CpCiMq8RyHIK4Gj6Ne5KX41C2GWzSMVSrplWOO9kwNdnWe lPoKDX22ikJUk730VVxf000Suldvq7XFHate7464dmL0obiBzf+mXAYDPuy+Blwj7Sdo SuxTPhCB6bfCM8IwqALw50nMaiUHfU3iDjJ+OB++e84gJKhY9uBCrzwETkQd6GJ1DW1Q cHcr9GChFQj83n/B4J5VNKt0XrXGS1TNftRuhiC0XpCAUtinmEccJoGvbTXtfjnjF+Xu 88R/pXaHWBS60yHUs39tNKILWuskOknXjYXOtggPvxDYQG3FHW6kycKEN5sv70wreKt7 csOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lllrO1lxO1j6SHuNI4J77LNVeA0ZRkEiSrK53M5oKS4=; b=EeZsdg8wJELsqBkI2C/fneEw9u8zearfDiI1jLiVT3RL3pa7eXMSC/x24plcAQHG8d dl4GMQtfo9EIcWyV0soLc45Yk4t6NkrgDfT8uMUs9x1QSPTjTsDMCxSuFqqwyhtykjjA GfrfHMTXWx/FuNqaowO4y7CZMwFG3jFIPekKXnAe9qh+njbPU1vodxYBRFx5wpD5fAJU ZVN+CrkQz8Ek4RwwC9XzIgOgxyt+TY/hKhKuC3qWaYStad1jbRyAw6VsDGoDzEFWcduZ LNOaFCCSsuGXtF5PBVRgoPy51O8oCD4aU0L+upw9WqlNCNYdnwaiq18n3DsXlvwKP8st SHPA== X-Gm-Message-State: APjAAAXnGuzjAIMpaA5k/i9vwMcHDxKcjj8YXOGMYhCfGUICa2qk67b6 NjCkImHuSCRLm737q7Rvaxf6hi2n X-Google-Smtp-Source: APXvYqxkkIsSafp+JdHEN/8BGVgetp+XQmQrUehceIVZN+fbMexTSd6DcgT2e84l8MFpASN9flYjMQ== X-Received: by 2002:a5d:6681:: with SMTP id l1mr1527587wru.186.1553688211317; Wed, 27 Mar 2019 05:03:31 -0700 (PDT) Received: from localhost.localdomain ([105.110.116.205]) by smtp.gmail.com with ESMTPSA id n11sm34744757wrt.63.2019.03.27.05.03.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 05:03:30 -0700 (PDT) From: Remita Amine To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2019 13:03:07 +0100 Message-Id: <20190327120307.15292-1-remitamine@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/tls_gnutls: retry gnutls_handshake on non fatal errors X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Remita Amine Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fixes #7801 Signed-off-by: Remita Amine --- libavformat/tls_gnutls.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index e3c43683be..f32bc2821b 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -182,11 +182,13 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op gnutls_transport_set_push_function(p->session, gnutls_url_push); gnutls_transport_set_ptr(p->session, c->tcp); gnutls_priority_set_direct(p->session, "NORMAL", NULL); - ret = gnutls_handshake(p->session); - if (ret) { - ret = print_tls_error(h, ret); - goto fail; - } + do { + ret = gnutls_handshake(p->session); + if (gnutls_error_is_fatal(ret)) { + ret = print_tls_error(h, ret); + goto fail; + } + } while (ret); p->need_shutdown = 1; if (c->verify) { unsigned int status, cert_list_size;