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 13E76675F1 for ; Tue, 12 Jan 2021 14:58:35 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 111BE26935 for ; Tue, 12 Jan 2021 14:58:35 +0100 (CET) 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 8737A2636A for ; Tue, 12 Jan 2021 14:58:34 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4A99B45637 for ; Tue, 12 Jan 2021 14:58:34 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 12 Jan 2021 14:58:13 +0100 Message-Id: <20210112135830.2798301-4-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> References: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.224 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years 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_PASS -0.001 SPF: sender matches 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 3/4] update to tokio 1.0 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, 12 Jan 2021 13:58:35 -0000 Signed-off-by: Fabian Grünbichler --- proxmox/src/tools/websocket.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/proxmox/src/tools/websocket.rs b/proxmox/src/tools/websocket.rs index f1cefd6..1d90bd2 100644 --- a/proxmox/src/tools/websocket.rs +++ b/proxmox/src/tools/websocket.rs @@ -16,7 +16,7 @@ use hyper::header::{ SEC_WEBSOCKET_PROTOCOL, SEC_WEBSOCKET_VERSION, UPGRADE, }; use hyper::{Body, Response, StatusCode}; -use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}; +use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf}; use tokio::sync::mpsc; use futures::future::FutureExt; @@ -528,10 +528,9 @@ impl AsyncRead for WebSocketReader fn poll_read( self: Pin<&mut Self>, cx: &mut Context, - buf: &mut [u8], - ) -> Poll> { + buf: &mut ReadBuf, + ) -> Poll> { let this = Pin::get_mut(self); - let mut offset = 0; loop { match &mut this.state { @@ -569,7 +568,7 @@ impl AsyncRead for WebSocketReader this.read_buffer = Some(buffer); this.state = ReaderState::HaveData; if len == 0 { - return Poll::Ready(Ok(0)); + return Poll::Ready(Ok(())); } } Err(err) => return Poll::Ready(Err(err)), @@ -627,14 +626,13 @@ impl AsyncRead for WebSocketReader } let len = min( - buf.len() - offset, + buf.remaining(), min(header.payload_len, read_buffer.len()), ); let mut data = read_buffer.remove_data(len); mask_bytes(header.mask, &mut data); - buf[offset..offset + len].copy_from_slice(&data); - offset += len; + buf.put_slice(&data); header.payload_len -= len; @@ -649,8 +647,8 @@ impl AsyncRead for WebSocketReader }; this.read_buffer = Some(read_buffer); - if offset > 0 { - return Poll::Ready(Ok(offset)); + if len > 0 { + return Poll::Ready(Ok(())); } } } -- 2.20.1