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 C3EE74BE72 for ; Fri, 4 Jul 2025 15:14:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 4A95B68FB11; Fri, 4 Jul 2025 18:14:49 +0300 (EEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 39D5668FB01 for ; Fri, 4 Jul 2025 18:14:42 +0300 (EEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-451dbe494d6so11568125e9.1 for ; Fri, 04 Jul 2025 08:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751642081; x=1752246881; 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=Gpc5ChsFRBe0A9NRo8ZQjDClkom6cFlN27RCVdyBIfw=; b=DgzAMso9X0DrfjMm+IeM7moAK9gVmbygJLHGJoPfpGwwWu/IY32N+MLcwlcXq1i9dS m+wBWehIjiVoZxN7tgfXwH1W5ojQV25OcapARbLPNG88alq6CcUwx/JzdBUBpdzWxhru lKPUq6bcupL0NA/PL2kkSgMPWUFI5ToRCfHL8wfwfk0vrihB1Gdmau9Fx1OB8wJNhQv3 AFI4n+xJuQV+So8z/SsF+9VE0jH4J953Ke0hrNH2zYnA9AdiU77hxb4E1Opv1542+q/R 0wv+x2xcjfXc0dEaezMaPUSZXNPqP9hRqqFrmFHdewG/esbiyYCHOfZAermgvK5PMpkE 4N0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751642081; x=1752246881; 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=Gpc5ChsFRBe0A9NRo8ZQjDClkom6cFlN27RCVdyBIfw=; b=HFSLzzME265Y1r6agi6p+tgxfnRs1eT9OjQvnuicwcPtmiTzkgIkVcAiXQqeziYZli xHwPVgJtjk3H+e0Ima4QMyvxdO1fn/hANEFbE/PTIUxsD0Pcj7tZ84pkiZIbkKifgmO2 iCM7xj5vUDX0GBo615GBYplFNOdgM2AfAkHV6JxuHG9/O/E9Vz2biDLa8JGiJFsAOBdr mOiixnjTTD843e2OmIpWct+5jshqvGenLbkuTqMweY2Os+hPHvgsYxreNhY7nYgp9OD/ dvmmEJuwNCyyhOMkclOJPK96bv4zlRnwZ8gbAabqkuEDo9UsLAvuLV7O5jmfrAJhGozD PsBw== X-Gm-Message-State: AOJu0Yy9QYogZNPoXIHWFL+jfYQX1tF0NRA5WSeU4/uNyBsBxCENHzDD BZsE3nN0hshmvx+F6fCNL6+ig5EGwWNiCZtAmQGdrvMS+ValaEr1H8tBdaPPCA== X-Gm-Gg: ASbGncuT/p2GsZUwxG5TFBdXPAmAgWxnHahcdPZYif5U7fHlYxI3xQ/6de5ZiRHmnfa 782aaZl9jWAlmpPHoVq4jQtIXo95Xc+4eU9y3a7r3XC5JihQQR4cplxlzCiBRhYhKlludsHmHMa 8MNePOswvWdzPv/e91O5WJlJmOqaf1cJ8OrlRyo/3Dq65+Mt9tATHliZrdF126/q2bWqvQVPB9g k2EWpcln7FIYh+x6oiuTo2kr+iRfgtuk0A4rHlzITiuWsojEblY8KTYgEXnzes5HCzK5AeH1kl8 jqw09c6D5LFZ8Rw5yzbsJfD3jRfhqJd6DRDO0bEb8xYZicQ8ySeWVhUmVGbY5crQ9heKdUVrszS heKy9JP+y3KUQDbdgAT/0ecVnYi2ZGLk2+weHKHr3Xn1/lDk2nHN93Eo53LU4JqunzSPFzyNf6M ye+ghnfeLx84I= X-Google-Smtp-Source: AGHT+IHajHDfX/0jb14vKVjl+uL5bDOZ7IOhxXB5WaIJSzPoIXei9dqjORf/qnU4tweI0+DGKsVvkw== X-Received: by 2002:a05:600c:8b2f:b0:442:ccfa:fa with SMTP id 5b1f17b1804b1-454b4eb8af2mr25275145e9.27.1751642081251; Fri, 04 Jul 2025 08:14:41 -0700 (PDT) Received: from [192.168.178.137] (p200301023701fa007c711eeeaa4bf578.dip0.t-ipconnect.de. [2003:102:3701:fa00:7c71:1eee:aa4b:f578]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b47030bc79sm2716751f8f.9.2025.07.04.08.14.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Jul 2025 08:14:40 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 04 Jul 2025 17:14:39 +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) If there are no objections, I plan to push this patchset this weekend. _______________________________________________ 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".