From patchwork Tue Feb 28 10:16:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jackarain X-Patchwork-Id: 40536 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1370540pzb; Tue, 28 Feb 2023 02:17:11 -0800 (PST) X-Google-Smtp-Source: AK7set+7Hl0Ig1ZM2LuNdCFHVJ7Fks5AVIprLUbfsi64dNzhfZwSyzFMSfjuxS8AZCDcangV1V7w X-Received: by 2002:a17:906:5796:b0:8b1:2d0e:281 with SMTP id k22-20020a170906579600b008b12d0e0281mr2103854ejq.18.1677579431634; Tue, 28 Feb 2023 02:17:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677579431; cv=none; d=google.com; s=arc-20160816; b=Sxo7M9Cg2Zg9F4TQYGgLrDQGEQvpgQsf/DGKPt+ebme66rPJTCXr6bpteKsPhC/kcc koJ7wLAUrXcy0FGpmPr7/0yiiVC8yBRr5cidAlAPEDurxJvAI5WJr43z2rxIfMgeNZmW B6f4ORkJ7tuV13/4ZKWA0dyZazzgA/kEesvV3JxWRvYpxjK8MatIYD9yRN6/Ei0qQkcr TalkWVHKlb1WHNnp6RG3SFfZYYsXrbGhX2wAVzDC2uEmangwHDiGHds3Py5N4m2LII6B GG141GKRg93nbxq3ObW2NjRCwu/CjkGdbu30UGqFqXOBayAx/4MTCIdsNMZvfZpL+9mr uVaw== 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=uyq6P79a1thhgOZitCt55/MSzSZaKGFpfNqmyo+Fors=; b=IWPyhPHirPNl6HKq+2XEVdKKisOVPLGcQgCazQXEfB1Aad+gKVDFEosiD+1lO/PKbX fjoghqamkVjFl5GoBky13SSD/qNCzDjBk1ru8i/cEtThcs3YBrLEn7JOn5yoyuy6f+aN pCzHQMgFqJeSWlCubtr0sZJHuxMly0tUmrFdupLdylytBcrxPaH8xT1xn2zl5do2z3a9 q5vZnZFxEErsYsXAL11JALQJhQroF+FQWQoLRyo4PcKxGnlkhx9OYhKUTikfhFipXptH VYmHI7qQ3knvWyDecevAQrzkeZR1SZxExFPzC+fEvf1tGz/44T7hWN7yjxpT/3FdaNEs p3hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iOHEjdbB; 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 d13-20020a170906c20d00b008bc4db74272si3116862ejz.471.2023.02.28.02.17.03; Tue, 28 Feb 2023 02:17:11 -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=iOHEjdbB; 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 A46D768A62A; Tue, 28 Feb 2023 12:16:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CBAA68A571 for ; Tue, 28 Feb 2023 12:16:52 +0200 (EET) Received: by mail-pj1-f51.google.com with SMTP id y2so9251601pjg.3 for ; Tue, 28 Feb 2023 02:16:52 -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=Rgl1xNWzRyo7JtI559yTjYdAywzz4vgyvoAiFxvFJOc=; b=iOHEjdbBEJetCGWwPjaxdwrpSFDVKLI1U0Pj7ELIJ4iugsfombKwVKZLYD5bOpwB4v iOjK0n/e4hpocJ2zVK1ES1Vhn1Qz2DoEUAIcA2vwqdqMQ9/tm63/Li2kHx2mV/5b9/rj 3TqxS4q6Op68JiR2hjQg1A9Bl+VldHZDuMMDQAZAOVNlEq1oF015hCmI6VrzcxvD3ks5 79ookX/7DHQuSGIF9sZiDyhAjbws+8O+7VAySqHSsAikt/MROckILmff2vuc4meqnD5r L5RKTK6VLmASo8vluK2SyAqrjDOFcSdi5C/jlWGhtem8lWnmT+fqNgxvIx8nByD6yyhg +nNw== 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=Rgl1xNWzRyo7JtI559yTjYdAywzz4vgyvoAiFxvFJOc=; b=w4bLqS5/Ewc0eA3WEjpQwXkAJ48i1CS/40WpXfDvLTMPPZl1p7wihJX456gS9rFaHU s1NZio+zG0sApKIa95GraiCb6Coj5wwQLkQD+54zhw8pXA5CSBTSgRb5aKxt1P0rwYMC Ihc51NfOc8QDQtrY0ARigfEx1xoBNCaR7CYlwtzUEH1NE1CgwnhOKBuptm29i/jLdEyo jk1Rq2o17+zDZXdC67mkoi/ebNl4CEnLEto09IA/XCPJUQcjfby+1P10CZSBAyBUs/NJ ASrGJ0Pagw65c3uIFQKODYBaTuze9R8mpRIOEghLHceqZzBNYIAxjbysFpdezY5Grfv5 lc9Q== X-Gm-Message-State: AO0yUKUV7sue4oznROzg+w2Zmu3EaMPLPp8DjuEOvbE9wJLva90ADFaO uyqLoOiqHsDgLeO8GHDd9w3oPTV7y/C11tes X-Received: by 2002:a05:6a20:6982:b0:cc:4db0:f2c7 with SMTP id t2-20020a056a20698200b000cc4db0f2c7mr3675652pzk.23.1677579410220; Tue, 28 Feb 2023 02:16:50 -0800 (PST) Received: from localhost.localdomain ([2409:8a28:5083:e220::51b]) by smtp.gmail.com with ESMTPSA id b29-20020a63931d000000b004facf728b19sm3114893pge.4.2023.02.28.02.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 02:16:49 -0800 (PST) From: jack To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Feb 2023 18:16:40 +0800 Message-Id: <20230228101640.3337990-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: jack Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OMJZ2l4fyT/f Signed-off-by: jack --- libavformat/tcp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index a11ccbb913..598d61067e 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -36,6 +36,8 @@ typedef struct TCPContext { const AVClass *class; int fd; int listen; + int 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_INT, { .i64 = -1 }, -1, INT_MAX, .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 }, @@ -73,6 +77,39 @@ static const AVClass tcp_class = { static void customize_fd(void *ctx, int fd) { TCPContext *s = ctx; + + if (s->local_addr) { + struct addrinfo hints = { 0 }, *ai; + int ret; + int port = 0; + + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + + if (s->local_port > 0) + port = s->local_port; + + ret = getaddrinfo(s->local_addr, "0", &hints, &ai); + if (ret) { + av_log(ctx, AV_LOG_WARNING, + "Failed to bind local addr: %s port: %d err: %s\n", + s->local_addr, s->local_port, gai_strerror(ret)); + } else { + if (ai->ai_family == AF_INET6) { + struct sockaddr_in6 * sockaddr_v6 = (struct sockaddr_in6 *)ai->ai_addr; + sockaddr_v6->sin6_port = htons(port); + } else { + struct sockaddr_in * sockaddr = (struct sockaddr_in *)ai->ai_addr; + sockaddr->sin_port = htons(port); + } + ret = bind(fd, (struct sockaddr *)ai->ai_addr, (int)ai->ai_addrlen); + if (ret) { + av_log(ctx, AV_LOG_WARNING, + "Failed to bind local addr: %s port: %d err: %s\n", + s->local_addr, s->local_port, gai_strerror(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) { @@ -129,6 +166,13 @@ 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)) { + s->local_port = strtol(buf, NULL, 10); + } + 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); }