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 ECEF444B3F for ; Mon, 21 Jul 2025 11:32:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A599568C2F9; Mon, 21 Jul 2025 14:31:04 +0300 (EEST) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id D79BD68C1FB for ; Mon, 21 Jul 2025 14:31:02 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-7490702fc7cso2533214b3a.1 for ; Mon, 21 Jul 2025 04:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753097461; x=1753702261; darn=ffmpeg.org; 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=0WpweiaKgc46VeyFrdT/OcphTSGo/70zmBlMDC2uJks=; b=l6AAH+uUIaB73PobpAMjmyC74rgTSIrZtc/UMzz074Nfdl8LbLJ8P790BSSHnN0zSq vWB/upNwkt85YcX1CC1lJgGbQr0LowVrHNHwDX+/fn0KBHVGbY/ZjFsBXg/YzA3VXY+z M+aBHIVH5sAu+2sNZ6QgylyA7gSrttPo8p/A+8xvhdkq+YtJyjd/OV/pGtPwIE+h3WGI 9k5VWbFwIWroEqlFuOhy34DM5Un2SD7r+8p4xHlkzPm+t5K10mOjJ+aC6kKxEVErNyd/ fijQY0gpWuRMwO2PTbRGzOCGsdghTUFnNYcxdf7Jad40AKhOSMQOJrPcmfPDmQbz1pfh jB6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753097461; x=1753702261; 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=0WpweiaKgc46VeyFrdT/OcphTSGo/70zmBlMDC2uJks=; b=rjvIvcRhkKnpvW0xpMHmVckdXskIoGaz1LqyS9buiLuqha7KW5ePnVbgAdr6XfhndD cbfdIpCxc1X/3YKY5FgpBNxrZpJePjMJbgVLgnkNyPiGn8TrxdOjKTyopgIM3PjKjtSj bGfMi3lyiBc3XBn3SEx8NfGxdD8PIfQv2HGLYQxmzE1nWZ2GckFbIOTC2VbSA07R+wOZ uHzYbjFiR0Rua+tvzQ8pGPkNubE+SC23iypjcdbaYeqm1CoaOmRxImGgYjhE5MaRxefD O4/Qalb51ZLed+M3cdxIK0kJvn+uwAbj9Xge7zOA9dxDM65xb2qd8lZpRzzzq7yHIM4k 80cw== X-Gm-Message-State: AOJu0Yyal6zxvouk77eEfs/+1iAg1hDEO0n64CjDe2lyHeKADxwI5rvU 6LvYhQrlr6xHaOWRiEq4hk/1x3DO3pIz91xQVc9/NSdxuYETghmXN1rTKGMDvfVL X-Gm-Gg: ASbGncujxBkPBMj/QNpZN11sU8TLMffZvHoGQvuRJekjzsdA/qKuTCwxgjep8Xd/baE XEZSluynr8SJzoJRvU5cM4emkIjuJYpe2nCgQMqfFSyFaI4xTre0A9sm+iMol32lX5LQJdwEsdM j3U6SdDPYyjm9OduEYc7Ku4WcGf0tusU9DntPnQ0ZuBOjH423fb0xIVTFMHmU/16CRWpwKsh73Y Dxp9D/p/mohUrhz3RPTPnGjOn+cEKDC/iqh5WZYe4ylWAjn87pIP+3blGcd/z+ffcseDp1zuvj4 3UlbA4ZDiKQ9uCxqeHUhB/UKO+3C19KEF/VZC5pNyTEv6IdDDrxulHh7ZenKhAxknwUx29MK/2h U1BbF+MZp1ZhgbAhtpI9xMRoOa9g6W9s5Av4U+OrCS6s= X-Google-Smtp-Source: AGHT+IGjqqT62ZrFUisS32hC9orkchQVwFpT1KUMESqyUn2JbRNL8k2VKpLNwi05jhkCP0sax1GFZw== X-Received: by 2002:a05:6a20:2443:b0:232:7657:6e46 with SMTP id adf61e73a8af0-237d7b621f9mr28824363637.39.1753097460872; Mon, 21 Jul 2025 04:31:00 -0700 (PDT) Received: from localhost.localdomain ([5.34.218.160]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-759cbd68350sm5630277b3a.148.2025.07.21.04.30.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 21 Jul 2025 04:31:00 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Jul 2025 19:30:19 +0800 Message-ID: <20250721113023.91931-9-jacklau1222@qq.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250721113023.91931-1-jacklau1222@qq.com> References: <20250721113023.91931-1-jacklau1222@qq.com> MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH v4 08/11] avformat/whip: remove DTLSState enum 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 Lau 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: This patch aims to simplify the dtls handshake process since dtls handshake use force block mode We can just use the return code instead of DTLSState enum Signed-off-by: Jack Lau --- libavformat/tls.h | 15 ---------- libavformat/tls_openssl.c | 7 ----- libavformat/tls_schannel.c | 7 ----- libavformat/whip.c | 59 ++++++++------------------------------ 4 files changed, 12 insertions(+), 76 deletions(-) diff --git a/libavformat/tls.h b/libavformat/tls.h index 0c02a4ab27..157c0d0256 100644 --- a/libavformat/tls.h +++ b/libavformat/tls.h @@ -33,17 +33,6 @@ */ #define MAX_CERTIFICATE_SIZE 8192 -enum DTLSState { - DTLS_STATE_NONE, - - /* Whether DTLS handshake is finished. */ - DTLS_STATE_FINISHED, - /* Whether DTLS session is closed. */ - DTLS_STATE_CLOSED, - /* Whether DTLS handshake is failed. */ - DTLS_STATE_FAILED, -}; - typedef struct TLSShared { char *ca_file; int verify; @@ -63,8 +52,6 @@ typedef struct TLSShared { int is_dtls; - enum DTLSState state; - /* The certificate and private key content used for DTLS handshake */ char* cert_buf; char* key_buf; @@ -103,8 +90,6 @@ int ff_tls_set_external_socket(URLContext *h, URLContext *sock); int ff_dtls_export_materials(URLContext *h, char *dtls_srtp_materials, size_t materials_sz); -int ff_dtls_state(URLContext *h); - int ff_ssl_read_key_cert(char *key_url, char *cert_url, char *key_buf, size_t key_sz, char *cert_buf, size_t cert_sz, char **fingerprint); int ff_ssl_gen_key_cert(char *key_buf, size_t key_sz, char *cert_buf, size_t cert_sz, char **fingerprint); diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 778595c721..c3427a18e8 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -540,12 +540,6 @@ int ff_dtls_export_materials(URLContext *h, char *dtls_srtp_materials, size_t ma return 0; } -int ff_dtls_state(URLContext *h) -{ - TLSContext *c = h->priv_data; - return c->tls_shared.state; -} - static int print_ssl_error(URLContext *h, int ret) { TLSContext *c = h->priv_data; @@ -724,7 +718,6 @@ static int dtls_handshake(URLContext *h) goto end; ret = 0; - p->tls_shared.state = DTLS_STATE_FINISHED; end: return ret; } diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c index c92870347f..50f35acdd6 100644 --- a/libavformat/tls_schannel.c +++ b/libavformat/tls_schannel.c @@ -681,12 +681,6 @@ int ff_dtls_export_materials(URLContext *h, char *dtls_srtp_materials, size_t ma #endif } -int ff_dtls_state(URLContext *h) -{ - TLSContext *c = h->priv_data; - return c->tls_shared.state; -} - static void init_sec_buffer(SecBuffer *buffer, unsigned long type, void *data, unsigned long size) { @@ -1111,7 +1105,6 @@ static int tls_handshake(URLContext *h) #endif c->connected = 1; - s->state = DTLS_STATE_FINISHED; fail: return ret; diff --git a/libavformat/whip.c b/libavformat/whip.c index e02ed7a8a4..fe35ab7205 100644 --- a/libavformat/whip.c +++ b/libavformat/whip.c @@ -217,9 +217,6 @@ typedef struct WHIPContext { uint32_t flags; // enum WHIPFlags /* The state of the RTC connection. */ enum WHIPState state; - /* The callback return value for DTLS. */ - int dtls_ret; - int dtls_closed; /* Parameters for the input audio and video codecs. */ AVCodecParameters *audio_par; @@ -377,41 +374,6 @@ static av_cold int certificate_key_init(AVFormatContext *s) return ret; } -/** - * When DTLS state change. - */ -static int dtls_context_on_state(AVFormatContext *s, const char* type, const char* desc) -{ - int ret = 0; - WHIPContext *whip = s->priv_data; - int state = ff_dtls_state(whip->dtls_uc); - - if (state == DTLS_STATE_CLOSED) { - whip->dtls_closed = 1; - av_log(whip, AV_LOG_VERBOSE, "DTLS session closed, type=%s, desc=%s, elapsed=%dms\n", - type ? type : "", desc ? desc : "", ELAPSED(whip->whip_starttime, av_gettime())); - goto error; - } - - if (state == DTLS_STATE_FAILED) { - whip->state = WHIP_STATE_FAILED; - av_log(whip, AV_LOG_ERROR, "DTLS session failed, type=%s, desc=%s\n", - type ? type : "", desc ? desc : ""); - whip->dtls_ret = AVERROR(EIO); - goto error; - } - - if (state == DTLS_STATE_FINISHED && whip->state < WHIP_STATE_DTLS_FINISHED) { - whip->state = WHIP_STATE_DTLS_FINISHED; - whip->whip_dtls_time = av_gettime(); - av_log(whip, AV_LOG_VERBOSE, "DTLS handshake is done, elapsed=%dms\n", - ELAPSED(whip->whip_starttime, av_gettime())); - return ret; - } -error: - return -1; -} - static av_cold int dtls_initialize(AVFormatContext *s) { WHIPContext *whip = s->priv_data; @@ -1377,9 +1339,18 @@ next_packet: /* If got any DTLS messages, handle it. */ if ((is_dtls_packet(whip->buf, ret) || is_dtls_active) && whip->state >= WHIP_STATE_ICE_CONNECTED || whip->state == WHIP_STATE_DTLS_CONNECTING) { whip->state = WHIP_STATE_DTLS_CONNECTING; - if ((ret = ffurl_handshake(whip->dtls_uc)) < 0) + ret = ffurl_handshake(whip->dtls_uc); + if (ret < 0) { + whip->state = WHIP_STATE_FAILED; + av_log(whip, AV_LOG_VERBOSE, "DTLS session failed\n"); goto end; - dtls_context_on_state(s, NULL, NULL); + } + if (!ret) { + whip->state = WHIP_STATE_DTLS_FINISHED; + whip->whip_dtls_time = av_gettime(); + av_log(whip, AV_LOG_VERBOSE, "DTLS handshake is done, elapsed=%dms\n", + ELAPSED(whip->whip_starttime, whip->whip_dtls_time)); + } goto next_packet; } } @@ -1910,8 +1881,6 @@ static av_cold int whip_init(AVFormatContext *s) end: if (ret < 0 && whip->state < WHIP_STATE_FAILED) whip->state = WHIP_STATE_FAILED; - if (ret >= 0 && whip->state >= WHIP_STATE_FAILED && whip->dtls_ret < 0) - ret = whip->dtls_ret; return ret; } @@ -2022,12 +1991,8 @@ write_packet: end: if (buf) av_freep(&buf); - if (ret < 0 && whip->state < WHIP_STATE_FAILED) + if (ret < 0) whip->state = WHIP_STATE_FAILED; - if (ret >= 0 && whip->state >= WHIP_STATE_FAILED && whip->dtls_ret < 0) - ret = whip->dtls_ret; - if (ret >= 0 && whip->dtls_closed) - ret = AVERROR(EIO); return ret; } -- 2.49.0 _______________________________________________ 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".