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 92A9B4CBDB for ; Sun, 13 Jul 2025 07:10:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 17CED68DC7B; Sun, 13 Jul 2025 10:10:20 +0300 (EEST) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id F0AC668DCB0 for ; Sun, 13 Jul 2025 10:10:12 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-748e63d4b05so1979741b3a.2 for ; Sun, 13 Jul 2025 00:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752390611; x=1752995411; 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=HZqj/tfKb8yMCd0RbFdwCgsjrZS3HDHpurCp2oli4Zw=; b=GqFnQ4tprfo5FyDLp4YkTA6klzgr5COBvHkuoa/v/zltnPqRAWW7dghW/fHvYhHZgc s1/7wkgZB8J7yeKKjewN/2SclO6bQHw5ZXrrvU89krbbmw41K4xXVRlN9i5Xyz2HsdLh zc1YW6w/C+/BRBuLFWI7xUqcJb2pCsS/UuLUixe7savvvx6PmYBQRX6pSF1PmF448eeV GJWxuCARsfId3hX6TOdTmcr7NVKQ41PwiR1qsuugT1NMLlSLyg5f3G2UMDJg5CFIBJK4 CXl9J138PSxALG5MJDQZo+qVMPXDyYSEbL+HPbAfHotD4NS2jENwhvd/0k+DpxMfhI5/ BrDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752390611; x=1752995411; 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=HZqj/tfKb8yMCd0RbFdwCgsjrZS3HDHpurCp2oli4Zw=; b=KOvGJvDbgarZbMH5pS12mdsCEcht12pwAlxba4WXaLpbEZYUfChm9PQBIUw/+GY1FF oUdmDeHaQNEVcz8t9XB73Cfpnli0eabXytMONiASzdm4tvmhyn6mUTekjszrVA2ticz7 az1BulqjkJuBX73Sk+piPWwrkirACoS4NUBb+Ab+IVIKeGiSIh4JRFaetq3idIu3Dcnq bhZ54y03+q+eatjXfeqPRm60YpD7J5ug+t+SDhkRt/1nLVf+QXC0MPFeeucwXczmTDF2 5Jsim2b758HroHTt8eN6cCXmapFMcmexp2on8CPSJaTnqmHk0tsp8NMVXyCWMNs1h1N6 Q0Ig== X-Gm-Message-State: AOJu0Yw+7jWy7J3V/5i4RIyYf5Ke0/Nli9UJ7Sr3Gs/wS60H1bYTqLQ8 QNdzdJlTUVOVsCz+IbgcjM9+HlZsDd/VxAOvZxycFWZmwNBaXA/m7V8hunKljGDx X-Gm-Gg: ASbGncueVFIwCQLw57FiTzxs6MOdqqaolAfbaZZyIKqrtGl1BQ2rWdBe1oXRCpkYU1Z /oK1+K0lBhSE/uWZa6UawN4O9W6XkWOHHBC2E4HrTIV1XTnlmOL6TTtz+9S0bXJb7y7vwRTe2IT dihK3c28NroarSUoS0zlrMu3vwiR9jeUl+UZSsZJgZ7ywT3ib1SiGvt2xvQOTb7Q7ya9C7oqrS1 sddOipJDhT6uM3lpbbFjK3m9alyocmzlrY2GeSyhAO1wh5mmAFiYixrPgHmbnhdpFykrXK6MtDE pBfSTLLeb2mjaBlCMjrIAHfCwpVujOmgoUT2gQkl7KnF0vUKK3IEBkCVIUuziYnnc+PnYr+40Sj GvvsoDxyGU/jQ29GWe5iEdtF01Kgzwy9g2vJtJ7yu4sI= X-Google-Smtp-Source: AGHT+IEDciSZVTbd5M7KRiB54G5UBZLQoEqHtOk4eMSp/6cdTp1rS9s8/mcgoHOEUAVKs4wJ55ZB5g== X-Received: by 2002:a05:6a00:2345:b0:748:3a1a:ba72 with SMTP id d2e1a72fcca58-74ee2845c56mr12143097b3a.20.1752390610990; Sun, 13 Jul 2025 00:10:10 -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.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 13 Jul 2025 00:10:10 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Jul 2025 15:09:45 +0800 Message-ID: <20250713070950.10626-5-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 4/9] avformat/tls_openssl: make tls and dtls use one close function 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: Signed-off-by: Jack Lau --- libavformat/tls_openssl.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index c824c5452b..3ed4585ecf 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -553,9 +553,16 @@ static int tls_close(URLContext *h) } if (c->ctx) SSL_CTX_free(c->ctx); - ffurl_closep(&c->tls_shared.tcp); + if (c->tls_shared.external_sock != 1) + ffurl_closep(c->tls_shared.is_dtls ? &c->tls_shared.udp : &c->tls_shared.tcp); + if (c->tls_shared.cert_buf) + av_freep(&c->tls_shared.cert_buf); + if (c->tls_shared.key_buf) + av_freep(&c->tls_shared.key_buf); if (c->url_bio_method) BIO_meth_free(c->url_bio_method); + if (c->pkey) + EVP_PKEY_free(c->pkey); return 0; } @@ -875,20 +882,6 @@ fail: return ret; } -/** - * Cleanup the DTLS context. - */ -static av_cold int dtls_close(URLContext *h) -{ - TLSContext *ctx = h->priv_data; - SSL_free(ctx->ssl); - SSL_CTX_free(ctx->ctx); - av_freep(&ctx->tls_shared.cert_buf); - av_freep(&ctx->tls_shared.key_buf); - EVP_PKEY_free(ctx->pkey); - return 0; -} - static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **options) { TLSContext *p = h->priv_data; @@ -1032,7 +1025,7 @@ const URLProtocol ff_dtls_protocol = { .name = "dtls", .url_open2 = dtls_start, .url_handshake = dtls_handshake, - .url_close = dtls_close, + .url_close = tls_close, .url_read = tls_read, .url_write = tls_write, .url_get_file_handle = tls_get_file_handle, -- 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".