From d9d71f3ef1201b2cce5db6ccef70c4ee5e1fe9d2 Mon Sep 17 00:00:00 2001
From: alterdekim <alterwain@protonmail.com>
Date: Sun, 17 Nov 2024 22:56:48 +0300
Subject: [PATCH] Trying to avoid AlreadyExists error. 	modified:  
 src/client.rs 	modified:   src/server.rs

---
 src/client.rs | 15 +++++++++++++--
 src/server.rs | 10 ++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/client.rs b/src/client.rs
index adc15d5..9b48c51 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -13,8 +13,13 @@ pub mod general {
     
     use x25519_dalek::{PublicKey, StaticSecret};
     use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable};
+    
+    #[cfg(not(target_os = "linux"))]
     use tun::{DeviceReader, DeviceWriter};
 
+    #[cfg(target_os = "linux")]
+    use tun2::{DeviceReader, DeviceWriter};
+
     pub trait ReadWrapper {
         async fn read(&mut self, buf: &mut [u8]) -> Result<usize, ()>;
     }
@@ -277,6 +282,12 @@ pub mod desktop {
     #[cfg(target_os = "linux")]
     use network_interface::{NetworkInterface, NetworkInterfaceConfig};
 
+    #[cfg(target_os = "linux")]
+    use tun2::{ Configuration, create_as_async };
+
+    #[cfg(not(target_os = "linux"))]
+    use tun::{ Configuration, create_as_async };
+
 
     #[cfg(target_os = "linux")]
     fn configure_routes(endpoint_ip: &str, s_interface: Option<String>) {
@@ -343,7 +354,7 @@ pub mod desktop {
     impl VpnClient for DesktopClient {
         async fn start(&self) {
             info!("s_interface: {:?}", &self.s_interface);
-            let mut config = tun::Configuration::default();
+            let mut config = Configuration::default();
             config.address(&self.client_config.client.address)
                 .netmask("255.255.255.255")
                 .destination(&self.client_config.client.address)
@@ -361,7 +372,7 @@ pub mod desktop {
             sock.connect(&self.client_config.server.endpoint).await.unwrap();
             
             info!("AsyncDevice");
-            let dev = tun::create_as_async(&config).unwrap();
+            let dev = create_as_async(&config).unwrap();
             info!("Split device");
             let (dev_writer, dev_reader) = dev.split().unwrap();
             info!("CoreVpnClient");
diff --git a/src/server.rs b/src/server.rs
index f8b98c6..1ff3877 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -10,6 +10,12 @@ use std::collections::HashMap;
 use aes_gcm::{ aead::{Aead, AeadCore, KeyInit, OsRng},
 Aes256Gcm, Nonce };
 
+#[cfg(target_os = "linux")]
+use tun2::{Configuration, create_as_async};
+
+#[cfg(not(target_os = "linux"))]
+use tun::{Configuration, create_as_async};
+
 #[cfg(target_os = "linux")]
 use network_interface::{NetworkInterface, NetworkInterfaceConfig};
 
@@ -85,13 +91,13 @@ fn configure_routes(s_interface: Option<&str>) {
 pub async fn server_mode(server_config: ServerConfiguration, s_interface: Option<&str>) {
     info!("Starting server...");
     
-    let mut config = tun::Configuration::default();
+    let mut config = Configuration::default();
     config.address(&server_config.interface.internal_address)
         .netmask("255.255.255.0")
         .tun_name("tun0")
         .up();
 
-    let dev = tun::create_as_async(&config).unwrap();
+    let dev = create_as_async(&config).unwrap();
     let (mut dev_writer, mut dev_reader) = dev.into_framed().split();
 
     let sock = UdpSocket::bind(&server_config.interface.bind_address).await.unwrap();