From patchwork Mon May 23 10:44:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 35895 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1841900pzb; Mon, 23 May 2022 03:45:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg5a1GCSassnN37/hGmNGCBbllPeEAz2YHrFx5OhMLKdYeoVcX2iibeSbluocurBBVJfih X-Received: by 2002:a17:906:eca6:b0:6fe:9a39:f24a with SMTP id qh6-20020a170906eca600b006fe9a39f24amr17452546ejb.372.1653302704169; Mon, 23 May 2022 03:45:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653302704; cv=none; d=google.com; s=arc-20160816; b=pHFSDSIU1mnC6CzqCuI/TcX9KsYLbjaaCeyy5AS6AhQO+c99Or3dUzDJSnytUrANag hso8EiL8Ptp6ZwI/jZWR7IlJGI2VT8vs412Pqk5yPH0OrAFkkFL9XQX00YbaZ/O5pey1 h9RQeCfzwDnSoBromCvpjL28b8FKPIIIsvT7bF71AGD4SHMhLHNHx6qD6xYxEt6uKuK0 RjKYK8dXLfZuKGnp4AGWfe1xZ5dVMh+KxPtld8m0V4S6jwb+Pav2S8DKdgerEdCAOJvE JHvCpBbXfLIKMTXj5YCzcOc1Jaldmo8pVXCc1kFlSwn0sbdbfDrzGK5OSbTauMWfm27j yVBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=+i18uXij/ZkDeWLX9/riU/I8JRRSJt9/8IbBCUEzOLk=; b=YIs8CfKfm8LzlBg3DGCOsuTpaWQSHrG8+/a/ZKPACZ5AizHHtd2QLIj6ZmKKTblwzL tEakUyKNTf1P1tMxEfsyZM4opywdSW02vOFz3nvhZpfCHF0jZoquI9FSxMhHMOMDun82 SEgWDC65k3K9pCqeKtBcijUHWaPhEUuLIh0RmhTA3Yj5ZlpuZ502cQZSWTFvMlN/Lrkh PDJfj4lzSWfdY6NsJ8Sx9WortylmhZJLaxJgCYiIEoIfTaWYFi0j/41ieN1s9PLDYqdU 1XUWpQN/hI4jnT1P7n33UFoXLzm+8msNebLUPy11uYgepvwtGdWFFQnxX4CK4QFQY/Tj on3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oGKHzxH7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mp9-20020a1709071b0900b006f40c518d37si16035421ejc.964.2022.05.23.03.45.02; Mon, 23 May 2022 03:45:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oGKHzxH7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9F8C68B425; Mon, 23 May 2022 13:44:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E6BE68B2C7 for ; Mon, 23 May 2022 13:44:51 +0300 (EEST) Received: by mail-wr1-f49.google.com with SMTP id m20so9596741wrb.13 for ; Mon, 23 May 2022 03:44:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pzafliGiU1t5yIeM+WmU6VMCJ0okgW8OrOTeTcOyfYo=; b=oGKHzxH7tOE2Fs0/orhAPuRDLFo5zH3y8BKXx0e+0k+onkvHhBvJYDZPVG/Q0/K4hE KeTSiETOK6Y8gpGFLxXhhkGZyD6mxT3lWMqeSsn3BSX8Mo1eoTP/ZcCEnTfjQM7BZTKG wjaO/nZrm258mw8aCxR8GKKgezFfhovMBHmF9QbLRTHTy4pk+PnZskcdALXFMn9MMBu3 SOxZvJ/mRYF9Hx7M4DmI5TIIiSUCro91yA07vxBPFeSW6EnIr7buLY7EK3v/f9gn8Sb1 fwbhEjy/ufcWGsuFQJXOTO62UmnbBc+g7KL1QvFM8G4G74oPjEHKomK2WL9br8RLkB7v ra7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pzafliGiU1t5yIeM+WmU6VMCJ0okgW8OrOTeTcOyfYo=; b=h5KH5yD+VdSWLbWBlPjV86aRt0NLTl1FvvwMakS2lBBFVVGM1chFYuPmlH064uMu8k bYZMHmiIbMeVArGXmR9nWRFJ+FSBtsMKnf11M4QOvzKzAcWCCboe1IMxcKm9UZLF5dE8 1b+39RHLV4ast+QZRVectrypSiOzD8o5VcaCcJ/idWCQaVDrSI+Cgf30oTrhqIwlZ6iv tHjt2r6VPoI3L+LRexIn1YBrAY9Fje1jqbQBSfBYF/f7HMx2PM/JE2EwAyeW9KbaqFwx +UWQ4PZ54EHBqrwdXyGuTdzOoosQVY/1hrZa2I6XbimOsxRjMXJQxkKjjprcaLlSoXDN qLBg== X-Gm-Message-State: AOAM531FvUZwF5OBiGNmcduoercoQ5XNGUcHLtvYP/p+77PGIEBLnBzy pMG+bQPppRD3/hVEp04R0SMy4JWWguw= X-Received: by 2002:a05:6000:1acd:b0:20f:d7bc:e618 with SMTP id i13-20020a0560001acd00b0020fd7bce618mr5037288wry.417.1653302690796; Mon, 23 May 2022 03:44:50 -0700 (PDT) Received: from kusa.lan (lputeaux-656-1-153-220.w217-128.abo.wanadoo.fr. [217.128.47.220]) by smtp.gmail.com with ESMTPSA id t4-20020a1c7704000000b003942a244ed1sm8520242wmi.22.2022.05.23.03.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 03:44:50 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 May 2022 12:44:33 +0200 Message-Id: <20220523104433.201414-1-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/tls_libtls: handle TLS_WANT_{POLLIN, POLLOUT} in read/write functions 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: Matthieu Bouron Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xPDsOEmvD6Ek According to the tls documentation: tls_read() and tls_write() can return TLS_WANT_POLLIN and TLS_WANT_POLLOUT which indicates that the same operation must be repeated immediately. This commit prevents the libtls backend from failing when libtls returns TLS_WANT_POLLIN or TLS_WANT_POLLOUT with the following error: [tls @ 0x7f6e20005a00] (null) --- libavformat/tls_libtls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/tls_libtls.c b/libavformat/tls_libtls.c index 911c8094b0..22858d4867 100644 --- a/libavformat/tls_libtls.c +++ b/libavformat/tls_libtls.c @@ -158,6 +158,8 @@ static int ff_tls_read(URLContext *h, uint8_t *buf, int size) return ret; else if (ret == 0) return AVERROR_EOF; + else if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) + return AVERROR(EAGAIN); av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx)); return AVERROR(EIO); } @@ -171,6 +173,8 @@ static int ff_tls_write(URLContext *h, const uint8_t *buf, int size) return ret; else if (ret == 0) return AVERROR_EOF; + else if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) + return AVERROR(EAGAIN); av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx)); return AVERROR(EIO); }