Updated dependencies, fixed intermittent bug with keepalive counter i…

…n SSL tunnel

snx-rs-gui/Cargo.toml

@@ -24,5 +24,5 @@ tokio = { version = "1", features = ["rt-multi-thread"] }
 ipnet = {  version = "2", features = ["serde"] }
 clap = { version = "4", features = ["derive"] }
 hex = "0.4"
-zbus = { version = "4.2", default-features = false, features = ["tokio"] }
+zbus = { version = "5", default-features = false, features = ["tokio"] }
 futures = "0.3"

snx-rs-gui/src/dbus.rs

@@ -9,7 +9,7 @@ use zbus::{zvariant, Connection};
     default_service = "org.freedesktop.portal.Desktop",
     default_path = "/org/freedesktop/portal/desktop"
 )]
-trait DesktopSettings {
+pub trait DesktopSettings {
     #[zbus(signal)]
     fn setting_changed(&self, namespace: &str, key: &str, value: zvariant::Value<'_>) -> zbus::Result<()>;
 

snxcore/Cargo.toml

@@ -24,7 +24,7 @@ reqwest = { version = "0.12", features = ["native-tls"] }
 futures = "0.3"
 bytes = "1"
 hex = "0.4"
-tun = { version = "0.6", features = ["async"] }
+tun = { version = "0.7", features = ["async"] }
 ipnet = {  version = "2", features = ["serde"] }
 libc = "0.2"
 base64 = "0.22"
@@ -42,7 +42,7 @@ byteorder = "1"
 regex = "1"
 once_cell = "1"
 nix = { version = "0.29", features = ["fs", "user"] }
-zbus = { version = "4.2", default-features = false, features = ["tokio"] }
+zbus = { version = "5", default-features = false, features = ["tokio"] }
 secret-service = {  version = "4", features = ["rt-tokio-crypto-rust"] }
 uuid = { version = "1", features = ["v4", "v5"] }
 opener = { version = "0.7"}

snxcore/src/platform/linux.rs

@@ -67,11 +67,11 @@ impl UdpSocketExt for UdpSocket {
 }
 
 pub fn new_tun_config() -> tun::Configuration {
-    let mut config = tun::Configuration::default();
+    let config = tun::Configuration::default();
 
-    config.platform(|config| {
-        config.packet_information(true);
-    });
+    // config.platform_config(|config| {
+    //     config.packet_information(true);
+    // });
 
     config
 }

snxcore/src/tunnel/ssl.rs

@@ -1,6 +1,6 @@
 use std::{
     sync::{
-        atomic::{AtomicU64, Ordering},
+        atomic::{AtomicI64, Ordering},
         Arc,
     },
     time::Duration,
@@ -14,7 +14,6 @@ use futures::{
 use tokio::io::{AsyncRead, AsyncWrite};
 use tokio_native_tls::native_tls::{Certificate, TlsConnector};
 use tracing::{debug, trace, warn};
-use tun::TunPacket;
 
 use codec::{SslPacketCodec, SslPacketType};
 
@@ -73,7 +72,7 @@ pub(crate) struct SslTunnel {
     device_name: String,
     sender: PacketSender,
     receiver: Option<PacketReceiver>,
-    keepalive_counter: Arc<AtomicU64>,
+    keepalive_counter: Arc<AtomicI64>,
 }
 
 impl SslTunnel {
@@ -113,7 +112,7 @@ impl SslTunnel {
             device_name: String::new(),
             sender,
             receiver: Some(receiver),
-            keepalive_counter: Arc::new(AtomicU64::default()),
+            keepalive_counter: Arc::new(AtomicI64::default()),
         })
     }
 
@@ -225,8 +224,7 @@ impl VpnTunnel for SslTunnel {
                         }
                     }
                     SslPacketType::Data(data) => {
-                        let tun_packet = TunPacket::new(data);
-                        tun_sender.send(tun_packet).await?;
+                        tun_sender.send(data).await?;
                         keepalive_counter.store(0, Ordering::SeqCst);
                     }
                 }
@@ -261,8 +259,7 @@ impl VpnTunnel for SslTunnel {
 
                 result = tun_receiver.next() => {
                     if let Some(Ok(item)) = result {
-                        let data = item.into_bytes().to_vec();
-                        self.send(data).await?;
+                        self.send(item).await?;
                     } else {
                         break Err(anyhow!("Receive failed"));
                     }

snxcore/src/tunnel/ssl/device.rs

@@ -1,12 +1,11 @@
 use std::net::Ipv4Addr;
 
-use tracing::debug;
-use tun::Device;
-
 use crate::{
     model::{params::TunnelParams, proto::HelloReplyData},
     platform, util,
 };
+use tracing::debug;
+use tun::AbstractDevice;
 
 pub struct TunDevice {
     inner: tun::AsyncDevice,
@@ -21,15 +20,15 @@ impl TunDevice {
         let ipaddr = reply.office_mode.ipaddr.parse::<Ipv4Addr>()?;
 
         config.address(reply.office_mode.ipaddr.as_str()).up();
-        config.name(name);
+        config.tun_name(name);
 
         if let Some(ref netmask) = reply.optional {
             config.netmask(netmask.subnet.as_str());
         }
 
         let dev = tun::create_as_async(&config)?;
 
-        let dev_name = dev.get_ref().name()?;
+        let dev_name = dev.tun_name()?;
 
         debug!("Created tun device: {dev_name}");
 

snxcore/src/tunnel/ssl/keepalive.rs

@@ -1,6 +1,6 @@
 use std::{
     sync::{
-        atomic::{AtomicU64, Ordering},
+        atomic::{AtomicI64, Ordering},
         Arc,
     },
     time::Duration,
@@ -15,17 +15,17 @@ use crate::{
     tunnel::ssl::PacketSender,
 };
 
-const KEEPALIVE_MAX_RETRIES: u64 = 3;
+const KEEPALIVE_MAX_RETRIES: i64 = 3;
 const SEND_TIMEOUT: Duration = Duration::from_secs(10);
 
 pub struct KeepaliveRunner {
     interval: Duration,
     sender: PacketSender,
-    keepalive_counter: Arc<AtomicU64>,
+    keepalive_counter: Arc<AtomicI64>,
 }
 
 impl KeepaliveRunner {
-    pub fn new(interval: Duration, sender: PacketSender, counter: Arc<AtomicU64>) -> Self {
+    pub fn new(interval: Duration, sender: PacketSender, counter: Arc<AtomicI64>) -> Self {
         Self {
             interval,
             sender,