luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-05-14 05:52:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Make close_fd_on_drop configurable (#132)

Browse source
This commit is contained in:
BlackbirdBop 2024-07-18 20:01:11 +09:00 • committed by GitHub
parent 15fe95a2c6
commit 635c7e557f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/args.rs
View file

@ -23,9 +23,17 @@ pub struct Args {
pub tun: Option<String>,
/// File descriptor of the tun interface
#[cfg(unix)]
#[arg(long, value_name = "fd", conflicts_with = "tun")]
pub tun_fd: Option<i32>,
/// Set whether to close the received raw file descriptor on drop or not.
/// This setting is passed to the tun2 crate.
/// See [tun2::Configuration::close_fd_on_drop].
#[cfg(unix)]
#[arg(long, conflicts_with = "tun")]
pub close_fd_on_drop: Option<bool>,
/// Create a tun interface in a newly created unprivileged namespace
/// while maintaining proxy connectivity via the global network namespace.
#[cfg(target_os = "linux")]
@ -104,7 +112,10 @@ impl Default for Args {
Args {
proxy: ArgProxy::default(),
tun: None,
#[cfg(unix)]
tun_fd: None,
#[cfg(unix)]
close_fd_on_drop: None,
#[cfg(target_os = "linux")]
unshare: false,
#[cfg(target_os = "linux")]
@ -148,11 +159,18 @@ impl Args {
self
}
#[cfg(unix)]
pub fn tun_fd(&mut self, tun_fd: Option<i32>) -> &mut Self {
self.tun_fd = tun_fd;
self
}
#[cfg(unix)]
pub fn close_fd_on_drop(&mut self, close_fd_on_drop: bool) -> &mut Self {
self.close_fd_on_drop = Some(close_fd_on_drop);
self
}
pub fn verbosity(&mut self, verbosity: ArgVerbosity) -> &mut Self {
self.verbosity = verbosity;
self