From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A001049CE3 for ; Mon, 8 Apr 2024 13:33:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73CBD68D217; Mon, 8 Apr 2024 16:33:28 +0300 (EEST) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8649468D1C4 for ; Mon, 8 Apr 2024 16:33:22 +0300 (EEST) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2a3095907ffso1899565a91.0 for ; Mon, 08 Apr 2024 06:33:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712583200; x=1713188000; darn=ffmpeg.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=zrdUC1hPh2LE19rU0ZTINljRQo+lSCt3O5UvjJMveH0=; b=HL2N32rswIFnH9HvEWHyQCkQgpbAbbM2KY/FX7xm+IKZkmS2tDnIs0GpmV6mpm9k7k ZDgL877t8wI8HUb11T3K6e4L9WEnYUKwRpZGJR9MvtXQDG6ZAhz6EGObLrit5FY3YFe+ ArbakT0xSl/GbIE9zDutEzOYSRkiyBqA85TIe21wuCXam24uOXDBNzUQEkekF2oJlwPV gOzqoz73BQdEyF+56niUnggBXYCDjfUfzBqJ6T47VakrIJVWcda3CALem5bvdISpCG3D 3fXENrVDT5Xb1WlptWsDCa0wiRQQhK2mK8nuoe37m6tPUM0mKEvg5abU9xYRkWAcyHq+ nJTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712583200; x=1713188000; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zrdUC1hPh2LE19rU0ZTINljRQo+lSCt3O5UvjJMveH0=; b=aeqK4uWBeauAo3C92ijuzHQAMG3+zYKGkKvUNyf02XsF2m56efFMV8niEEt6S9Vt64 JYRlNa9SXIabwVaMelTFXlJkJQJyybUAtkwa71ZFXln2+zo2pLQSOr7CyWB/R4GtOsaR J2V7smCHj+c1Buq6c+AfY2wSk8roMIl3kJPX7fuBkE0Kx6TnYC8AYu0kV6mUtgQdO4D+ dovv1fDcRirGqWi4/BFyAxHV1bVmD6jKmDDx7JjZt6Ehpvu+PxWHdMxQOTV9bCdqZtXm B5t9Nf5MdeZqsEmxNZxbwuEZ/BVna8063XKt4DzYZXAoU5obJOULLy/auDN1cvxN+qyx 6Qow== X-Gm-Message-State: AOJu0Yx0zW+jwbTghsacAML4ItUMtoNQVQcEkWJDa/fDVAZ0D0AuoI9c u15xnVcP9mZaRyjfoRO8KxfEcabPkg147NOQm0e0Db4emo46A1RdAkSg4c7ifQ8df0yQ1h2IzyY oJjn6164YQtDkJ5q4oSK8C+Lg0lZaG8uQ X-Google-Smtp-Source: AGHT+IFUj3THuWpPZGcQcTvUtRecWHXPsu5pRjIEUOn+9T1t6Sjtg+Ga5GqKie90UkqLGw1IoXdjLcJW/Wxoe4EJNMo= X-Received: by 2002:a17:90a:4b46:b0:2a4:ac79:3f8d with SMTP id o6-20020a17090a4b4600b002a4ac793f8dmr3852182pjl.38.1712583199715; Mon, 08 Apr 2024 06:33:19 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dennis Mungai Date: Mon, 8 Apr 2024 16:32:42 +0300 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH] avformat/tls_mbedtls: Pass FLAG_NONBLOCK to underlying transport 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: Zhao Zhili 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: On Mon, 8 Apr 2024 at 16:26, Zhao Zhili wrote: > From: Zhao Zhili > > This fix rtmps failure since rtmps requires nonblocking read. > > Signed-off-by: Zhao Zhili > --- > libavformat/tls_mbedtls.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c > index 8503523b6d..f51cf43b1c 100644 > --- a/libavformat/tls_mbedtls.c > +++ b/libavformat/tls_mbedtls.c > @@ -309,6 +309,8 @@ static int tls_read(URLContext *h, uint8_t *buf, int > size) > TLSContext *tls_ctx = h->priv_data; > int ret; > > + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK; > + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK; > if ((ret = mbedtls_ssl_read(&tls_ctx->ssl_context, buf, size)) > 0) { > // return read length > return ret; > @@ -322,6 +324,8 @@ static int tls_write(URLContext *h, const uint8_t > *buf, int size) > TLSContext *tls_ctx = h->priv_data; > int ret; > > + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK; > + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK; > if ((ret = mbedtls_ssl_write(&tls_ctx->ssl_context, buf, size)) > 0) { > // return written length > return ret; > -- > 2.25.1 > Are other TLS layers affected, say OpenSSL, etc? _______________________________________________ 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".