From patchwork Tue Feb 28 14:24:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jackarain X-Patchwork-Id: 40552 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1759107pzb; Tue, 28 Feb 2023 06:24:59 -0800 (PST) X-Google-Smtp-Source: AK7set/VCaqAeCR7z36aBmDZDZTBFO0olljz0dwrFvATE3wUMfiJeuA5+G7qHCXBZyi30iIiWeFE X-Received: by 2002:a17:906:1442:b0:8b1:7e1e:7756 with SMTP id q2-20020a170906144200b008b17e1e7756mr2552825ejc.73.1677594299246; Tue, 28 Feb 2023 06:24:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677594299; cv=none; d=google.com; s=arc-20160816; b=PVT0PtFOjjWmeo3NE1SnpxTOcADz5p/o8yzmADMmD4joGs+VWuQSN3iiIPKuHGAM4P P+APwVy5fkNl0B52/DE48UmcltcXoMtGkf9ZVt7CDSVtL5H0q/+aPeniKIqyjqatPGjr H/3sF9s3Db0wHt+1P0RrNEayKv2OI04dbZNWJt1nEPnLKYrdakTLuQ0GTPEMNikURpcE ssfeyQJvDasc9tVxopUYwSOsMuZLC6T1IAiTwc1AZwVu4+WLVR4Kbd+xR6rWXw34px+J I/m4yMNjOpSeIvQbyU9iA99wDe0E1VyRwTUAqk4m0vgtqJzr4JOFhtzrB8ujhdVK4c90 PNEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=SxU9HgL7k3r7pwvou9jsmiqX10mLlgo74C8O+kpf7UA=; b=CRH96GAUO3JVOIeMPgcdJGwvwE4XZFX3FccTLJuNvH1OySUCoqPih5/Xw/H/P/DC9L lH8kzW40H5cYXEotDN7yTZNh2au/dFNjWRrbAE5YQEn++sh3QHm0mmQjROv5icr02XX5 mo8kg1An3Xd/cnKL6V8zj+CaQlZANiKpHnjlLILtXGSUil5b+tbQsJ3h/K9M5lnquk7+ YD8c+NGPLw1ECFWoy4pPxrsCyZl5Wg7D7r7Swdcmht29QByZzfeT69xV/+O1g2xpZpcz Yd4usrWReo1oW3tnM+8OO2ufzV5L8uErXx55xIlAoS+/LUgc7gP/1DTuCcm1l6o/Wbgo POtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=h6xC4xFl; 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 k7-20020a1709063e0700b008d5ea58668asi687342eji.212.2023.02.28.06.24.58; Tue, 28 Feb 2023 06:24:59 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=h6xC4xFl; 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 C5F3E68A870; Tue, 28 Feb 2023 16:24:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EFEC689E46 for ; Tue, 28 Feb 2023 16:24:49 +0200 (EET) Received: by mail-pj1-f42.google.com with SMTP id k21-20020a17090aaa1500b002376652e160so9826436pjq.0 for ; Tue, 28 Feb 2023 06:24:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=qyPOIPZekCzmfVRJj+O5WlHe7A2mRhSG3Q6jxxPmiH8=; b=h6xC4xFlGwJU3t0jqCwIxyWhgdi0e6llaTo0s1Ug2mb/DdRhu/K1Opq7dkqz9q/wWq Eq3ciDRkNgSX6cCo4eurkDcnfa8NF5phxFg/gig/nFNdXEUM5JMWyNFNT0MZcATGCQOk aNCPcnqdTfYu19g3ozMKPtrJWFGg/GnYFNMAdH26DuwBVY60bP+Nd2PT3fwBRJ7TR9Lu AF7fyiPrNZrMlAd8Rx3NO48uyeKS0JT3reYRPscUmXHIimnB4b52xTGzIWRStCF+5H4G tvYQBXaM/TbS9R5XW/4bzBNU1uRsxj+eCtVAqlouIjrdc++7Fh0RPycn07gwuBdMfJRl EX2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qyPOIPZekCzmfVRJj+O5WlHe7A2mRhSG3Q6jxxPmiH8=; b=4OBonitq3yWLm6QlmSxj171kvrZ5VM1KK8u2uE1t32Yp/1SmEgtuqG4IzVWBCoUcBO eZa9cAjV1OgsLoAV9jSk8MCOqmUaIR5NOcY5uIWBmSeVIw24GenirAbAQLeyoFaPmCt1 BWJyYnbfgg1CnqKgvYK8jiUiCceiVcmJa5BS32+gAHsbG8jUTv9IVl5d4dYrXZ5KI/Nk BnUYEmLlMWvL169bX6elDbgIIrP7T0uS3WiJK8zZr9otMQJSC042M/XiENo8dFRYHz83 ghL2zwfuVLw1E2G2CicgF7i/3rIMqQ482lp84EBWtCn2yg4C8g4gXbaAbZ7vs6VfIzup CAtw== X-Gm-Message-State: AO0yUKVBrcZdba6ak5YquIUQw7YhBrm742cm6oDR57tqmQZ7UypGOWgf XA7gp4a9Hxk5/MJUmddEoGetPVlNPESJfc27 X-Received: by 2002:a17:903:22c5:b0:199:12d5:5b97 with SMTP id y5-20020a17090322c500b0019912d55b97mr14268405plg.12.1677594286822; Tue, 28 Feb 2023 06:24:46 -0800 (PST) Received: from localhost.localdomain ([2409:8a28:5083:e220::51b]) by smtp.gmail.com with ESMTPSA id y1-20020a1709029b8100b00185402cfedesm1895116plp.246.2023.02.28.06.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 06:24:46 -0800 (PST) From: jackarain To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Feb 2023 22:24:29 +0800 Message-Id: <20230228142429.3963189-1-jack.wgm@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/tcp: add local_addr/local_port for network option 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 Cc: jackarain Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FEeozmS2llKW Signed-off-by: jackarain --- doc/protocols.texi | 6 ++++++ libavformat/network.c | 14 +++++++++---- libavformat/network.h | 2 +- libavformat/tcp.c | 48 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 64 insertions(+), 6 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index 21ae6181a0..b3fad55591 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1882,6 +1882,12 @@ The list of supported options follows. Listen for an incoming connection. 0 disables listen, 1 enables listen in single client mode, 2 enables listen in multi-client mode. Default value is 0. +@item local_addr=@var{addr} +Local IP address of a network interface used for tcp socket connect. + +@item local_port=@var{port} +Local port used for tcp socket connect. + @item timeout=@var{microseconds} Set raise error timeout, expressed in microseconds. diff --git a/libavformat/network.c b/libavformat/network.c index 21e20b3e9a..de8b14be82 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -356,7 +356,7 @@ struct ConnectionAttempt { static int start_connect_attempt(struct ConnectionAttempt *attempt, struct addrinfo **ptr, int timeout_ms, URLContext *h, - void (*customize_fd)(void *, int), void *customize_ctx) + int (*customize_fd)(void *, int), void *customize_ctx) { struct addrinfo *ai = *ptr; int ret; @@ -371,8 +371,14 @@ static int start_connect_attempt(struct ConnectionAttempt *attempt, ff_socket_nonblock(attempt->fd, 1); - if (customize_fd) - customize_fd(customize_ctx, attempt->fd); + if (customize_fd) { + ret = customize_fd(customize_ctx, attempt->fd); + if (ret) { + closesocket(attempt->fd); + attempt->fd = -1; + return ret; + } + } while ((ret = connect(attempt->fd, ai->ai_addr, ai->ai_addrlen))) { ret = ff_neterrno(); @@ -402,7 +408,7 @@ static int start_connect_attempt(struct ConnectionAttempt *attempt, int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address, int parallel, URLContext *h, int *fd, - void (*customize_fd)(void *, int), void *customize_ctx) + int (*customize_fd)(void *, int), void *customize_ctx) { struct ConnectionAttempt attempts[3]; struct pollfd pfd[3]; diff --git a/libavformat/network.h b/libavformat/network.h index 71c49a73fb..8a8cbe672e 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -336,6 +336,6 @@ void ff_log_net_error(void *ctx, int level, const char* prefix); */ int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address, int parallel, URLContext *h, int *fd, - void (*customize_fd)(void *, int), void *customize_ctx); + int (*customize_fd)(void *, int), void *customize_ctx); #endif /* AVFORMAT_NETWORK_H */ diff --git a/libavformat/tcp.c b/libavformat/tcp.c index a11ccbb913..ceb5a10426 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -36,6 +36,8 @@ typedef struct TCPContext { const AVClass *class; int fd; int listen; + char *local_port; + char *local_addr; int open_timeout; int rw_timeout; int listen_timeout; @@ -52,6 +54,8 @@ typedef struct TCPContext { #define E AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { { "listen", "Listen for incoming connections", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, .flags = D|E }, + { "local_port", "Local port", OFFSET(local_port), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, .flags = D|E }, + { "local_addr", "Local address", OFFSET(local_addr), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, .flags = D|E }, { "timeout", "set timeout (in microseconds) of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "listen_timeout", "Connection awaiting timeout (in milliseconds)", OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "send_buffer_size", "Socket send buffer size (in bytes)", OFFSET(send_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, @@ -70,9 +74,41 @@ static const AVClass tcp_class = { .version = LIBAVUTIL_VERSION_INT, }; -static void customize_fd(void *ctx, int fd) +static int customize_fd(void *ctx, int fd) { TCPContext *s = ctx; + + if (s->local_addr || s->local_port) { + struct addrinfo hints = { 0 }, *ai; + int ret; + + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + + ret = getaddrinfo(s->local_addr, s->local_port, &hints, &ai); + if (ret) { + av_log(ctx, AV_LOG_ERROR, + "Failed to getaddrinfo local addr: %s port: %d err: %s\n", + s->local_addr, s->local_port, gai_strerror(ret)); + return ret; + } else { + struct addrinfo *cur_ai = ai; + while (cur_ai) { + ret = bind(fd, (struct sockaddr *)cur_ai->ai_addr, (int)cur_ai->ai_addrlen); + if (ret) + cur_ai = cur_ai->ai_next; + else + break; + } + + if (ret) { + av_log(ctx, AV_LOG_ERROR, + "Failed to bind local addr: %s port: %d err: %s\n", + s->local_addr, s->local_port, gai_strerror(ret)); + return ret; + } + } + } /* 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) { @@ -97,6 +133,8 @@ static void customize_fd(void *ctx, int fd) } } #endif /* !HAVE_WINSOCK2_H */ + + return 0; } /* return non zero if error */ @@ -129,6 +167,14 @@ static int tcp_open(URLContext *h, const char *uri, int flags) if (buf == endptr) s->listen = 1; } + if (av_find_info_tag(buf, sizeof(buf), "local_port", p)) { + av_freep(&s->local_port); + s->local_port = av_strndup(buf, strlen(buf)); + } + if (av_find_info_tag(buf, sizeof(buf), "local_addr", p)) { + av_freep(&s->local_addr); + s->local_addr = av_strndup(buf, strlen(buf)); + } if (av_find_info_tag(buf, sizeof(buf), "timeout", p)) { s->rw_timeout = strtol(buf, NULL, 10); }