From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 571B862DAC for ; Tue, 14 Jul 2020 13:10:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 54FB22617A for ; Tue, 14 Jul 2020 13:10:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 2BD2A26123 for ; Tue, 14 Jul 2020 13:09:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E747A444B4 for ; Tue, 14 Jul 2020 13:09:57 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 14 Jul 2020 13:09:52 +0200 Message-Id: <20200714110957.31884-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200714110957.31884-1-d.csapak@proxmox.com> References: <20200714110957.31884-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [websocket.rs] Subject: [pbs-devel] [PATCH proxmox 4/9] proxmox/tools/websocket: correctly return eof X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jul 2020 11:10:00 -0000 only return Ok(0) when the upstream reader did return that, not when we have no data in the buffer, else the downstream reader believes we are EOF (even if we are not) Signed-off-by: Dominik Csapak --- proxmox/src/tools/websocket.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/proxmox/src/tools/websocket.rs b/proxmox/src/tools/websocket.rs index c30293f..d59b7ad 100644 --- a/proxmox/src/tools/websocket.rs +++ b/proxmox/src/tools/websocket.rs @@ -432,7 +432,7 @@ impl WebSocketReader { enum ReaderState { NoData, - WaitingForData(Pin> + Send + 'static>>), + WaitingForData(Pin> + Send + 'static>>), HaveData, } @@ -463,18 +463,20 @@ impl AsyncRead for WebSocketReader let future = async move { buffer.read_from_async(&mut reader) .await - .map(move |_| (reader, buffer)) + .map(move |len| (len, reader, buffer)) }; this.state = ReaderState::WaitingForData(future.boxed()); }, ReaderState::WaitingForData(ref mut future) => { match ready!(future.as_mut().poll(cx)) { - Ok((reader, buffer)) => { + Ok((len, reader, buffer)) => { this.reader = Some(reader); this.read_buffer = Some(buffer); this.state = ReaderState::HaveData; - + if len == 0 { + return Poll::Ready(Ok(0)); + } }, Err(err) => return Poll::Ready(Err(Error::new(ErrorKind::Other, err))), } @@ -545,7 +547,9 @@ impl AsyncRead for WebSocketReader }; this.read_buffer = Some(read_buffer); - return Poll::Ready(Ok(offset)); + if offset > 0 { + return Poll::Ready(Ok(offset)); + } }, } } -- 2.20.1