From patchwork Fri Mar 3 09:49:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jackarain X-Patchwork-Id: 40571 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp579164pzb; Fri, 3 Mar 2023 01:49:47 -0800 (PST) X-Google-Smtp-Source: AK7set/65KPCBi7SRleKdBFQRQTiv2i1XCuyu36NNyiycm1tSM0EQr3WvzI9bz3mEhMYxRsuQgh1 X-Received: by 2002:a17:906:207:b0:8f3:8bfd:a8e with SMTP id 7-20020a170906020700b008f38bfd0a8emr998122ejd.26.1677836987020; Fri, 03 Mar 2023 01:49:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677836987; cv=none; d=google.com; s=arc-20160816; b=p1QygPlIhz1JK8kJppxyj8qrAk6VNDGF73CNEdtH6UPk2QiHGeH2dwfawGxS0kkJ3h ukNDcp7b68HglIqTkIm6i1mumS5avOJcGWmxC7DO5zxPG7LlKhYa0HEaV+ZBW4h2ig08 iTH1DbD6D16GPMV2JltwuAZgU/rLx9YzxpuqeBArY5F1Ih9wVz3KBoJ1Lqk9K4i0myGx 4iWcne018RAZzymKM4Qr9mKmoEMPI8kJ6e+JNSDS35NqbbM2FxWTD4fViz+bincxoYtp DxiR9aTmNA3tOO3pQ/qmm8qGLOKZ0v9J0TNeGnVtlVDVNBGeHrBoMdQHyOu8QNZPMPZ9 VPFA== 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=12HlJCv/da02FWLALEbpmUT5cR0uQChs88hguLjsgbU=; b=ohSmK73oqZTQoKfDOS5cCb5N/y2tvulo701UvJ/d+7S8RRtUdO/fK+bIoL5ZKtHMWi QALKdhPyee66ErHSUhao16xoyI9rMHk0XEEmmTtWVkQclqzlq+LtZUOt/HV+xNlwn7gt XkMyr5W0f/5J4/FXSkk08CEGoMHpFWxTKxA/X6d7K6eVVZni9MIm6Zw7GdrtPL3f0Obl qQEkbSF7nDXjhvQwXU08sKG0Bc1vEA/caZqj9w0/EU9NZckqpHboxfcSCTMZjb8CAkKg JpoeGzTeISzFMoGFUnHFvH5pOiF0d5X/23oPcbls/+FjkShWXr3WZrUem0qTb1YDse60 cy6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="foMK8in/"; 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 cw22-20020a170906479600b008ccc0fd3d13si183933ejc.348.2023.03.03.01.49.46; Fri, 03 Mar 2023 01:49:47 -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="foMK8in/"; 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 F09B868BA08; Fri, 3 Mar 2023 11:49:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5FF16809C7 for ; Fri, 3 Mar 2023 11:49:36 +0200 (EET) Received: by mail-pj1-f47.google.com with SMTP id x34so1990435pjj.0 for ; Fri, 03 Mar 2023 01:49:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677836974; 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=P+vT75WqXczbPCG1C/3BdOVxHYD2P7KHpwphAS32LnY=; b=foMK8in/WWgt26UFOzvmKB+oNN7EEgxj3OJzpfOazp0QmCQXOSqPB+aN2AoiIefJyx 1h+Rkr7zsCBROd5wFn+LuV+D4gwF1dioLjgLqhLQWjBfLFa3YBqrmtAhCAONyYtn5m3R t10Ks4BtG8iUDD0d+NmmlVqJQXuPsgS4ID/Ip2BFhySU2msseZLr3+UIHTONM7Ifj8rM qBrP8MOjKEnbOlBnd0HMOjXPgBqxNMzoHQKbpV7lVrv4mFCxJyjFx1SPcpGZeTM5Xuad gEdURfdAdQH5Hxnin7lt4miKFNHQ0hp7cIWVRw/C5/xbqxhsrlROlz9FbBraXfcf2zYY igKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677836974; 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=P+vT75WqXczbPCG1C/3BdOVxHYD2P7KHpwphAS32LnY=; b=Gj58+nVxvE4l53gZ9zq/BLeCT6VK6iQetp9XYwe9NlQ1cwuDxUFDtJyavlddvjJ7TT YzI2HwzMFZXEmdsKyyOhYBln1C+8OBJDByRnwyfUFr1Vc0QzgTKF7XpsPVB771/URh2Q 0zqGDrI2zM+FZeTeAi7HDGm77G/+GfKpEOfs+tof2Qb7XM9JNkRczs0hkMkrrgAdr7xl xzGqxbeGgogUnpsRK36yqhMqZhX0Khvx6LZFRvIf9eGyhfe/NpSR6O0Fmr4oil/h5Sl4 4055LWltbw/txdpulvT94YllmAG3FggsxOT+VcpOp+aFnK4NhMEw27dVD+/kRS2YvR3e sxOg== X-Gm-Message-State: AO0yUKUtykoBzfOH8Ii7CfQgczoTLBAILJuAT4WUsatTN2m5WAEfme/7 O/Lz0cPdQqY482VzGVQU50FhinRQFsbqoTyBAys= X-Received: by 2002:a05:6a20:4a25:b0:cc:49cc:c79d with SMTP id fr37-20020a056a204a2500b000cc49ccc79dmr1473794pzb.33.1677836974596; Fri, 03 Mar 2023 01:49:34 -0800 (PST) Received: from localhost.localdomain ([2409:8a28:5083:e220::51b]) by smtp.gmail.com with ESMTPSA id l23-20020a62be17000000b005ae02dc6285sm1146156pff.203.2023.03.03.01.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 01:49:34 -0800 (PST) From: jackarain To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Mar 2023 17:49:26 +0800 Message-Id: <20230303094926.715895-1-jack.wgm@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: george@nsup.org, jackarain , remi@remlab.net, anton@khirnov.net Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /lrfSzwLAytq Signed-off-by: jackarain --- doc/protocols.texi | 6 +++++ libavformat/network.c | 14 ++++++++---- libavformat/network.h | 2 +- libavformat/tcp.c | 53 +++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 68 insertions(+), 7 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..f752efc411 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, 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, ai->ai_family); + 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, int), void *customize_ctx) { struct ConnectionAttempt attempts[3]; struct pollfd pfd[3]; diff --git a/libavformat/network.h b/libavformat/network.h index 71c49a73fb..ca214087fc 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, int), void *customize_ctx); #endif /* AVFORMAT_NETWORK_H */ diff --git a/libavformat/tcp.c b/libavformat/tcp.c index a11ccbb913..a889633457 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,40 @@ 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, int family) { TCPContext *s = ctx; + + if (s->local_addr || s->local_port) { + struct addrinfo hints = { 0 }, *ai, *cur_ai; + int ret; + + hints.ai_family = family; + 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; + } + + 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) { + ff_log_net_error(ctx, AV_LOG_ERROR, "bind local failed"); + 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 +132,8 @@ static void customize_fd(void *ctx, int fd) } } #endif /* !HAVE_WINSOCK2_H */ + + return 0; } /* return non zero if error */ @@ -129,6 +166,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); } @@ -183,7 +232,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags) } if (fd < 0) goto fail1; - customize_fd(s, fd); + customize_fd(s, fd, cur_ai->ai_family); } if (s->listen == 2) {