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 E08E770ABC for ; Fri, 14 May 2021 15:45:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D6B4317BE3 for ; Fri, 14 May 2021 15:45:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 948F817B5A for ; Fri, 14 May 2021 15:45:12 +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 6E18146566 for ; Fri, 14 May 2021 15:45:12 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 14 May 2021 15:44:50 +0200 Message-Id: <20210514134457.1447930-15-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210514134457.1447930-1-f.gruenbichler@proxmox.com> References: <20210514134457.1447930-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.013 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [proxmox.com, node.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/8] move websocket to new 'proxmox_http' crate 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: Fri, 14 May 2021 13:45:43 -0000 Signed-off-by: Fabian Grünbichler --- Notes: requires patch #3 in proxmox Cargo.toml | 5 +++-- debian/control | 3 ++- src/api2/node.rs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index cd99241e..997017c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,10 +53,11 @@ percent-encoding = "2.1" pin-utils = "0.1.0" pin-project = "1.0" pathpatterns = "0.1.2" -proxmox = { version = "0.11.4", features = [ "sortable-macro", "api-macro", "websocket" ] } +proxmox = { version = "0.11.4", features = [ "sortable-macro", "api-macro" ] } #proxmox = { git = "git://git.proxmox.com/git/proxmox", version = "0.1.2", features = [ "sortable-macro", "api-macro" ] } -#proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro", "websocket" ] } +#proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro" ] } proxmox-fuse = "0.1.1" +proxmox-http = { version = "0.1.0", path = "../proxmox/proxmox-http", features = [ "websocket" ] } pxar = { version = "0.10.1", features = [ "tokio-io" ] } #pxar = { path = "../pxar", features = [ "tokio-io" ] } regex = "1.2" diff --git a/debian/control b/debian/control index 3f1edba8..a02518fe 100644 --- a/debian/control +++ b/debian/control @@ -42,9 +42,10 @@ Build-Depends: debhelper (>= 11), librust-proxmox-0.11+api-macro-dev (>= 0.11.4-~~), librust-proxmox-0.11+default-dev (>= 0.11.4-~~), librust-proxmox-0.11+sortable-macro-dev (>= 0.11.4-~~), - librust-proxmox-0.11+websocket-dev (>= 0.11.4-~~), librust-proxmox-acme-rs-0.2+default-dev (>= 0.2.1-~~), librust-proxmox-fuse-0.1+default-dev (>= 0.1.1-~~), + librust-proxmox-http-0.1+default-dev, + librust-proxmox-http-0.1+websocket-dev, librust-pxar-0.10+default-dev (>= 0.10.1-~~), librust-pxar-0.10+tokio-io-dev (>= 0.10.1-~~), librust-regex-1+default-dev (>= 1.2-~~), diff --git a/src/api2/node.rs b/src/api2/node.rs index 75271cd5..af9ecf69 100644 --- a/src/api2/node.rs +++ b/src/api2/node.rs @@ -17,7 +17,7 @@ use proxmox::api::{ api, schema::*, ApiHandler, ApiMethod, ApiResponseFuture, Permission, RpcEnvironment, }; use proxmox::list_subdirs_api_method; -use proxmox::tools::websocket::WebSocket; +use proxmox_http::websocket::WebSocket; use proxmox::{identity, sortable}; use crate::api2::types::*; -- 2.20.1