[pve-devel] [PATCH proxmox-backup-qemu 1/2] update to proxmox-backup 0.9.1

[Fabian Grünbichler]

and pass along any port set in the repository string

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
Note: to switch to current proxmox 0.5.0, proxmox-backup needs to be
bumped first.. no changes are needed in proxmox-backup-qemu to build
with current master.

 Cargo.toml     | 4 ++--
 src/backup.rs  | 2 +-
 src/lib.rs     | 3 +++
 src/restore.rs | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 043ae96..d51ba93 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,8 +23,8 @@ lazy_static = "1.4"
 libc = "0.2"
 once_cell = "1.3.1"
 openssl = "0.10"
-proxmox = { version = "0.4.1", features = [ "sortable-macro", "api-macro" ] }
-proxmox-backup = { git = "git://git.proxmox.com/git/proxmox-backup.git", tag = "v0.8.21" }
+proxmox = { version = "0.4.3", features = [ "sortable-macro", "api-macro" ] }
+proxmox-backup = { git = "git://git.proxmox.com/git/proxmox-backup.git", tag = "v0.9.1" }
 #proxmox-backup = { path = "../proxmox-backup" }
 serde_json = "1.0"
 tokio = { version = "0.2.9", features = [ "blocking", "fs", "io-util", "macros", "rt-threaded", "signal", "stream", "tcp", "time", "uds" ] }
diff --git a/src/backup.rs b/src/backup.rs
index 9f8a240..7945575 100644
--- a/src/backup.rs
+++ b/src/backup.rs
@@ -112,7 +112,7 @@ impl BackupTask {
                 .fingerprint(self.setup.fingerprint.clone())
                 .password(self.setup.password.clone());
 
-            let http = HttpClient::new(&self.setup.host, &self.setup.user, options)?;
+            let http = HttpClient::new(&self.setup.host, self.setup.port, &self.setup.user, options)?;
             let writer = BackupWriter::start(
                 http, self.crypt_config.clone(), &self.setup.store, "vm", &self.setup.backup_id,
                 self.setup.backup_time, false, false).await?;
diff --git a/src/lib.rs b/src/lib.rs
index 08cac4c..b9ca905 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -114,6 +114,7 @@ pub extern "C" fn proxmox_backup_snapshot_string(
 #[derive(Clone)]
 pub(crate) struct BackupSetup {
     pub host: String,
+    pub port: u16,
     pub store: String,
     pub user: Userid,
     pub chunk_size: u64,
@@ -221,6 +222,7 @@ pub extern "C" fn proxmox_backup_new(
 
         let setup = BackupSetup {
             host: repo.host().to_owned(),
+            port: repo.port(),
             user: repo.user().to_owned(),
             store: repo.store().to_owned(),
             chunk_size: if chunk_size > 0 { chunk_size } else { PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE },
@@ -693,6 +695,7 @@ pub extern "C" fn proxmox_restore_new(
 
         let setup = BackupSetup {
             host: repo.host().to_owned(),
+            port: repo.port(),
             user: repo.user().to_owned(),
             store: repo.store().to_owned(),
             chunk_size: PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE, // not used by restore
diff --git a/src/restore.rs b/src/restore.rs
index fb779ca..4387025 100644
--- a/src/restore.rs
+++ b/src/restore.rs
@@ -80,7 +80,7 @@ impl RestoreTask {
             .fingerprint(self.setup.fingerprint.clone())
             .password(self.setup.password.clone());
 
-        let http = HttpClient::new(&self.setup.host, &self.setup.user, options)?;
+        let http = HttpClient::new(&self.setup.host, self.setup.port, &self.setup.user, options)?;
         let client = BackupReader::start(
             http,
             self.crypt_config.clone(),
-- 
2.20.1