From 3fae9285cc89c4fd99a2c40af4991052e44a9f89 Mon Sep 17 00:00:00 2001 From: Jacek Chmielewski Date: Tue, 23 Apr 2024 12:03:06 +0200 Subject: [PATCH 1/2] feat: allow domain as endpoint address --- src-tauri/Cargo.lock | 4 ++-- src-tauri/Cargo.toml | 2 +- src-tauri/src/utils.rs | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 070ec4fe..b785881c 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3051,9 +3051,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "libc", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 916c0b5e..d984ca5a 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -19,7 +19,7 @@ anyhow = "1.0" base64 = "0.21" clap = { version = "4.4", features = ["derive", "env"] } chrono = { version = "0.4", features = ["serde"] } -defguard_wireguard_rs = { git = "https://github.com/DefGuard/wireguard-rs.git", rev = "v0.4.1" } +defguard_wireguard_rs = { git = "https://github.com/DefGuard/wireguard-rs.git", rev = "v0.4.3" } dirs = "5.0" lazy_static = "1.4" local-ip-address = "0.5" diff --git a/src-tauri/src/utils.rs b/src-tauri/src/utils.rs index bfd4bd8f..b0023c2f 100644 --- a/src-tauri/src/utils.rs +++ b/src-tauri/src/utils.rs @@ -50,8 +50,7 @@ pub async fn setup_interface( let mut peer = Peer::new(peer_key); debug!("Parsing location endpoint: {}", location.endpoint); - let endpoint: SocketAddr = location.endpoint.parse()?; - peer.endpoint = Some(endpoint); + peer.set_endpoint(&location.endpoint)?; peer.persistent_keepalive_interval = Some(25); if let Some(psk) = preshared_key { @@ -272,8 +271,7 @@ pub async fn setup_interface_tunnel( let mut peer = Peer::new(peer_key); debug!("Parsing location endpoint: {}", tunnel.endpoint); - let endpoint: SocketAddr = tunnel.endpoint.parse()?; - peer.endpoint = Some(endpoint); + peer.set_endpoint(&tunnel.endpoint)?; peer.persistent_keepalive_interval = Some( tunnel .persistent_keep_alive From 2662a1917e49680a7e92012c5957c85d6110891a Mon Sep 17 00:00:00 2001 From: Jacek Chmielewski Date: Thu, 25 Apr 2024 16:29:44 +0200 Subject: [PATCH 2/2] Update lockfile --- src-tauri/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index b785881c..b8b8636e 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1224,8 +1224,8 @@ dependencies = [ [[package]] name = "defguard_wireguard_rs" -version = "0.4.1" -source = "git+https://github.com/DefGuard/wireguard-rs.git?rev=v0.4.1#d253efcd22197a9e1abcece2f28a78260431c7da" +version = "0.4.3" +source = "git+https://github.com/DefGuard/wireguard-rs.git?rev=v0.4.3#799775e4a76ee5f0c1f3af57fd9a65032ed23876" dependencies = [ "base64 0.21.6", "libc",