From patchwork Wed Apr 18 18:37:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 8494 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.85 with SMTP id c82csp3410356jad; Wed, 18 Apr 2018 11:38:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/Jrug1K2KfV3U5wr1xPk47R2jM77eiJOwUK2Jz7eTFTsGFtrguAThuLuAvSgJsoSBXMOdd X-Received: by 2002:adf:ace2:: with SMTP id o89-v6mr2409823wrc.264.1524076689815; Wed, 18 Apr 2018 11:38:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524076689; cv=none; d=google.com; s=arc-20160816; b=inoUnjlhevuhy90XuekxXIk7TaohbhWJqynTCsyXDRSFLccY0iNRxHyKNm7GzR2i7V 4l8pbfcRie/ww4ELrKIpgfEgW7z/rJLDgGn5vUIN+mMzNKTmLlCpQGBfuuUAWWxx3T8g a5oEoe1wW2sjh4z6FdVScK8/q+Txj7TbsOKYYSxZGbzzzGTLZZ4/Vtzq3AI5JzEmPJUT Uw3pjhT4Sp5qeM+PyhqCo0UMPEDGdeAxV2dg8M8MhKO9rGX3T7AMxONvajLmoQJxrC3M iygpZwNLwmc0/zPP5h0FXbbICkdF5IWPmdl1v6se1bJQNL+8P++yzka9740pTI64kth4 S3Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=aTrCDpSZd0PLPr+Yy6xBHr1Oy1OdSGn6cgzbWh7H8hE=; b=epwlLIiMW7rcwyNCoFmFWyeTe/xYNJZ1NaZG6ShC+v3LC70vHChHAYvYrdzZcWjGk/ f3jy/hL+45TYj6iyYqFAtG6x607yx08CVqoVO9E9QD164K5yQ27bW8jTMz5w1uMxYkvQ y8tG2OjNOwhY2Bp6YeGQa9W0rX0TXsv7iRbqxxDLvvNMRb+YaCNTOKKtfJWFjvxFWee2 T4NGD8PgMjMKBPmtq9QH3om0yL2rYFs1UKlFFlt+cFQj3wHOSNJ8TBVIN34Lz3pl35Np 22QtWK9ExemhNQVTVrY1YINnTvtj9AsVNCdPoGWdPWntsn2YRkbZozBu5ZwKlCLLtPQA ZM4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WVWNAzci; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p2-v6si1460988wrp.211.2018.04.18.11.38.09; Wed, 18 Apr 2018 11:38:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WVWNAzci; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C55468A0C3; Wed, 18 Apr 2018 21:37:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01B8768A046 for ; Wed, 18 Apr 2018 21:37:33 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id w3-v6so7435683wrg.2 for ; Wed, 18 Apr 2018 11:38:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=7xPjF5cZuoHxYJXCdmEixKjpYFY2f8z6m/FaFLQdSH0=; b=WVWNAzcibWSFmx2hIN7H4dmPhadvak8jGWc7xpJw93tZLF2qD/nF8GXmiVPQhWqTg0 kyI52k2ZFNLJXjN4SEixXiIvVZxJPWS67bVusWdwSrdjCagAiXjDCvGgUBXtzuu26lIT KS3TxBKadHvilCYJRePzhLAvsNoBgEw7R31jST+wXj9eYaJ0MiBkqFDqI54t1vI4AxO3 1zRjmWj31uBkDnx/p7FXCpnWn3egZ9p2FiWEOxYM6jN4D9usouIs7n8gGxuypV2j5z0V QzT72viX7wwktu7y/zk5Ml+Og+9wgVOYw4/kYd2tcTMzbQo72jNI62H4YeTDRltITC5P YFHQ== 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; bh=7xPjF5cZuoHxYJXCdmEixKjpYFY2f8z6m/FaFLQdSH0=; b=i+ckXlmBs1JmFxyjBgid3gNa4AjJi8DnO5TtUZ6kzrrGqPmi+5TDZL4aAaEiKrX0yD ibyUnQUm+7kHKP5Q5sjr6N2U2LWghegfpZsfCQ/HJEm7E90ZoBJkKAu9M6+/hCgFInLm rGCmjHatgom0iD1/EvcIeHifL+abhJsGYaEbLjz2MRmNXC+zZFBWjr3HfUG8D7VFoUEX FMwEeqmBEM3uGQDxo5sviRKXo4wgMv4MOnM6nfuv2A8zw4xFrWHddcthp5aFAqqW8UJe 8JGdjY6Bo2Jx8hayHl/fpCnu/J+rjgCtTGu2SK+ClgZKY6cC8Ht00yt3FeQUROJ3DF5q 60Rg== X-Gm-Message-State: ALQs6tB5gksW5lxemIhm/KN8lJfmr8NS6k/gQOSKo+1hl3Svmhig4JzB +Ko7JlGrjPDGc42lqopfZEUZrrdG X-Received: by 10.28.23.21 with SMTP id 21mr2591786wmx.49.1524076680671; Wed, 18 Apr 2018 11:38:00 -0700 (PDT) Received: from localhost (p4FC4F2E6.dip0.t-ipconnect.de. [79.196.242.230]) by smtp.gmail.com with ESMTPSA id y51-v6sm2009562wrc.38.2018.04.18.11.37.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 11:37:59 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Apr 2018 20:37:58 +0200 Message-Id: <20180418183758.12824-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.17.0.windows.1 In-Reply-To: <20180418121003.25240-1-h.leppkes@gmail.com> References: <20180418121003.25240-1-h.leppkes@gmail.com> Subject: [FFmpeg-devel] [PATCH] avformat/tls_schannel: fix handling of EOF after avio changes 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/tls_schannel.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c index 9a6e0c92e3..f41b007773 100644 --- a/libavformat/tls_schannel.c +++ b/libavformat/tls_schannel.c @@ -413,11 +413,13 @@ static int tls_read(URLContext *h, uint8_t *buf, int len) ret = ffurl_read(s->tcp, c->enc_buf + c->enc_buf_offset, c->enc_buf_size - c->enc_buf_offset); - if (ret < 0) { + if (ret == AVERROR_EOF) { + c->connection_closed = 1; + ret = 0; + } else if (ret < 0) { av_log(h, AV_LOG_ERROR, "Unable to read from socket\n"); return ret; - } else if (ret == 0) - c->connection_closed = 1; + } c->enc_buf_offset += ret; } @@ -515,7 +517,7 @@ cleanup: if (ret == 0 && !c->connection_closed) ret = AVERROR(EAGAIN); - return ret < 0 ? ret : 0; + return ret < 0 ? ret : AVERROR_EOF; } static int tls_write(URLContext *h, const uint8_t *buf, int len)