diff --git a/src/client.rs b/src/client.rs index f0f613f..adc15d5 100644 --- a/src/client.rs +++ b/src/client.rs @@ -13,7 +13,7 @@ pub mod general { use x25519_dalek::{PublicKey, StaticSecret}; use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable}; - use tun2::{DeviceReader, DeviceWriter}; + use tun::{DeviceReader, DeviceWriter}; pub trait ReadWrapper { async fn read(&mut self, buf: &mut [u8]) -> Result; @@ -343,7 +343,7 @@ pub mod desktop { impl VpnClient for DesktopClient { async fn start(&self) { info!("s_interface: {:?}", &self.s_interface); - let mut config = tun2::Configuration::default(); + let mut config = tun::Configuration::default(); config.address(&self.client_config.client.address) .netmask("255.255.255.255") .destination(&self.client_config.client.address) @@ -361,7 +361,7 @@ pub mod desktop { sock.connect(&self.client_config.server.endpoint).await.unwrap(); info!("AsyncDevice"); - let dev = tun2::create_as_async(&config).unwrap(); + let dev = tun::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 56b6c94..f8b98c6 100644 --- a/src/server.rs +++ b/src/server.rs @@ -85,13 +85,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 = tun2::Configuration::default(); + let mut config = tun::Configuration::default(); config.address(&server_config.interface.internal_address) .netmask("255.255.255.0") .tun_name("tun0") .up(); - let dev = tun2::create_as_async(&config).unwrap(); + let dev = tun::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();