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 3B1364CD37 for ; Sun, 13 Jul 2025 07:10:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id B58E668DC92; Sun, 13 Jul 2025 10:10:13 +0300 (EEST) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A60DD68DC9A for ; Sun, 13 Jul 2025 10:10:06 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-b34a78bb6e7so2634248a12.3 for ; Sun, 13 Jul 2025 00:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752390605; x=1752995405; 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=SFqvsII/OVTtt6YnrZSLz99ZY+sfD3KUgYtCMzAIZPI=; b=jFYFLdFMcodXRNm7czq2tybBWMXAXX492FEBuXvZ8w0xBVwQ4Cup4ubPXF+O9eBD6B yS98k9zYp4vJHy7fwgw3W7EsrypsmeOF2/bcGLVz440/brAX5dBhWS1KLfyha7TA1fUg TN/iKxwQlLBOyOS6gukRru8o019BbtRVsUfT20j0jj5XddXDj+JhJHXzhrzmLp0j+8/x x93e3Lc/qMfAr2tEvIouhtyqGLwcIWfzHl+dpq/PZRTVdYR2Ey37F5p5h4DSxZhs8s3+ 7A6Idzs/CaXZ45cgf9JUD+I0ncvfvReXRmYEdzsbpwHghW4+jY4DlhHWkqdHK+sSaCzJ LxlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752390605; x=1752995405; 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=SFqvsII/OVTtt6YnrZSLz99ZY+sfD3KUgYtCMzAIZPI=; b=xUyTBfzATowmy/qnaCAmNJJjjMZ0kNPHXCIhnYP61Tcai1m/OS93zRJ7wGfk4Ubh91 u+acrd2IwrDOoDa1NqzhgyKQUwSEcPF3Mlr/j8n8p1PbUlZvoQMPNxadOBlK5dfIBjkE NpBSpL69+Aat0u0iXE2cvWdYtxV280Y/2L2cEf/njcms8QX+X9b59A0yAqq1qLJbDFV6 5fCpqPotns7DxFPvznyoJFv+JXp5Tj4EKnAg1H1eh//RsFvyvixeORq8kGeT+FyNLP4I J8lnlA3AKe/t1iJgl+c6xHNXprVhvH7HjFsAqzUpHM3durwB93o3at/K6nmXPIIEcQV8 JPZA== X-Gm-Message-State: AOJu0YwPplGviYBrwhZQGO8C7CpKOofAeN0g/C3KHxY8xUeZj23k4Gmp q8rpQ/chU3mFWbV/I9zRyDKF5CEvvO6zCZwzvY/FgcYEnuvI0sGamlupaqM5l4Kg X-Gm-Gg: ASbGncuYYAbrrnW7/Aug8huKmZYa9GbAZxf2GPKlQ1aHxAZLHh4B06R69GsX9zKzsTS 7SXS1ivjMX2Zk1713U9cUIr42IKknME7mSzpCUvYM6+Q+4/PO2pKTzaZUz8xMozXqZkTiArTpR2 SWc6gSlGpgqh4UCWn5BrT548lcKFKyNJ0h+jjRhkZB+Wy+HhfhPB64YSt09c4uD94NDIINjuWbA uIwNdgADL3fDJFcStwhYFaWIa/eRgIGpKYxKgX9S98VbHTsz1iIohYgTpRxKTADKZV8qcVskZ0y 9mYg7H0TDtHNbTMfYwRjwgVXPNjHRrukt7Qqu7+/eOU+CN5+tmu8XLLo7SJS2DFWP0xPcEHq5+1 DYCR4QjYtbkrB6Sk9MTMdpMfmUuvtzwqDXCo5lWy90UZwCiKdsP1pZQ== X-Google-Smtp-Source: AGHT+IHa9g2/9soSDiMkUd+pygEMn1Ij/v0UvtUOck1al5goHRpkyR8j4Ou6qa6ARmSbc6y+4A6gVw== X-Received: by 2002:a05:6a21:998e:b0:1f5:7ba7:69d8 with SMTP id adf61e73a8af0-2311e93bf78mr14221747637.15.1752390604482; Sun, 13 Jul 2025 00:10:04 -0700 (PDT) Received: from localhost.localdomain ([123.11.82.155]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74eb9e07facsm8595591b3a.68.2025.07.13.00.10.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 13 Jul 2025 00:10:04 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Jul 2025 15:09:43 +0800 Message-ID: <20250713070950.10626-3-jacklau1222@qq.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250713070950.10626-1-jacklau1222@qq.com> References: <20250713070950.10626-1-jacklau1222@qq.com> MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH v3 2/9] 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 status code. init ret=AVERROR(EAGAIN) to match most of FFmpeg 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 2777a4f657..25318d5fca 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -673,15 +673,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 = AVERROR(EAGAIN), 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 { @@ -691,7 +690,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".