From patchwork Tue Mar 20 22:28:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bodecs Bela X-Patchwork-Id: 8062 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp4433319jad; Tue, 20 Mar 2018 15:29:02 -0700 (PDT) X-Google-Smtp-Source: AG47ELvLXzx4axRccoambOkjX4VzrSvO7ne3BmRcDKrg2ZgHg4rghbiMRM7WAJAG5DOt+fgZsEWw X-Received: by 10.28.69.93 with SMTP id s90mr895905wma.71.1521584942533; Tue, 20 Mar 2018 15:29:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521584942; cv=none; d=google.com; s=arc-20160816; b=Nax5abt9o7w5V/SzfvAOiNth5fLyFQWWoEvyf/kJzPpMbiJfufXp6ejNPFEOeCuQcG QcKCkK9rKz5nELy7RJ2bV9CDMXqmLytQqr28/p/nKULupMDSab3UDZVjNpQDkRJCRdao fWQMhSAWQvHS2exExOWnmWV0cs13+QpjysnBecduyfKZazAuJUv04pnGlnQkh6XvXUm+ xjS4cn70biIoe8i5n+HaHX7i9/aNjP59Xqgly3OztoBu1OBWHvhO6c5/e/hCt3yTS8ae oFlrIkV7MVs2dZzXPq5gotxVDSJtlob5YRpQuvxnWhgYQ1UgDcO7T7zom2Pz2246jgSY kOYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :delivered-to:arc-authentication-results; bh=siJaIPcx0dveAHvT0l5zq92f3au1sDYtatMo3bMkGz0=; b=qqg2c35Z2dRNIHI46swfRrIKXk3m244PiarDo5hv9HUqkwcKctm1ZfmE9gtYOxAC82 R00NhswbUMeBiuMBjO9bSLghN497evTzaRPl8E9TinUTteEScW2KzogJoWCRKfMilY1B uS2EPlXDZk4JTEit2mdcmY2hNOsW3jBP9tM1c2fEvkVJub9vDZ5O5ER3iC/4ByB/43EG MKbE7o3PWsZEkclM+W1dXrazLf90n23LaMICOQBh7qwpVtUVq46nGiUwGTCaG3XOpoYU DA830mNC9FLQGfy+BVQrzFmEl4VrehG0pNCgfj1ND2qqJCh3IW4mCgBxDIcV2cBSt3hz DmrA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 7si1885896wmu.135.2018.03.20.15.29.02; Tue, 20 Mar 2018 15:29:02 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 465BA68A353; Wed, 21 Mar 2018 00:28:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-xsmtp2.externet.hu (mail-xsmtp2.externet.hu [212.40.96.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 159AE68A143 for ; Wed, 21 Mar 2018 00:28:40 +0200 (EET) Received: (qmail 11574 invoked from network); 20 Mar 2018 22:28:54 -0000 Received: from pool-013a6.externet.hu (HELO ?192.168.0.18?) (bodecsb@vivanet.hu@212.40.115.165) by 0 with ESMTPA; 20 Mar 2018 22:28:54 -0000 To: FFmpeg development discussions and patches From: Bodecs Bela Message-ID: Date: Tue, 20 Mar 2018 23:28:56 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: hu Subject: [FFmpeg-devel] [PATCH] avformat/unix: handling EOF in case of SOCK_STREAM 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" Dear All, when recv() returns 0 in case of SOCK_STREAM type, it means EOF and with this patch returns value accordingly. See the original thread "[PATCH] avformat/unix: properly handling timeout at reading" for details. please review this patch! thank you in advance! best regards, Bela Bodecs From 3a022da0ebd01b65fd3beed95a13ea0f0fcabb20 Mon Sep 17 00:00:00 2001 From: Bela Bodecs Date: Tue, 20 Mar 2018 23:24:11 +0100 Subject: [PATCH] avformat/unix: handling EOF in case of SOCK_STREAM when recv() returns 0 in case of SOCK_STREAM type, it means EOF and with this patch returns value accordingly. Signed-off-by: Bela Bodecs --- libavformat/unix.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/unix.c b/libavformat/unix.c index 4f01d14..38016db 100644 --- a/libavformat/unix.c +++ b/libavformat/unix.c @@ -111,6 +111,8 @@ static int unix_read(URLContext *h, uint8_t *buf, int size) return ret; } ret = recv(s->fd, buf, size, 0); + if (!ret && s->type == SOCK_STREAM) + return AVERROR_EOF; return ret < 0 ? ff_neterrno() : ret; }