From patchwork Tue Jun 7 15:46:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Maseda Neira X-Patchwork-Id: 36091 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp6969250pzj; Tue, 7 Jun 2022 08:46:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+FzWmT/VfhHxc36maPxRa7C2oGwlGjKTF7rCw0YwE4+6jFBu5Day/JQMn1+7N33Oa9zIQ X-Received: by 2002:aa7:d295:0:b0:42d:e371:ded2 with SMTP id w21-20020aa7d295000000b0042de371ded2mr34665282edq.336.1654616781397; Tue, 07 Jun 2022 08:46:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654616781; cv=none; d=google.com; s=arc-20160816; b=KMvtkbhbU4jOkENw2T1BftEIukGvYhYDCetPEe0FSvny8NMroe9q/TYUELA/k9/hvu mHLoyyN4mV865MruWRv+YUNE+HfcBIe39AyEHwYqwKO6IWrZTkh2PqFjKaZT87TJ118x qFAPtTIouLYIh2rIQmUCFgxg1GJnLSXUZhKlpstGe+l1Z3yN+sgoL5aW1qJjiaucEgjR jtJPb2zpVdLyNy+EiMaDHiN8gEGwsR26g53N6X50ljVO8HXUwqu04IV9tYDL6wjJsvdv Kv6YuVrZ2gY5XpT/JA3VLnEF132JNBi7WBXcMC+lG7+D7g+3QOD5gtKqm8GmjBZ6ASvb 79Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=ZWTVv0i5t6VRQq6I2CTJ/P7NLOPMShOxpkCjVDTtk2w=; b=J4R5ufQ8465Gt2z4ZQOtQyS3j36aWfeTT1vSd5noa/EmaAnyFMonK8iTC/V9dJKGDt 8ck3RwXRixVMhv96IIqngHZ3U4/LOsydRcFg6/dVg51DEfvNs2OaYTj1wMtZdpeZ0094 25v+FQYNShKaHtAkz+u/+dsgnc28RuV6v8oSayjnbljOak2kBIhzItKutCz7HgG3YWC6 88QAKHufFxyLRHCITTCuQloQsqBc9cEQDB5a8l8o5HWorCX6BIgpjE/AsdSz9Q5feFRb aPMD9igA7EqCPfS5NT32HMKrGlHQ0OaL0vMeIXXugG9KCnuTWL7g7QqxQWr8+Fm+dVmK KCNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@cinfo.es header.s=google header.b=HPgkhXlT; 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=NONE dis=NONE) header.from=cinfo.es Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qw33-20020a1709066a2100b00711d8b7d8b9si5329241ejc.398.2022.06.07.08.46.19; Tue, 07 Jun 2022 08:46:21 -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=@cinfo.es header.s=google header.b=HPgkhXlT; 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=NONE dis=NONE) header.from=cinfo.es Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6583868B50E; Tue, 7 Jun 2022 18:46:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CE4868B50E for ; Tue, 7 Jun 2022 18:46:09 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id r123-20020a1c2b81000000b0039c1439c33cso9738951wmr.5 for ; Tue, 07 Jun 2022 08:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cinfo.es; s=google; h=message-id:date:mime-version:user-agent:from:subject:to :content-language:content-transfer-encoding; bh=vJvmoxv9euu+P3u31SwLkdOmkAL7GCYlwAp9UznqAT0=; b=HPgkhXlT7WTkdBKxzNstWTInssjVBV9hDmq6z5gQnAFvfNcEBA1FZfO5qqY+5aKBUg AvmszVW+Xbi2hoFLlj48qodFmuutfXYylU9eKwo32JLDekpBD7C25QhXVrNt4jQXUrz3 B9z+2+OZKo27O97/bFWpv8d9pPGvma0Q6EO+M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:content-language:content-transfer-encoding; bh=vJvmoxv9euu+P3u31SwLkdOmkAL7GCYlwAp9UznqAT0=; b=7nCASJWlL9kGtcuRc0NNJxntASHUOy+WZaFBlQt7FCDL7GfAsGZBianft3vsNoxTvt y0t9sxAYFqFOJL375QVJUsaixeO8oELC13fAJ4jF5N5+uPnrBgp83pN5YtSukTZx4XoW OG4jrvUK1lChSSrXCyKEKBTaZgtbzVI5Py5sDNfhnMRPEbK5Dk48Z7xBvGYMHsC657t4 AhvZ3TTEnYqctrw7aSb4Zny4A4UHgrjTvUcuGzU4vnfuuVmlMAgzLVI7xm+VufQduS9w d97UZE9CLp5XXkwtA0wdUDPfVmgyD/T2Myey5dg8Svl27HCD3MTejyfqicITDMjZ87l7 tCnQ== X-Gm-Message-State: AOAM531KEClFrL02ritdJuXkNOAdMCIYF5DMyX7Q7V8fsbYzatJmav/4 jPuCjN8s8vVRnEEFK7Ae8jyugO6kTQdoqyIxAs0koig0MFUT0GgTKx4bzKoSclaXjYEZLP7ArcF SFlpG1PN55EdyxFYhfsU= X-Received: by 2002:a7b:cc94:0:b0:39c:4507:e806 with SMTP id p20-20020a7bcc94000000b0039c4507e806mr19846121wma.91.1654616768294; Tue, 07 Jun 2022 08:46:08 -0700 (PDT) Received: from [192.168.0.128] ([185.153.166.225]) by smtp.gmail.com with ESMTPSA id f6-20020a05600c154600b0039c5ab7167dsm2125982wmg.48.2022.06.07.08.46.07 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jun 2022 08:46:07 -0700 (PDT) Message-ID: <05a1e2e4-6681-fbef-0fa6-80fcd5c26a12@cinfo.es> Date: Tue, 7 Jun 2022 17:46:06 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 From: David Maseda Neira To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] Added SO_KEEPALIVE in TCP sockets, so kernel keepalive settings manage timeouts in case of TCP hangs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: bSo3WQaxluOh Signed-off-by: David Maseda Neira --- libavformat/network.c | 6 ++++++ 1 file changed, 6 insertions(+) return fd; } -- 2.36.1 diff --git a/libavformat/network.c b/libavformat/network.c index 21e20b3e9a..0361346631 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -204,6 +204,12 @@ int ff_socket(int af, int type, int proto, void *logctx) } } #endif + if(type == SOCK_STREAM) + { + if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &(int){1}, sizeof(int))) { + av_log(logctx, AV_LOG_WARNING, "setsockopt(SO_KEEPALIVE) failed\n"); + } + }