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 D631D4CA15 for ; Fri, 11 Jul 2025 13:22:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id EFF1A68FF8F; Fri, 11 Jul 2025 16:21:42 +0300 (EEST) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 29CF468FF7C for ; Fri, 11 Jul 2025 16:21:37 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-748f5a4a423so1354139b3a.1 for ; Fri, 11 Jul 2025 06:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752240095; x=1752844895; 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=cmvl6bXpo9vMgEj9fzcg8IMpXZJenmlmMbH+B/Qv3Es=; b=RTV9okAd+ymEqnu1IQPiuzMPvD7C7y2xFbnq1rXnABnLaQCws+LWeW+qxPDO7rAYvz QcPSwDVixZdnBgBzr757stJQt8WWFeqRKu3FbWM9yFqTTlUXBhnKUk3HAFwGReS6nt/t 0uz3il35xB0fR26qAyUT4ak+PUn1+cskgsaqCZHz8IMkBU3qGtAeIu0SUVthJVs6kdTe LRRm8iAjNvlSiVuhAmDeN+vGeentWcvf4maRmbJ6dK1dsM7ty5X12hAi6+QTDq/akNPJ Ehk1IoHadtqv7Yo06Jthh8EW9YUsjarAiheIF1hcX6H138SSkTskx2nD58l8j845jRO3 y9oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752240095; x=1752844895; 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=cmvl6bXpo9vMgEj9fzcg8IMpXZJenmlmMbH+B/Qv3Es=; b=HndoS+u86esC458DLyK2Egb84WkJhXG93rGXp2EQY7bmz/giSU56KfVrmssEW0G5Ww 4dHals7pzpaIRHdpb4NVNuRGsDJkZN+2zG5tJiQKMIih2QPAu0X/vHuWrJI1EHk8/iFX tH4boKsukwuYRT8XFSCErrsWpF7khjMnQ+h9b5rhNo2EWH8FkWlD4pZZYx9vEXtizeaz mCKqwdZMVwekGZKtXK6876+y4rRnUuXkHR8O8EAxtczkXa4ZF+qiiNExXUvDxgp1bqQQ TBrUOIKMZpJIGtOTSKkPBpWnjcaS/rxN8MrrTypBuJEh5fvwNeAYosS2HEslc9T0LhTB Uxfg== X-Gm-Message-State: AOJu0YwkBSg5xppFwgNyhrJpnqSkpg/A5FYPxi6Xx8PQmkfYOKwbc8b7 MUMuMxs7Herv7g5MTc5dsD1354Wn5dH+jiBCvc9dtEmS4xDvE6ZbyiSiiVEkG6c+NWg= X-Gm-Gg: ASbGncsjd0fNOpn29eA/OKLoUhUgee2y8JvRNnillKyXPQIT0OtXSvObqHRMEJYygOP TsPgh97HoTfWhyKIXLmQb5av5xuNXsxqqmmXhIIxnkxm6WThv9GGpjSeFPWjgtpRMZMMPznghzy qJgI0z9JA3/h6Cy9/TguJ5Zr40j3CMoPIW7SgJqXHziliepYZsF2KoeHZ0NssuEdEw96smrRLd+ IJR0+8kOyg5xF/G//w4afj5JqjKjTnVkIrqS6AE/Vy8FQMTWUlB7N3RZYSTvBfSJ5bUTppSXDFf FdPSNSWftr3scJiNqh96epW7a3lw8NUwhoXL3alfQHcubSxy3reCOR/dkWo2xDQLKZlIpIlCm0f DxrSOjvCirdieCUZem9RZ9x4LF6CNiFRVT7JE+QTUG/I= X-Google-Smtp-Source: AGHT+IH9TevBx2UfuQCyPGsq00PgE0ndBPoTYhKPx+2ZXgy4LYHkAcPTZIU84+7jU+B/1+2djAmXCg== X-Received: by 2002:a05:6a00:124a:b0:74e:a560:dd23 with SMTP id d2e1a72fcca58-74ee2d4cd93mr3990277b3a.21.1752240094925; Fri, 11 Jul 2025 06:21:34 -0700 (PDT) Received: from localhost.localdomain ([38.99.248.174]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74eb9f4bc51sm5338840b3a.116.2025.07.11.06.21.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 11 Jul 2025 06:21:34 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Jul 2025 21:20:47 +0800 Message-ID: <20250711132120.38507-3-jacklau1222@qq.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250711132120.38507-1-jacklau1222@qq.com> References: <20250711132120.38507-1-jacklau1222@qq.com> MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH v2 2/4] avformat/tls_openssl: fix dtls_handshake return code 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: If the handshake is still in progress, dtls_handshake should return a positive status code. Signed-off-by: Jack Lau --- libavformat/tls_openssl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 8639ac9758..ffd9cd51d2 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -716,15 +716,14 @@ static int openssl_dtls_verify_callback(int preverify_ok, X509_STORE_CTX *ctx) static int dtls_handshake(URLContext *h) { - int ret = 0, r0, r1; + int ret = EINPROGRESS, r0, r1; TLSContext *p = h->priv_data; r0 = SSL_do_handshake(p->ssl); r1 = SSL_get_error(p->ssl, r0); if (r0 <= 0) { if (r1 != SSL_ERROR_WANT_READ && r1 != SSL_ERROR_WANT_WRITE && r1 != SSL_ERROR_ZERO_RETURN) { - av_log(p, AV_LOG_ERROR, "TLS: Read failed, r0=%d, r1=%d %s\n", r0, r1, openssl_get_error(p)); - ret = AVERROR(EIO); + ret = print_ssl_error(h, r1); goto end; } } else { @@ -734,7 +733,7 @@ static int dtls_handshake(URLContext *h) /* Check whether the DTLS is completed. */ if (SSL_is_init_finished(p->ssl) != 1) goto end; - + ret = 0; p->tls_shared.state = DTLS_STATE_FINISHED; end: 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".