From patchwork Fri Mar 26 14:11:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 26620 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 79E0644B2CF for ; Fri, 26 Mar 2021 17:21:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CE0168A711; Fri, 26 Mar 2021 17:21:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0090689A8D for ; Fri, 26 Mar 2021 17:21:49 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id v11so5996803wro.7 for ; Fri, 26 Mar 2021 08:21:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NB6nQiYYD9vYD20ezr7ss67811Q0vkvKGQbL27/gnCo=; b=PojVEc2Q3+X206Mv2s3WQ/XUClewGYrQTpuQAVRzhD8W5Hjx3s3l853JKqTUztzVKt hSpq3SANP5Q6xhHMc22eYE1+00k+0qdacXlo4IkO3iTRvYVkCe3RlegEBs2cQbEUXklO IoUAYRjZ9e0JUSp3tvPUGy6qGcBl3eXR2V6K8PVmiGV1W6dh2dfKukrIWX0j/0Hi/dn1 WjcKmdKT6pGoL7+9ixHUtl3dU2D1goCPQ02NY+xDiERloWb+2txIfuOtEerlOUeBe6CP 7IRnYHY6SupIDgKGSJcPPf9R/owgIlmcpTC2bLw9l/ztkv48QLnJeaXL7pC4e5Jy1ugh ZjTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NB6nQiYYD9vYD20ezr7ss67811Q0vkvKGQbL27/gnCo=; b=hBG11mfM9eSE8w/HXOI9onEKMWdZdtgcNsCQ/9W7C0zHmCb+PwGmyFeJg5SgM+OjEj z4RVjYxGZDrrjrf12qRgXP1J0XJRRp0+we3dlOaAr33KtoFTuTYzfLPt05I2sjL6Jc+K LkCpKNn54BzZjlZSnBrT3K0yZwoqVeyz3TXv3cOn0ybHAZ7sIcQGdR8cM6wC6OmsvDOV 4Gi5Rhlqis0uU/Yq8u0SkHXEpBeSx1SkkrihrQj+MX4ekre6QaSittJQGe5XrcJ6Wy4B PIxAHqviUk06HI6+Ft0dtw5xkgkB0bsb1oCepkDgXfVzeTEyeMRIxHon+2EVJvGU50/A eRxA== X-Gm-Message-State: AOAM532nIpRP6HQanjRG6YJTjpVG1dG5n5T7Ftl6gOgvKwVfxnZqbADz yi6TNBfOHoxM24wWZgK89aR7fFz00qtTcxme X-Google-Smtp-Source: ABdhPJxC4V6E4UQAhz4h79AvSCdAO3larOJc98nA4C+IT+Ou6GDOPsRIp9AfIXqlJVk3dI8H2NtFwQ== X-Received: by 2002:a5d:560e:: with SMTP id l14mr14603696wrv.10.1616767918373; Fri, 26 Mar 2021 07:11:58 -0700 (PDT) Received: from localhost (host-96-177.parnet.fi. [77.234.96.177]) by smtp.gmail.com with ESMTPSA id n9sm12362922wrx.46.2021.03.26.07.11.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 26 Mar 2021 07:11:58 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Mar 2021 16:11:55 +0200 Message-Id: <20210326141155.48733-2-martin@martin.st> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20210326141155.48733-1-martin@martin.st> References: <20210326141155.48733-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] tls_gnutls: Print the underlying IO error message and pass the error code through 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/tls_gnutls.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index f9d5af7096..741578a596 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -51,6 +51,7 @@ typedef struct TLSContext { gnutls_session_t session; gnutls_certificate_credentials_t cred; int need_shutdown; + int io_err; } TLSContext; void ff_gnutls_init(void) @@ -73,6 +74,7 @@ void ff_gnutls_deinit(void) static int print_tls_error(URLContext *h, int ret) { + TLSContext *c = h->priv_data; switch (ret) { case GNUTLS_E_AGAIN: return AVERROR(EAGAIN); @@ -88,6 +90,12 @@ static int print_tls_error(URLContext *h, int ret) av_log(h, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret)); break; } + if (c->io_err) { + av_log(h, AV_LOG_ERROR, "IO error: %s\n", av_err2str(c->io_err)); + ret = c->io_err; + c->io_err = 0; + return ret; + } return AVERROR(EIO); } @@ -108,32 +116,36 @@ static int tls_close(URLContext *h) static ssize_t gnutls_url_pull(gnutls_transport_ptr_t transport, void *buf, size_t len) { - URLContext *h = (URLContext*) transport; - int ret = ffurl_read(h, buf, len); + TLSContext *c = (TLSContext*) transport; + int ret = ffurl_read(c->tls_shared.tcp, buf, len); if (ret >= 0) return ret; if (ret == AVERROR_EXIT) return 0; - if (ret == AVERROR(EAGAIN)) + if (ret == AVERROR(EAGAIN)) { errno = EAGAIN; - else + } else { errno = EIO; + c->io_err = ret; + } return -1; } static ssize_t gnutls_url_push(gnutls_transport_ptr_t transport, const void *buf, size_t len) { - URLContext *h = (URLContext*) transport; - int ret = ffurl_write(h, buf, len); + TLSContext *c = (TLSContext*) transport; + int ret = ffurl_write(c->tls_shared.tcp, buf, len); if (ret >= 0) return ret; if (ret == AVERROR_EXIT) return 0; - if (ret == AVERROR(EAGAIN)) + if (ret == AVERROR(EAGAIN)) { errno = EAGAIN; - else + } else { errno = EIO; + c->io_err = ret; + } return -1; } @@ -179,7 +191,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op gnutls_credentials_set(p->session, GNUTLS_CRD_CERTIFICATE, p->cred); gnutls_transport_set_pull_function(p->session, gnutls_url_pull); gnutls_transport_set_push_function(p->session, gnutls_url_push); - gnutls_transport_set_ptr(p->session, c->tcp); + gnutls_transport_set_ptr(p->session, p); gnutls_priority_set_direct(p->session, "NORMAL", NULL); do { if (ff_check_interrupt(&h->interrupt_callback)) {