From patchwork Mon Jan 10 16:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33183 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2897643iog; Mon, 10 Jan 2022 08:52:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3N8SlXr9eoOWJFt6b8363wmAFqJRYtiot7yaUXfs6g6DCpD+vThdylbEFa5VW3hk8bL1Y X-Received: by 2002:a50:d541:: with SMTP id f1mr535366edj.18.1641833573594; Mon, 10 Jan 2022 08:52:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641833573; cv=none; d=google.com; s=arc-20160816; b=RnYzYShe6xkmDenUIU5i+5VvZm4YjCdhEEAgE0oOhyU58HpOWmSqOxkIODLGmOdHCj DCUUaftm0/miqlkePTzH3eOK7OmWQIlNlxRcbq3fll08s03WFBoD31ss4TbjqVlheEvy tc/YWKS2ibGNmgHdKJ4U3TPbQvOoMKUPIqryfxxlRtcfQhA0eV1YhenS1CHBSXbg88sB WGyxCMW1xw8gaepmCs26H0xCnB+QRmVVNm7+qxIz9C6Q8u+opeLFnvReOlqIcjluiJSd lBAYoyHz1cDEqu4kVEvpzktDaBvgBRaZcMdAW4xPpuCyrD9Gt7S9/z+hyAm8Z+Lymjac Y0fQ== 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:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=i45rNApMtZRGjsnuzh+XLylQnjT26grzsYMwvLuBkFg=; b=i9bYWelpHy/D4NsLOjGyZpKVf2vvIWPOl7zCGzK0GbqCQ1ttlRF5+KmLiZF17SZq+L ioxrx4GHLVjy6UGvGfdiJkieW8kR/gOzGPpsdWk9lYTm8mCrUkVoH37tg+WWNknRkjMT QFqP6l1JdXueSzThWNvlUsQgm/T68/zWPego0qqh9QW59l8c2/QsnBS+u1YUobFsqFFf jiNWiYQRwU3pOjMnz9qJt3g7rzmG98p8cj+51EAtXUDAA7NDKFdlM/2MnKEr2tfzfs2l nD27BC9b6HEjyPSutXijD98JTEhLo325xzGpXqGmoZlPk+EA+SrdvV37R0CjyXdLoiqm K3HQ== 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 p4si4204865edj.354.2022.01.10.08.52.53; Mon, 10 Jan 2022 08:52:53 -0800 (PST) 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 8AD3568AD93; Mon, 10 Jan 2022 18:52:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2550E68A101 for ; Mon, 10 Jan 2022 18:52:33 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id C109E24017C for ; Mon, 10 Jan 2022 17:52:32 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id WBn1ctUL9VDO for ; Mon, 10 Jan 2022 17:52:31 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 5F2B8240179 for ; Mon, 10 Jan 2022 17:52:31 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 5926C3A0743; Mon, 10 Jan 2022 17:52:31 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 17:51:44 +0100 Message-Id: <20220110165143.2292-4-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220110165143.2292-1-anton@khirnov.net> References: <20220110165143.2292-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavf/network: log ff_listen() errors to proper contexts rather than NULL 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: drCtRS+9r1sQ --- libavformat/network.c | 6 +++--- libavformat/network.h | 3 ++- libavformat/tcp.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/network.c b/libavformat/network.c index c3d9f82551..246ffd406d 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -208,12 +208,12 @@ int ff_socket(int af, int type, int proto, void *logctx) } int ff_listen(int fd, const struct sockaddr *addr, - socklen_t addrlen) + socklen_t addrlen, void *logctx) { int ret; int reuse = 1; if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse))) { - av_log(NULL, AV_LOG_WARNING, "setsockopt(SO_REUSEADDR) failed\n"); + av_log(logctx, AV_LOG_WARNING, "setsockopt(SO_REUSEADDR) failed\n"); } ret = bind(fd, addr, addrlen); if (ret) @@ -247,7 +247,7 @@ int ff_listen_bind(int fd, const struct sockaddr *addr, socklen_t addrlen, int timeout, URLContext *h) { int ret; - if ((ret = ff_listen(fd, addr, addrlen)) < 0) + if ((ret = ff_listen(fd, addr, addrlen, h)) < 0) return ret; if ((ret = ff_accept(fd, timeout, h)) < 0) return ret; diff --git a/libavformat/network.h b/libavformat/network.h index d76166faf6..71c49a73fb 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -271,7 +271,8 @@ int ff_listen_bind(int fd, const struct sockaddr *addr, * @param addrlen Third argument of bind(). * @return 0 on success or an AVERROR on failure. */ -int ff_listen(int fd, const struct sockaddr *addr, socklen_t addrlen); +int ff_listen(int fd, const struct sockaddr *addr, socklen_t addrlen, + void *logctx); /** * Poll for a single connection on the passed file descriptor. diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 84d40a1e11..a11ccbb913 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -188,7 +188,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags) if (s->listen == 2) { // multi-client - if ((ret = ff_listen(fd, cur_ai->ai_addr, cur_ai->ai_addrlen)) < 0) + if ((ret = ff_listen(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h)) < 0) goto fail1; } else if (s->listen == 1) { // single client