From patchwork Sun Aug 5 13:14:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9898 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp2241559jad; Sun, 5 Aug 2018 06:39:43 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf9ugl/EAu+mnXXRzc+zy+vWsf3VALxmi7izPnRBOQBhIiGocdrFGConnyu1JKEpUWUiLht X-Received: by 2002:adf:b583:: with SMTP id c3-v6mr7381821wre.79.1533476383398; Sun, 05 Aug 2018 06:39:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533476383; cv=none; d=google.com; s=arc-20160816; b=Wo0pAEenVaPeMhLH8NamqxFvYlpkYbA67rtWRBs72OXKdQXsQtLtt+d+ZSdPAB5eNX tqD8NP1/p9XdLLPOT9QnTbvXyqzht2OobfFysdN1Liw79X2u+JETioaTJF0ByKxNZDry KAZZC1TABEEmhc1vXttyMsb85RrDefz72CuMuIr2ubSKahbjZzAvRZ8t2hnPuBZ5y83l DPeqMSTYaTftaQ0oiFg5EHwdSIYNrNingKZ83f94V1XtpRdeFs2hvZXZg059tpE8ip/U 377Vc+S8tKKyH7Kx3EHTj98a5Y1fRfxlr0IGbuguWwPzILge3+m/Q5Tpl8Uh0fywM7eV tZ+A== 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=DCOxPYycDxGCoMDAi/88HW74Y6yY4FIiSd/OyC31DpY=; b=iHfwz7JLApkGO+ZGa9ZAb7RT46dEd/ilOfJ6i++O0hqGBfd8bUEKQq/UaCWmk3wgta T8j9pfEyt9qKY+O+8gyDeqvsAmvDhmiIRjA21ciPZ8F4mb3zfEUllQwaOUNYiN7HHdNX 30Kn7RdypBZJOvLytm1LyIKmiA1hh40HCRv3NKsHIj3WZRxzJbLvs2igq5GKu9LRvJRC Quq6cVR6dSx8jrnGd+wvUxFgGZFyD9KcV+2OfuQjKv+2EBkqoRVwLmZmrt4daUz01XhB ZLuMA4efEeU83/5+ue4Ae+8ubXObrCsY28fxahjwqKrOaNPrK/qFKn0L8yI9QFCs1/jk Ddmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=kWWOVXoA; 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 u95-v6si8385661wrc.360.2018.08.05.06.39.42; Sun, 05 Aug 2018 06:39:43 -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=kWWOVXoA; 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 A6E2D68A353; Sun, 5 Aug 2018 16:39:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A822689B1E for ; Sun, 5 Aug 2018 16:39:14 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id k3-v6so4982545pgq.5 for ; Sun, 05 Aug 2018 06:39:33 -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=0aipJ1/73jtlhYjd4gYV2mzVHNZdqxfSaxXfRHzC0B0=; b=kWWOVXoAyL2jQ5hN8PdlYniJs24gHHuYCS0fsS5v5b1QEXKorG8hQLAVB0hCaeseQC TdqP/Pn9Pj6ZDVMIywkZwR2f0qVaKX+KFUN12EX1nyk+OLmoskaMJp4ADarOCms5qYci slqApH2mSrAKjlNmbGxPq4ZCKX3NGpl7hfRYwWkvDgnC0Ny7uDEHgp04qjpF1Lq6pKTf 1qNioNwYynvRhrM7D4P8EKsTv/5K8H/THxO6hhHeJ2XaojNnKnsC8UEU3Gg+s49AeMHo FMgJFaJcQ/tZ9u0edV7XcUuEd4zJ7rIYg2SoQ8hD/LiYFLT5+n6W7hY3Xl/j4ETGKN8+ pu+Q== 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=0aipJ1/73jtlhYjd4gYV2mzVHNZdqxfSaxXfRHzC0B0=; b=RDSuQLGoetTSkoxF9BDyS5/+tOEACytr7Zb5j/DCBHv3S3fLpJdtPXyw73pyDEpweT 7+9tTbA7vW9ph1Lp5S4i7Gc4Nmih1FMG4Ew25HRfsXc2MmF6m+lhM6Qxd6rVAXsiZ583 3LFzJ0gKOSqFNb08gKgBZoal9GqiaJJeuUg+ysN2qwRdbe06UXsfePDUn01LwQEzFIJ1 tCrP6OyzrdICGgh+khXA0GpTeLxzRqa8DlkWw2G+9QHBRUi2HSDAxSuqLVTSSdbqOPci x51XeAlXpn0ZRN9GEWqAw3LeidzVBQdFicqxNSAs857NBat38G8gdffO/w+i02oo2D2q QHRQ== X-Gm-Message-State: AOUpUlFZbaLE1rOp65AAB2xQTDoxibQxk5NvBllfyTrMEEA5il3T8kNt 6bmrANbbA8wNhZZo3RTeAnG8XX2b X-Received: by 2002:a63:c312:: with SMTP id c18-v6mr10915944pgd.449.1533474892334; Sun, 05 Aug 2018 06:14:52 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Aug 2018 06:14:51 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Aug 2018 21:14:33 +0800 Message-Id: <1533474873-10436-5-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 4/4] lavf/udp: use ff_log_net_error to replace log_net_error 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" Signed-off-by: Jun Zhao --- libavformat/udp.c | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 0dde035..bbdeda0 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -150,20 +150,13 @@ static const AVClass udplite_context_class = { .version = LIBAVUTIL_VERSION_INT, }; -static void log_net_error(void *ctx, int level, const char* prefix) -{ - char errbuf[100]; - av_strerror(ff_neterrno(), errbuf, sizeof(errbuf)); - av_log(ctx, level, "%s: %s\n", prefix, errbuf); -} - static int udp_set_multicast_ttl(int sockfd, int mcastTTL, struct sockaddr *addr) { #ifdef IP_MULTICAST_TTL if (addr->sa_family == AF_INET) { if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) { - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)"); return -1; } } @@ -171,7 +164,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) { - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS)"); return -1; } } @@ -191,7 +184,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) { - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_MEMBERSHIP)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_MEMBERSHIP)"); return -1; } } @@ -203,7 +196,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr,struct soc memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr)); mreq6.ipv6mr_interface= 0; if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_ADD_MEMBERSHIP)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_ADD_MEMBERSHIP)"); return -1; } } @@ -223,7 +216,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) { - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_DROP_MEMBERSHIP)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_DROP_MEMBERSHIP)"); return -1; } } @@ -235,7 +228,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr,struct so memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr)); mreq6.ipv6mr_interface= 0; if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) { - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_DROP_MEMBERSHIP)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_DROP_MEMBERSHIP)"); return -1; } } @@ -300,9 +293,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) - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(MCAST_JOIN_SOURCE_GROUP)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(MCAST_JOIN_SOURCE_GROUP)"); else - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(MCAST_BLOCK_SOURCE)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(MCAST_BLOCK_SOURCE)"); return ff_neterrno(); } } @@ -336,9 +329,9 @@ static int udp_set_multicast_sources(URLContext *h, include ? IP_ADD_SOURCE_MEMBERSHIP : IP_BLOCK_SOURCE, (const void *)&mreqs, sizeof(mreqs)) < 0) { if (include) - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_SOURCE_MEMBERSHIP)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_SOURCE_MEMBERSHIP)"); else - log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_BLOCK_SOURCE)"); + ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_BLOCK_SOURCE)"); return ff_neterrno(); } } @@ -384,7 +377,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; - log_net_error(NULL, AV_LOG_ERROR, "socket"); + ff_log_net_error(NULL, AV_LOG_ERROR, "socket"); } if (udp_fd < 0) @@ -459,7 +452,7 @@ int ff_udp_set_remote_url(URLContext *h, const char *uri) if (connect(s->udp_fd, (struct sockaddr *) &s->dest_addr, s->dest_addr_len)) { s->is_connected = 0; - log_net_error(h, AV_LOG_ERROR, "connect"); + ff_log_net_error(h, AV_LOG_ERROR, "connect"); return AVERROR(EIO); } } @@ -866,7 +859,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) * bind failed */ /* the bind is needed to give a port to the socket now */ if (bind_ret < 0 && bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0) { - log_net_error(h, AV_LOG_ERROR, "bind failed"); + ff_log_net_error(h, AV_LOG_ERROR, "bind failed"); goto fail; } @@ -912,18 +905,18 @@ static int udp_open(URLContext *h, const char *uri, int flags) /* limit the tx buf size to limit latency */ tmp = s->buffer_size; if (setsockopt(udp_fd, SOL_SOCKET, SO_SNDBUF, &tmp, sizeof(tmp)) < 0) { - log_net_error(h, AV_LOG_ERROR, "setsockopt(SO_SNDBUF)"); + ff_log_net_error(h, AV_LOG_ERROR, "setsockopt(SO_SNDBUF)"); goto fail; } } else { /* set udp recv buffer size to the requested value (default 64K) */ tmp = s->buffer_size; if (setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)) < 0) { - log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_RECVBUF)"); + ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_RECVBUF)"); } len = sizeof(tmp); if (getsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, &len) < 0) { - log_net_error(h, AV_LOG_WARNING, "getsockopt(SO_RCVBUF)"); + ff_log_net_error(h, AV_LOG_WARNING, "getsockopt(SO_RCVBUF)"); } else { av_log(h, AV_LOG_DEBUG, "end receive buffer size reported is %d\n", tmp); if(tmp < s->buffer_size) @@ -935,7 +928,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) } if (s->is_connected) { if (connect(udp_fd, (struct sockaddr *) &s->dest_addr, s->dest_addr_len)) { - log_net_error(h, AV_LOG_ERROR, "connect"); + ff_log_net_error(h, AV_LOG_ERROR, "connect"); goto fail; } }