From patchwork Mon Jan 10 16:51:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33184 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2897767iog; Mon, 10 Jan 2022 08:53:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJz0dg86dIyG40bRKCHnvxQq/L8ym2HGO3HSgEAaRiL/n2FGDC9mrYGIuxUJYRVZbY9Ga9+k X-Received: by 2002:a05:6402:26c1:: with SMTP id x1mr529132edd.188.1641833583652; Mon, 10 Jan 2022 08:53:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641833583; cv=none; d=google.com; s=arc-20160816; b=NItRT21XSEWnrXPILjc1DzidwFyCG/wnOCAVkf0A4WXKXX8SmOplK4jvneHtpNqQDj voa7IFkyyui3+IOYYzM3KLfjZRCVOZ7M/XE9j07f8y6oVqa1e6C6WEUZjrp/Q2dJ4nPk Qs09rWgwGorPL9kYSu8R9ZnmYmbnqusYHuN0W5ANLTqC2eoB+2ZuJvaH5S6YByIbOz3B TDA+EgFKKqGGRJ2C+cjnBfrQtuqm5LPnR+Je6uPJ0eQy53ETc2pR2/vXTmFB85anX3yT MXZOojhwfNK5M5cev+RNYrg+sqwE+68TH5Mid4TCsa1MZR7DM4AiakJxY8nsQhPI/Nwg k+zA== 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=YMKZnRX++dxTEu097EGg406j4zP0pV7Vfds7TiH2aTI=; b=A3QzEhSEOFdFUMNRLY0Y/Wc9dclWS41sRIofvMWd0A3C5nZYvHJGbaFNwHmGWilGAr izgMjr0SvdppWzaFeDJ5ZLmNXLczVm4DCkQ5BZiG13E/Yz1GUbZThwPBQySjpIb2v+0B OHQgZJAi8L8BlqQ05z6MT5bXVid7ihHacyjsYJ0nHvF6CU1odSyl97bN6+hBM0KurWqE xRzMDBH6zMzMSynEfezqgw3v0B9Il9lYQU6VhT19Zi68eWudjzv4swT3kOL8DjkdDFNd fNQR+wm5BPRtTA+phgO3vqNs3wFNAsDZS6DA3epRBKjPgQVRIrVS/ci8UtImYzj8tPJC Klvg== 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 e3si4217198ejs.547.2022.01.10.08.53.03; Mon, 10 Jan 2022 08:53:03 -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 9478168ACAE; Mon, 10 Jan 2022 18:52:41 +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 A36F6680288 for ; Mon, 10 Jan 2022 18:52:33 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 39F89240179 for ; Mon, 10 Jan 2022 17:52:33 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id qWCJ8B-OAQCD for ; Mon, 10 Jan 2022 17:52:32 +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 7BE1224017E for ; Mon, 10 Jan 2022 17:52:31 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 504373A00BD; Mon, 10 Jan 2022 17:52:31 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 17:51:42 +0100 Message-Id: <20220110165143.2292-2-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 2/4] lavf/udp: log net 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: DhZkfu8+K9ck --- libavformat/udp.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 180d96a988..d1195ceca9 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -159,12 +159,13 @@ static const AVClass udplite_context_class = { }; static int udp_set_multicast_ttl(int sockfd, int mcastTTL, - struct sockaddr *addr) + struct sockaddr *addr, + void *logctx) { #ifdef IP_MULTICAST_TTL if (addr->sa_family == AF_INET) { if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) { - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)"); + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)"); return ff_neterrno(); } } @@ -172,7 +173,7 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, #if defined(IPPROTO_IPV6) && defined(IPV6_MULTICAST_HOPS) if (addr->sa_family == AF_INET6) { if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastTTL, sizeof(mcastTTL)) < 0) { - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS)"); + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS)"); return ff_neterrno(); } } @@ -180,7 +181,8 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, return 0; } -static int udp_join_multicast_group(int sockfd, struct sockaddr *addr,struct sockaddr *local_addr) +static int udp_join_multicast_group(int sockfd, struct sockaddr *addr, + struct sockaddr *local_addr, void *logctx) { #ifdef IP_ADD_MEMBERSHIP if (addr->sa_family == AF_INET) { @@ -192,7 +194,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr,struct soc else mreq.imr_interface.s_addr = INADDR_ANY; if (setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (const void *)&mreq, sizeof(mreq)) < 0) { - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_MEMBERSHIP)"); + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IP_ADD_MEMBERSHIP)"); return ff_neterrno(); } } @@ -205,7 +207,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr,struct soc //TODO: Interface index should be looked up from local_addr mreq6.ipv6mr_interface = 0; if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_ADD_MEMBERSHIP)"); + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV6_ADD_MEMBERSHIP)"); return ff_neterrno(); } } @@ -213,7 +215,8 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr,struct soc return 0; } -static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr,struct sockaddr *local_addr) +static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr, + struct sockaddr *local_addr, void *logctx) { #ifdef IP_DROP_MEMBERSHIP if (addr->sa_family == AF_INET) { @@ -225,7 +228,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr,struct so else mreq.imr_interface.s_addr = INADDR_ANY; if (setsockopt(sockfd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (const void *)&mreq, sizeof(mreq)) < 0) { - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_DROP_MEMBERSHIP)"); + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IP_DROP_MEMBERSHIP)"); return -1; } } @@ -238,7 +241,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr,struct so //TODO: Interface index should be looked up from local_addr mreq6.ipv6mr_interface = 0; if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_DROP_MEMBERSHIP)"); + ff_log_net_error(logctx, AV_LOG_ERROR, "setsockopt(IPV6_DROP_MEMBERSHIP)"); return -1; } } @@ -272,9 +275,9 @@ static int udp_set_multicast_sources(URLContext *h, include ? MCAST_JOIN_SOURCE_GROUP : MCAST_BLOCK_SOURCE, (const void *)&mreqs, sizeof(mreqs)) < 0) { if (include) - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(MCAST_JOIN_SOURCE_GROUP)"); + ff_log_net_error(h, AV_LOG_ERROR, "setsockopt(MCAST_JOIN_SOURCE_GROUP)"); else - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(MCAST_BLOCK_SOURCE)"); + ff_log_net_error(h, AV_LOG_ERROR, "setsockopt(MCAST_BLOCK_SOURCE)"); return ff_neterrno(); } } @@ -352,7 +355,7 @@ static int udp_socket_create(URLContext *h, struct sockaddr_storage *addr, else udp_fd = ff_socket(res->ai_family, SOCK_DGRAM, 0); if (udp_fd != -1) break; - ff_log_net_error(NULL, AV_LOG_ERROR, "socket"); + ff_log_net_error(h, AV_LOG_ERROR, "socket"); } if (udp_fd < 0) @@ -825,7 +828,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (s->is_multicast) { if (h->flags & AVIO_FLAG_WRITE) { /* output */ - if ((ret = udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr)) < 0) + if ((ret = udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr, h)) < 0) goto fail; } if (h->flags & AVIO_FLAG_READ) { @@ -838,7 +841,8 @@ static int udp_open(URLContext *h, const char *uri, int flags) s->filters.nb_include_addrs, 1)) < 0) goto fail; } else { - if ((ret = udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage)) < 0) + if ((ret = udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr, + (struct sockaddr *)&s->local_addr_storage, h)) < 0) goto fail; } if (s->filters.nb_exclude_addrs) { @@ -1083,7 +1087,8 @@ static int udp_close(URLContext *h) #endif if (s->is_multicast && (h->flags & AVIO_FLAG_READ)) - udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage); + udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr, + (struct sockaddr *)&s->local_addr_storage, h); #if HAVE_PTHREAD_CANCEL if (s->thread_started) { int ret;