Merge pull request #113 from DefGuard/defguard-boringtun

j-chmielewski · web-flow · commit 108c4edf1177 · 2025-12-09T11:18:29.000+01:00
Remove boringtun submodule and use published version of defguard_boringtun
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "boringtun"]
-	path = boringtun
-	url = ../boringtun.git
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,9 +25,9 @@ tracing = "0.1"
 tracing-subscriber = "0.3"
 
 [target.'cfg(unix)'.dependencies]
-boringtun = { path = "boringtun/boringtun", default-features = false, features = [
+defguard_boringtun = { version = "0.6.0", default-features = false, features = [
     "device",
-] }
+]}
 libc = { version = "0.2", default-features = false }
 nix = { version = "0.30", features = ["ioctl", "socket"] }
 
diff --git a/boringtun b/boringtun
diff --git a/src/error.rs b/src/error.rs
@@ -49,5 +49,5 @@ pub enum WireguardInterfaceError {
     WindowsError(#[from] WindowsError),
     #[cfg(unix)]
     #[error("BoringTun {0}")]
-    BoringTun(#[from] boringtun::device::Error),
+    BoringTun(#[from] defguard_boringtun::device::Error),
 }
diff --git a/src/wgapi.rs b/src/wgapi.rs
@@ -2,7 +2,7 @@
 use std::marker::PhantomData;
 
 #[cfg(unix)]
-use boringtun::device::DeviceHandle;
+use defguard_boringtun::device::DeviceHandle;
 #[cfg(target_os = "windows")]
 use wireguard_nt::Adapter;
 
diff --git a/src/wgapi_userspace.rs b/src/wgapi_userspace.rs
@@ -6,7 +6,7 @@ use std::{
     time::Duration,
 };
 
-use boringtun::device::{DeviceConfig, DeviceHandle};
+use defguard_boringtun::device::{DeviceConfig, DeviceHandle};
 
 #[cfg(target_os = "linux")]
 use crate::netlink;

Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,5 @@ pub enum WireguardInterfaceError {`
`49`	`49`	`WindowsError(#[from] WindowsError),`
`50`	`50`	`#[cfg(unix)]`
`51`	`51`	`#[error("BoringTun {0}")]`
`52`		`- BoringTun(#[from] boringtun::device::Error),`
	`52`	`+ BoringTun(#[from] defguard_boringtun::device::Error),`
`53`	`53`	`}`