From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 5D11C4BFCB for ; Mon, 7 Jul 2025 00:08:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A2BC169138A; Mon, 7 Jul 2025 03:08:19 +0300 (EEST) Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 525A46912F4 for ; Mon, 7 Jul 2025 03:08:13 +0300 (EEST) Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-60c3aafae23so7967200a12.1 for ; Sun, 06 Jul 2025 17:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751846892; x=1752451692; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=efP3nEDxGfENMdcd4HjmrTYUSKrpFot/EQFmYaxZ6k4=; b=QFXQXopnsaLIPNL/2VY4C9uRGx1Y2piq5g1XTkSNZ4XmDvFpRORXx1o+TCDX7G72f9 SlGfNmzGXEwCpbdH9fVFAH55UgD2grkGxsTdw271yRaqa0SWDMfpQtqeJvxmJzVrv05h jsbMoaI/77hU3HKA2jhiRfgv78GDLLrzRbwYa2emhu8UzdZVL6nrYfka1+ZKmxFRVptx r9saI66JegvZ1OkykdY8KfQBEq6XetYR8bX9Ah9VW/c/+ZgUaGJM4akxdsAXjjfrNVwm S1A7nUnuIhUzI27j/wbIgDUc2C+RVUS2V1QJPfGRGG+LtmzoGGMhglp8/nx11rgoHzrr 3mMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751846892; x=1752451692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=efP3nEDxGfENMdcd4HjmrTYUSKrpFot/EQFmYaxZ6k4=; b=slifm4c+woA0C81uCUcNAH9GcsiY31RCtKAHjt48nLZzx0AL6/mLoCN7Bvu7iepwyN GeZZXAfkOb+EO+oP+SJ+s0jgOrRw+l9C/owlE2y7VzhGZf2cCxWzXRhZlpjLAYzZpCtp xbKmm7fAjA8lLbzjvhUkn0V4aZLCwNbFOAFbly32xkgxpcZwOhPATrFTIA304m1T+oHq CyAtweBkwLD5Tku/kLG1K9MLVecjYsIdy+815BENX+f0C38F2ovf9sjNjRX0xu5ZZlJW 2staWbcVFpwvEoT1TUChzFLGzc2IxgTaEUQpEzydmjfrw3H2WdxdXPuKG5HwANxBhopY 7ohA== X-Gm-Message-State: AOJu0YwJUiFKqjGrNzJcm40vlchU0SuLQoZ5Qlpm5QhcJPMcUP7WUqTA IB1VZdY6IkD1bBrbkjj0spb4EmC45anxSl00BtYCSinUIni/XfhOF8UerpDxkA== X-Gm-Gg: ASbGnct0D0FZtzH76KY75YZxR5L1hTGD9VTLsRJGypnPJf/DUtWvzbDiiI1thYVopYI VQLxbmpmm1SMzbGwoPLZR1baiil8+wTKx/C7AVIv0MIb3ydiCcDS01qaN7vghPSPEA6h8qompQQ rSV1BdwNWfBnDjTj7O75yAprXcLtWhnJAzKUcMvTi0xn3A4DRqXQ/T4f5krbr1scSrWzDkwgTjK r1M6/xtLHWlgrA2GNSExgjyHvNt6lgGk3CT4x90soiWloX5AOCDo20LUPDCWJo1Hz02x4A32SuI DqAM5LzxUu4PXBSNcbWiVaSRtzADS1AHGebE3Om89ZwQyQTvvALhYcTe34Rvjca09mqous1Glfc 7BpD5qVDzWDzT+TOFH1WjqKgT3FAnH9WRBteEuThSnvVAP+x+X1zD41VIJRbmRPL+B6kIF/KuTW M= X-Google-Smtp-Source: AGHT+IEoRDdzHL5syahX0qoqHeTBErd7h+Ffv2rx17qqGG9dfhSszTI+K5qIvJ+m0fXd3GPfNunA9w== X-Received: by 2002:a17:906:c14e:b0:ae3:d0fe:a35e with SMTP id a640c23a62f3a-ae3f9c06608mr1309896666b.11.1751846892507; Sun, 06 Jul 2025 17:08:12 -0700 (PDT) Received: from [192.168.178.143] (p200301023701fa005938084cfd524075.dip0.t-ipconnect.de. [2003:102:3701:fa00:5938:84c:fd52:4075]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae3f691a084sm598288566b.38.2025.07.06.17.08.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Jul 2025 17:08:11 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 07 Jul 2025 02:08:11 +0200 X-Mailer: MailMate (2.0r6222) Message-ID: In-Reply-To: <20250624192345.44376-1-epirat07@gmail.com> References: <20250624192345.44376-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avformat/tls: move common client options into their own define 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 24 Jun 2025, at 21:23, Marvin Scholz wrote: > Used in a future commit to not duplicate options. > --- > libavformat/tls.h | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/libavformat/tls.h b/libavformat/tls.h > index 2f381acc04..c1d2e21508 100644 > --- a/libavformat/tls.h > +++ b/libavformat/tls.h > @@ -80,20 +80,24 @@ typedef struct TLSShared { > } TLSShared; > > #define TLS_OPTFL (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM) > -#define TLS_COMMON_OPTIONS(pstruct, options_field) \ > + > +#define FF_TLS_CLIENT_OPTIONS(pstruct, options_field) \ > {"ca_file", "Certificate Authority database file", offsetof(pstruct, options_field . ca_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \ > {"cafile", "Certificate Authority database file", offsetof(pstruct, options_field . ca_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \ > {"tls_verify", "Verify the peer certificate", offsetof(pstruct, options_field . verify), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = TLS_OPTFL }, \ > {"cert_file", "Certificate file", offsetof(pstruct, options_field . cert_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \ > {"key_file", "Private key file", offsetof(pstruct, options_field . key_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \ > + {"verifyhost", "Verify against a specific hostname", offsetof(pstruct, options_field . host), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL } > + > +#define TLS_COMMON_OPTIONS(pstruct, options_field) \ > {"listen", "Listen for incoming connections", offsetof(pstruct, options_field . listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = TLS_OPTFL }, \ > - {"verifyhost", "Verify against a specific hostname", offsetof(pstruct, options_field . host), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \ > {"http_proxy", "Set proxy to tunnel through", offsetof(pstruct, options_field . http_proxy), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \ > {"use_external_udp", "Use external UDP from muxer or demuxer", offsetof(pstruct, options_field . use_external_udp), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 1, .flags = TLS_OPTFL }, \ > {"mtu", "Maximum Transmission Unit", offsetof(pstruct, options_field . mtu), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = TLS_OPTFL}, \ > {"fingerprint", "The optional fingerprint for DTLS", offsetof(pstruct, options_field . fingerprint), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}, \ > {"cert_buf", "The optional certificate buffer for DTLS", offsetof(pstruct, options_field . cert_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}, \ > - {"key_buf", "The optional private key buffer for DTLS", offsetof(pstruct, options_field . key_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL} > + {"key_buf", "The optional private key buffer for DTLS", offsetof(pstruct, options_field . key_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}, \ > + FF_TLS_CLIENT_OPTIONS(pstruct, options_field) > > int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options); > > -- > 2.39.5 (Apple Git-154) Pushed as ba9817df9df5911ceb2edff37d9ec970c29329e2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".