From patchwork Wed Mar 1 15:07:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jackarain X-Patchwork-Id: 40560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp3516166pzb; Wed, 1 Mar 2023 07:08:24 -0800 (PST) X-Google-Smtp-Source: AK7set+BtCdSBsqEzGs0oLfUnEHuTfs/HA34rfMlgwXvM7Whuz6yBVgFtaKWiIF05w4NXNq/TehF X-Received: by 2002:a17:906:4785:b0:895:58be:957 with SMTP id cw5-20020a170906478500b0089558be0957mr9293433ejc.2.1677683304250; Wed, 01 Mar 2023 07:08:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683304; cv=none; d=google.com; s=arc-20160816; b=qLAPq5b8sKCLhapL4yVQENEzwlXVWNSaSPMXpotCdI4wWNOPZ+5xt1y0eR1xAbQxON AnzObdHcrmYSKhuernLS20oyAfJmHeY7FZqxxVyjuCRKeDMReLJIBe+Cjsp9w1erKt4i 2OC3R//B94eJNTjv4aRGlrlOjs308Otwq+B2aa9fQxRQ5elyPJhAD5tVpbwgAXQdVtOv AdBNa1flxLe0arHidClI00kv8+rLg6kIQnlj5/WiHrOa1pzplP3JVfOSTuv9IWaqtbaq C0sI/Lzb3RsdoLQbJzHpDweDLSZqqQVTaL3hVxjH/+DbfjEGkryE54ANg3/0ak8YO4wn 9Smg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=XNbda9ykAKN7Ux7DOa8J8izrvl+wG6oMEpQUCBSIkDo=; b=IjmIz05Rfp1nyHa9+jfyPhTGVij6qMoPM8nC1e1prLmXaMzGbqaKJTqd4MbWzYYocu /zIXPF3T/LKvO5YSOqB8FrDpi4DObEVLXd+57W6zwtL7lKD0TixlTVwJCQKQYentZEFK 4cPjQGiYye/7hshpBSR4Z94i/xzoGsmU/hhgqfgkc39da/rF+Pu7vvTFklfvXXzP9aoT yGyVuBfCerLfpyIk4VtVpdaWbg9RU19uJp+reOIEvd4hOxYA6h2KjMSFQQJ3bnyFlCkf PhsBHx22o4AFG1gIfO2D9/6ko0OUEhqmsaMS0+XDqq+YejroRqU9Temf++3KkuEbOC2D 899Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iqGK+wmT; 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 jy18-20020a170907763200b008ce81ce3521si14134087ejc.334.2023.03.01.07.08.23; Wed, 01 Mar 2023 07:08:24 -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=iqGK+wmT; 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 C5BF668AE09; Wed, 1 Mar 2023 17:08:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CDFA68AD2E for ; Wed, 1 Mar 2023 17:08:12 +0200 (EET) Received: by mail-pl1-f171.google.com with SMTP id a2so3860312plm.4 for ; Wed, 01 Mar 2023 07:08:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=97U9nQi9loBLddkHByAtwmq/+kZoIdJkmRB9uzoG4Sc=; b=iqGK+wmTkDtEASMXvhub5f0Fifh5nLSmnyMsfOGCGFfb7kXkKLGfRjmB+XmkgkWuez hY0yrU8FPfNuWeNr5zoe3RRDreUr+lC1aQoIzh7XGLfo1NTGGRfCk1JNMZ+s44isen9E u59krvCNJ7wCYsDiXpum/TbTTat6mX6GCr7iP6AMj0t5QF7R6q+0unKeBgx4JaeaoAMZ DN+KPfZXL+Xgi0ux928vEcM/bCOdVBLBp1f7NDOpcAVDeqA3h9xxDniq7idQiCbJmW+B ByzDISflFF0dR7YXxRZSj8V32AAESAkbKpXGxKF2lFDJizWJX3Ig3CcMZgGMzoDCfzFz vG8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=97U9nQi9loBLddkHByAtwmq/+kZoIdJkmRB9uzoG4Sc=; b=43sbTybQbd3jGl0BqUa8Di+C3mmtbnF82epNGVH+/ztuix04MZ1dKK+mDXvtirut+Y UTIdNom3qIDbdteQiiZUdJ++tK4DtpsXFEMtkXRCOMIGEFNTjHoi0gI2q3zO0typTEAJ KbmHv2K6+0Z0ZjAzk+lRU8FDAXxAFUp7bFI8txqm3DQJvs4H0txSJmHiD5PeBvD7ovTd 3mN2RblHKkax/VVuhyGqGMrEVoHqupgT5OHpFcZnTJyFs0psbMDEpeX+CPpchLPLU16t jtO6dioKs3tN0aMzHKrOlO4DV6aHpaGod21HT4JyYs0DQgmW59xUx6ZAs0cAwd9h/3SX GD5w== X-Gm-Message-State: AO0yUKVKy6gk+OMdf2AG1H8KATRlJpEwHpbxkPHQ7TzOgewj9Rba0xg8 T4q+9NhVV9c0hs3jXh8Bcc0sY2ZJNeA6Xpun X-Received: by 2002:a17:903:41cf:b0:19a:9833:6f8 with SMTP id u15-20020a17090341cf00b0019a983306f8mr7263551ple.35.1677683290356; Wed, 01 Mar 2023 07:08:10 -0800 (PST) Received: from localhost.localdomain ([2409:8a28:5083:e220::51b]) by smtp.gmail.com with ESMTPSA id l6-20020a170902d34600b0019cb8ffd209sm8614067plk.229.2023.03.01.07.08.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:08:09 -0800 (PST) From: jackarain To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Mar 2023 23:07:57 +0800 Message-Id: <20230301150757.3309799-1-jack.wgm@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <167768189345.10789.7225800970665443962@lain.khirnov.net> References: <167768189345.10789.7225800970665443962@lain.khirnov.net> 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: 1/IWsKnm6Fr2 Signed-off-by: jackarain --- doc/protocols.texi | 6 +++++ libavformat/network.c | 14 ++++++++---- libavformat/network.h | 2 +- libavformat/tcp.c | 53 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 69 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..1987861353 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,42 @@ 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: %s err: %s\n", + s->local_addr, s->local_port, gai_strerror(ret)); + return ret; + } + + 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; + } + freeaddrinfo(ai); + + if (ret) { + av_log(ctx, AV_LOG_ERROR, + "Failed to bind local addr: %s port: %s 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 +134,8 @@ static void customize_fd(void *ctx, int fd) } } #endif /* !HAVE_WINSOCK2_H */ + + return 0; } /* return non zero if error */ @@ -129,6 +168,18 @@ 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_strdup(buf); + if (!s->local_addr) + return AVERROR(ENOMEM); + } + if (av_find_info_tag(buf, sizeof(buf), "local_addr", p)) { + av_freep(&s->local_addr); + s->local_addr = av_strdup(buf); + if (!s->local_addr) + return AVERROR(ENOMEM); + } if (av_find_info_tag(buf, sizeof(buf), "timeout", p)) { s->rw_timeout = strtol(buf, NULL, 10); }