luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-06-07 23:27:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Restore network configuration on Drop

Browse source
This commit is contained in:
B. Blechschmidt 2023-03-25 21:41:40 +01:00
parent e4d4e0965e
commit 4a48b297f3
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/setup.rs
View file

@ -95,7 +95,7 @@ impl Setup {
let mut f = std::fs::File::from_raw_fd(fd);
f.write_all("nameserver 198.18.0.1\n".as_bytes())?;
mem::forget(f);
if libc::fchmod(fd, 0o644) == -1 {
if libc::fchmod(fd, 0o444) == -1 {
return Err("Failed to change ownership of /etc/resolv.conf".into());
}
let fd_path = format!("/proc/self/fd/{}", fd);
@ -133,10 +133,13 @@ impl Setup {
Ok(())
}
fn shutdown(tun_name: String) {
let _ = Command::new("ip")
.args(["link", "del", tun_name.as_str()])
.output();
fn shutdown(&self) {
Self::shutdown_with_args(&self.tun);
}
fn shutdown_with_args(tun_name: &str) {
log::info!("Restoring network configuration");
let _ = Command::new("ip").args(["link", "del", tun_name]).output();
unsafe {
let umount_path = CString::new("/etc/resolv.conf").unwrap();
libc::umount(umount_path.as_ptr());
@ -155,7 +158,7 @@ impl Setup {
let tun_name = self.tun.clone();
// TODO: This is not optimal.
ctrlc::set_handler(move || {
Self::shutdown(tun_name.clone());
Self::shutdown_with_args(&tun_name);
std::process::exit(0);
})?;
@ -178,3 +181,9 @@ impl Setup {
Ok(())
}
}
impl Drop for Setup {
fn drop(&mut self) {
self.shutdown();
}
}