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 E860E4FA35 for ; Tue, 24 Jun 2025 19:25:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 0A19E68D3AA; Tue, 24 Jun 2025 22:23:57 +0300 (EEST) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 0427368D384 for ; Tue, 24 Jun 2025 22:23:52 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-453643020bdso7590965e9.1 for ; Tue, 24 Jun 2025 12:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750793032; x=1751397832; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ACeFLakPXoHJgSnfZ5W1qfgbA8/6apoWyFyPw/VVxC0=; b=HRycq2WzPQXJCeoMupsE4uLKCEVYtDHWRNz2/FrzBYSzcAveZoFrWVGpisanavA0W4 YIjfDfWwSzvX/4mduh1/KNdLzbMbxLbfJwfh8Qs2it1YZeyfkN2SE8asjqVK2uTfbeJm TI1tNln/fCea3iP78Wnhi1P3Frsozt6K1IjqXg2RLbADH02ZeXrAEDTEfINnkIMYbPEl WL4h+znl1WAVWs7blLCTbmvcbNxtngnqWbMtOX3iMaVlTEPlleLmkN0gZNBIIfgHdVxL o8WW4AGMqesWkXUaleeTO50TmOPyOiR4kIS8HrzPkTGwn/w+vylpJTfeBaxu4sGodi4f umPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750793032; x=1751397832; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ACeFLakPXoHJgSnfZ5W1qfgbA8/6apoWyFyPw/VVxC0=; b=FcgFHLDY7Qlhk4avYezxUzzCILCLIVy1ZKOh23VwvWOmhaGYTGvbJZ8sFfec1AAqkb 5VuDFMdaHbjIgONCPKfBpdAqFd0quKI1M9ZJ0uKgkz9YMM6VAt/QOncP6o4GJkD5OvRQ +zKWI1yW3N8QeN2O71YjDtyug2pIyc/wBzuOXeZepMOo8AxU2jwnQO6zf/XFveVCOxxJ s02xMOpYmzXwhXkd2XSGN3bBxtNNOc47HLkMd9KxZu9JE9AnZ1uPO0GwmMhb605WGMoq rjxJC/rI2BPNT78zZigSWzkx/7YR+5uTPO72mxmRulVLmRKvb8TWhbRukkVdxU0CL1Wd vQXg== X-Gm-Message-State: AOJu0YzAcrKXn+XnoE6GYR6PAkzmQH/61iD/4K71NaA87qWNeejkgHC3 VULCPi46vZ4oJMpqHCZzSLpsPw5hfw+TFHRZJNA+vrxRmXU6eyDwvwEuIewjVg== X-Gm-Gg: ASbGnctm8TnIXXBmaIpdtUG9NEomeHkKAbLbE7Xe/gUAYgUf9RqbTQb63A0HAkMQAnf UTQbAGa36B/2NRWTdUiojCUXhRUndqOIW338+JTjgzbSdgDVheXPSHC4MT4jQiGiBAIgJWcFuB+ Xjnbl/GYoH3TK+uqnyzgkk8M6D0QDXYgMZhNnOUSksScqnz80HJKMGo4YhGTX1r8ZcARIJSASrw sEE3rz32b8MUz3lNSIgf1ivRXR1xJfeSfy1ljenB1NqDOH3J4629Z5O+GUobk2iARQL/lQpLx6F 4dHNJzm/aIYmIO7yGknYEWPtW5Xw4yHx61ZYsJB1IYyFB4M8pReEeXRuq60Vso/QdzTKzU6wZgn L3UNBwrZfq5OW9la8B8vp7DvS8jJK6BOY3yegbtHNea4RMsl2id7XvgWPDKEGDWafhxJO58MwD+ 5ugozFKRnMcP7Big== X-Google-Smtp-Source: AGHT+IETTY7bqSFbypXJCoVb9r7HUc2TYqmRjuo21qoU9ZsNbTPxMkmrpZWc9CaPKXzV14YMiFj4Qw== X-Received: by 2002:a05:600c:4e8a:b0:43c:f0ae:da7 with SMTP id 5b1f17b1804b1-45381aa4ca1mr2182295e9.7.1750793031871; Tue, 24 Jun 2025 12:23:51 -0700 (PDT) Received: from ArmedBeast.fritz.box (p20030102370045006de90db78179531b.dip0.t-ipconnect.de. [2003:102:3700:4500:6de9:db7:8179:531b]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453646d7d8fsm148296155e9.15.2025.06.24.12.23.50 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 24 Jun 2025 12:23:51 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jun 2025 21:23:44 +0200 Message-Id: <20250624192345.44376-1-epirat07@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Subject: [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: 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) _______________________________________________ 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".