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 3B7324B3D9 for ; Mon, 21 Jul 2025 11:32:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 7543D68C181; Mon, 21 Jul 2025 14:31:02 +0300 (EEST) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1119C68C2B6 for ; Mon, 21 Jul 2025 14:30:59 +0300 (EEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-748e63d4b05so2440059b3a.2 for ; Mon, 21 Jul 2025 04:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753097458; x=1753702258; 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=XmCIVbOh6Gx8bLyki+yFFMx4cq6rA+UVoaCqb0NCel4=; b=JGFJoaC1urF/EEOkGCyFtEBO1oFq80aAds0q/6kyvl/Opz28RBcQ0eai8k3hfLhHB0 c/FKfQc3xJ9pEt25YrNfik5lcVDWPlX+nyS2wLCkU43RYZOapi3+kaChmQCrwtQfL1ro W3eAMxdGsrJ2RB1Jccn6w4RWIjmD8mXtRaHVUSLGYZvasbjrQHloBoEmuN0N/3r6sCcs yclTucKfZRW1ir9Rip7LjPmdCG8CJt4FzqaiQlJ1HBuRnoXyArix9eTzjuDhxTlo4gvS UhCUz31ZaOhOEvxK7wzAyHFBMztviZhhc96Ru+bRqZ57YOZl4EP688I2LwalpDNOKweQ oXaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753097458; x=1753702258; 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=XmCIVbOh6Gx8bLyki+yFFMx4cq6rA+UVoaCqb0NCel4=; b=hwPPZdQXGn84k2ZPCyMHFQKgRHhAcz+Y/kkj39RrEeifnV26pszxhIpd67D7R5sKYf 10lhygiK46uzOP6+yVhu3XWL0SpyD8dvxzDZeGM7SerepchoV3tKbhdnLPE40m+2ICKs cD1G4EX/lusc1/UFVM91vKxEy11JEEl7XbMsMMuf8X2vSj5HyxcioyKvtamujFz6+jrr ALoPJR9Ehd7gEyjYax3ydNY8FPV7BmUuV6dKdmraxSfQN2q3t1N1deJ6zEKZDxM+6Gxd xGJZCSQ8nVjdVfvcTC4q5BXTIKf0r8i7aQ5D4/aJPEYr9qmuRwXTRUC0i+JYmDMAyHKO y/MA== X-Gm-Message-State: AOJu0YxqYilUs/ntp5ykQyX3cn5a9aalD60f+dqzaOJRZvRiX0HKgrsC tM5Ol6EFDMLfEKWrKc2VFbpevPD3ll6rnSLN4HcEHg6XFk5hAvUHhwMVOMRWo1zJ X-Gm-Gg: ASbGncv+fffylcofhiEsN2g5mk5Xz83+dzqeJLiEPfC9MCMDUxltf8CkidQ8OlCsiag kSCs/IN71GHE0G62H1KJaeqw2uAxdCbMLPrx2S7g7rRaPfQyptm8pf+C7fQI0iml+wmpdbzTq7D SDKKwDzXU3uYhFoX5BkVBDkaI/ckRen2EyBmC6OdlwO5O/wZT/zzNliLzPyQzstJUclr/5h3Hkk cwM2zmjekyTB7vFAJtQxAlXeHs6/wPTLrYm/7FcgGWIBmiUxNVWR+v+YutF1+WT8JXTD9l37Mdx 4WPiOROUz6SGNhCY2h53F+l+BEizLKPy9wIaN16zZMs5IMediTe6oHsmeqWMH2SKZzY+VV4IaI6 jNAlDrJjlRT78LHKX2L4kAkKW7qnVkZop X-Google-Smtp-Source: AGHT+IHdfPoRMfU98ZjcLPO8Xxdfdd7TEVDF+V9NBN4BpdNdQuB1LZTskQpViMVhsQ39azyDMeriWQ== X-Received: by 2002:a05:6a20:a103:b0:232:8a1f:591b with SMTP id adf61e73a8af0-23813c6daf6mr28515339637.26.1753097457725; Mon, 21 Jul 2025 04:30:57 -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.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 21 Jul 2025 04:30:57 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Jul 2025 19:30:18 +0800 Message-ID: <20250721113023.91931-8-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 07/11] avformat/whip: add support for active dtls role 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: add dtls_active flag to specify the dtls role properly set the send key and recv key depends on DTLS role As DTLS server, the recv key is client master key plus salt, the send key is server master key plus salt. As DTLS client, the recv key is server master key plus salt, the send key is client master key plus salt. Signed-off-by: Jack Lau --- libavformat/whip.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/libavformat/whip.c b/libavformat/whip.c index 094d3a0a4c..e02ed7a8a4 100644 --- a/libavformat/whip.c +++ b/libavformat/whip.c @@ -201,7 +201,8 @@ enum WHIPState { typedef enum WHIPFlags { WHIP_FLAG_IGNORE_IPV6 = (1 << 0), // Ignore ipv6 candidate - WHIP_FLAG_DISABLE_RTX = (1 << 1) // Enable NACK and RTX + WHIP_FLAG_DISABLE_RTX = (1 << 1), // Enable NACK and RTX + WHIP_FLAG_DTLS_ACTIVE = (1 << 2), // DTLS active role } WHIPFlags; typedef struct RtpHistoryItem { @@ -611,6 +612,7 @@ static int generate_sdp_offer(AVFormatContext *s) const char *acodec_name = NULL, *vcodec_name = NULL; AVBPrint bp; WHIPContext *whip = s->priv_data; + int is_dtls_active = whip->flags & WHIP_FLAG_DTLS_ACTIVE; /* To prevent a crash during cleanup, always initialize it. */ av_bprint_init(&bp, 1, MAX_SDP_SIZE); @@ -664,7 +666,7 @@ static int generate_sdp_offer(AVFormatContext *s) "a=ice-ufrag:%s\r\n" "a=ice-pwd:%s\r\n" "a=fingerprint:sha-256 %s\r\n" - "a=setup:passive\r\n" + "a=setup:%s\r\n" "a=mid:0\r\n" "a=sendonly\r\n" "a=msid:FFmpeg audio\r\n" @@ -676,6 +678,7 @@ static int generate_sdp_offer(AVFormatContext *s) whip->ice_ufrag_local, whip->ice_pwd_local, whip->dtls_fingerprint, + is_dtls_active ? "active" : "passive", whip->audio_payload_type, acodec_name, whip->audio_par->sample_rate, @@ -698,7 +701,7 @@ static int generate_sdp_offer(AVFormatContext *s) "a=ice-ufrag:%s\r\n" "a=ice-pwd:%s\r\n" "a=fingerprint:sha-256 %s\r\n" - "a=setup:passive\r\n" + "a=setup:%s\r\n" "a=mid:1\r\n" "a=sendonly\r\n" "a=msid:FFmpeg video\r\n" @@ -719,6 +722,7 @@ static int generate_sdp_offer(AVFormatContext *s) whip->ice_ufrag_local, whip->ice_pwd_local, whip->dtls_fingerprint, + is_dtls_active ? "active" : "passive", whip->video_payload_type, vcodec_name, whip->video_payload_type, @@ -1270,6 +1274,7 @@ static int ice_dtls_handshake(AVFormatContext *s) int ret = 0, size, i; int64_t starttime = av_gettime(), now; WHIPContext *whip = s->priv_data; + int is_dtls_active = whip->flags & WHIP_FLAG_DTLS_ACTIVE; AVDictionary *opts = NULL; char buf[256], *cert_buf = NULL, *key_buf = NULL; @@ -1319,12 +1324,14 @@ next_packet: av_usleep(5 * 1000); continue; } + if (is_dtls_active) + break; av_log(whip, AV_LOG_ERROR, "Failed to read message\n"); goto end; } /* Got nothing, continue to process handshake. */ - if (ret <= 0 && whip->state < WHIP_STATE_DTLS_CONNECTING) + if (ret <= 0 && (is_dtls_active ? whip->state < WHIP_STATE_ICE_CONNECTED : whip->state < WHIP_STATE_DTLS_CONNECTING)) continue; /* Handle the ICE binding response. */ @@ -1348,7 +1355,7 @@ next_packet: } else av_dict_set(&opts, "key_pem", whip->key_buf, 0); av_dict_set_int(&opts, "external_sock", 1, 0); - av_dict_set_int(&opts, "listen", 1, 0); + av_dict_set_int(&opts, "listen", is_dtls_active ? 0 : 1, 0); /* If got the first binding response, start DTLS handshake. */ ret = ffurl_open_whitelist(&whip->dtls_uc, buf, AVIO_FLAG_READ_WRITE, &s->interrupt_callback, &opts, s->protocol_whitelist, s->protocol_blacklist, NULL); @@ -1368,7 +1375,7 @@ next_packet: } /* If got any DTLS messages, handle it. */ - if (is_dtls_packet(whip->buf, ret) && whip->state >= WHIP_STATE_ICE_CONNECTED || whip->state == WHIP_STATE_DTLS_CONNECTING) { + 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) goto end; @@ -1406,6 +1413,8 @@ static int setup_srtp(AVFormatContext *s) */ const char* suite = "SRTP_AES128_CM_HMAC_SHA1_80"; WHIPContext *whip = s->priv_data; + int is_dtls_active = whip->flags & WHIP_FLAG_DTLS_ACTIVE; + ret = ff_dtls_export_materials(whip->dtls_uc, whip->dtls_srtp_materials, sizeof(whip->dtls_srtp_materials)); if (ret < 0) goto end; @@ -1420,13 +1429,11 @@ static int setup_srtp(AVFormatContext *s) char *client_salt = server_key + DTLS_SRTP_KEY_LEN; char *server_salt = client_salt + DTLS_SRTP_SALT_LEN; - /* As DTLS server, the recv key is client master key plus salt. */ - memcpy(recv_key, client_key, DTLS_SRTP_KEY_LEN); - memcpy(recv_key + DTLS_SRTP_KEY_LEN, client_salt, DTLS_SRTP_SALT_LEN); + memcpy(is_dtls_active ? send_key : recv_key, client_key, DTLS_SRTP_KEY_LEN); + memcpy(is_dtls_active ? send_key + DTLS_SRTP_KEY_LEN : recv_key + DTLS_SRTP_KEY_LEN, client_salt, DTLS_SRTP_SALT_LEN); - /* As DTLS server, the send key is server master key plus salt. */ - memcpy(send_key, server_key, DTLS_SRTP_KEY_LEN); - memcpy(send_key + DTLS_SRTP_KEY_LEN, server_salt, DTLS_SRTP_SALT_LEN); + memcpy(is_dtls_active ? recv_key : send_key, server_key, DTLS_SRTP_KEY_LEN); + memcpy(is_dtls_active ? recv_key + DTLS_SRTP_KEY_LEN : send_key + DTLS_SRTP_KEY_LEN, server_salt, DTLS_SRTP_SALT_LEN); /* Setup SRTP context for outgoing packets */ if (!av_base64_encode(buf, sizeof(buf), send_key, sizeof(send_key))) { @@ -2098,6 +2105,7 @@ static const AVOption options[] = { { "whip_flags", "Set flags affecting WHIP connection behavior", OFFSET(flags), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, 0, 0, ENC, .unit = "flags" }, { "ignore_ipv6", "Ignore any IPv6 ICE candidate", 0, AV_OPT_TYPE_CONST, { .i64 = WHIP_FLAG_IGNORE_IPV6 }, 0, UINT_MAX, ENC, .unit = "flags" }, { "disable_rtx", "Disable RFC 4588 RTX", 0, AV_OPT_TYPE_CONST, { .i64 = WHIP_FLAG_DISABLE_RTX }, 0, UINT_MAX, ENC, .unit = "flags" }, + { "dtls_active", "Set dtls role as active", 0, AV_OPT_TYPE_CONST, { .i64 = WHIP_FLAG_DTLS_ACTIVE }, 0, UINT_MAX, ENC, .unit = "flags" }, { "rtx_history_size", "Packet history size", OFFSET(history_size), AV_OPT_TYPE_INT, { .i64 = HISTORY_SIZE_DEFAULT }, 64, 2048, ENC }, { NULL }, }; -- 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".