From patchwork Sun Aug 5 13:14:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9897 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp2227037jad; Sun, 5 Aug 2018 06:21:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcbfA3gvZvMcxnXesTVDdhjSOHiJbDRJOh7bB7IaN8ruYMSDF77cLh8/aoNab5t5Y/Si/Zj X-Received: by 2002:a1c:a703:: with SMTP id q3-v6mr9573248wme.28.1533475294448; Sun, 05 Aug 2018 06:21:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533475294; cv=none; d=google.com; s=arc-20160816; b=lcM19Oh7jBbQTgIaiHOnFxYZ3XK1h1zm+nu9mXQjyjBaAbacazm4m2GVq274u5GNa7 ou7PxX2IVU9CsE/FytXQTnq37DW8vvjcsU36K2mkkaqUo/e8N3TKjNhavtRNJPYhe3hh q6qvQpG3orGwrFcB3bzmrKRnrkhlgiU46CtS+8ogD3oO9iQJyvH3lkE4SPHLS1Z6VFva 7d/dxiakqlpGnp185l+5GefP+MQ5KWUmkILkjJT811evYsiKhSN+Jx/OLk9Soz6HNo4s X/In/OCitociWMHC0jXWs/lFkzBfGyUT27xm3HN8kaDRt/fS3oHAZETuNOo+UduGxoGn uyLg== 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:cc: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=K/Kw1aAcTnqmN8353r2bFFq1oIcbAaL0TfpRGRAoZLs=; b=kQ+Z3GSEGb28HlNx6T1WeHU9mbE2igQzedYEPLIw7IrH0A3enqH9NUnLKzbJ58xIc0 MU36fpSChbTAysiCTxS/JaxGdla0BxnroStpir1z3YWYrUwbaSImH93Y2YI0BpbXl8C2 xtctWVFBRrOJFH/Nf8wp9zSS77709EWZ3juV0yPC4HM0jo0YULxC3FfEHpCVAW7sMYLt JBq9OcPTOPGP25Ycc9ImVBc4AxkoORSm5uR9px3lPbdbziBBHRk1oWQ2x4tv2ueXJJXY mmN+7/nBMXpzdNM6u0qTwZxWpejH0aA9wF5/z2I067iDU24SL/HJ1ULF9miVmEjYNeqR Dvzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TKAFlxHo; 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 q12-v6si7318794wrg.14.2018.08.05.06.21.34; Sun, 05 Aug 2018 06:21:34 -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=TKAFlxHo; 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 8CD9468048D; Sun, 5 Aug 2018 16:21:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B43168048D for ; Sun, 5 Aug 2018 16:21:07 +0300 (EEST) Received: by mail-pl0-f66.google.com with SMTP id d5-v6so4505630pll.4 for ; Sun, 05 Aug 2018 06:21:26 -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:in-reply-to:references; bh=kIbSdvQA/xN2oDaFsr7hdWE8B7tFacEo8BZIRgmMBbE=; b=TKAFlxHo6rGp5Vv+10wRkfIc9FOdQxApwd1dA6IyPlnQYTC7ZMQ0xla4f93ok+kfe+ v7Y/ymQIBF9o8oa3wmN07WYsbdyiSZYi8OJJ5EnJ06oxlufjSCpF3JGE7I9Jz9LttFDZ AKSh7iTZDHGprs9j7QfqW42NcxAXGyovbuHatK3taZjWm21rWdkGFSXEXYiGX8G6LUEH qTKzwtfhwPGJsTJ4+FEGriSbsk0dR2gVu7QWg1RBDt2AnEcGKR8zl6XYlXbfXADU7SWl 2kZx5KAAdWIaN7KBzgDt35TClt+CyqyvVmKbdM8tlpFRpB5ztQotX1Ak+HNZODb+h68h lwQA== 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:in-reply-to :references; bh=kIbSdvQA/xN2oDaFsr7hdWE8B7tFacEo8BZIRgmMBbE=; b=G+uPU22zlm6IfUK+nafJfoYS1NgFnaEJU7dbjtNY54bAGxB1ESJ2l7C7MwWAHJwOJO oLrNl1p18JD70HPzBZtEoVpT5g8rcFVHhYBlfZccH+LM/J7uFKenXoMw8fFc0MAEB70S sIqjcIX8oOXqoj/R4XN3gSfDiuYVXTv0owmoarEwGfHEP1wlFG8tD0W17mPH8Pl18D60 KNb+6Z7WxiZ53i+iluu4kJZMJd8rZNK0mufHZDiovKs/skRIxqdXHC0gTwmA7lWivnng tZISgWwge9vD2Q+Dn3iCCZQ7nNq9RCNXMay+OhO8JvWZsITWkXDR0WU3Dcc/TaD1rimp nI7g== X-Gm-Message-State: AOUpUlGT52GwwatTqPhEKZQhQFD4jRzCBS3EMBhRnn/W0/6DAjYJ5UQ1 rZUWsw2T374OfuI/r61wduDP9JGw X-Received: by 2002:a17:902:6946:: with SMTP id k6-v6mr10489052plt.268.1533474889373; Sun, 05 Aug 2018 06:14:49 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id u71-v6sm19862707pfk.174.2018.08.05.06.14.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Aug 2018 06:14:49 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Aug 2018 21:14:32 +0800 Message-Id: <1533474873-10436-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1533474873-10436-1-git-send-email-mypopydev@gmail.com> References: <1533474873-10436-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] lavf/tcp: check return value of setsockopt. 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" when setsockopt fail, use ff_log_net_error to dump the string describing for error number. Signed-off-by: Jun Zhao --- libavformat/tcp.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 499e365..8bff9a3 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -151,17 +151,25 @@ static int tcp_open(URLContext *h, const char *uri, int flags) /* Set the socket's send or receive buffer sizes, if specified. If unspecified or setting fails, system default is used. */ if (s->recv_buffer_size > 0) { - setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &s->recv_buffer_size, sizeof (s->recv_buffer_size)); + if (setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &s->recv_buffer_size, sizeof (s->recv_buffer_size))) { + ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_RCVBUF)"); + } } if (s->send_buffer_size > 0) { - setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &s->send_buffer_size, sizeof (s->send_buffer_size)); + if (setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &s->send_buffer_size, sizeof (s->send_buffer_size))) { + ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_SNDBUF)"); + } } if (s->tcp_nodelay > 0) { - setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &s->tcp_nodelay, sizeof (s->tcp_nodelay)); + if (setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &s->tcp_nodelay, sizeof (s->tcp_nodelay))) { + ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(TCP_NODELAY)"); + } } #if !HAVE_WINSOCK2_H if (s->tcp_mss > 0) { - setsockopt (fd, IPPROTO_TCP, TCP_MAXSEG, &s->tcp_mss, sizeof (s->tcp_mss)); + if (setsockopt (fd, IPPROTO_TCP, TCP_MAXSEG, &s->tcp_mss, sizeof (s->tcp_mss))) { + ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(TCP_MAXSEG)"); + } } #endif /* !HAVE_WINSOCK2_H */