From 5ba7bf2e1830eefa66988dc8dcbe0bff270201a8 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Tue, 15 Jul 2025 22:02:50 +0800 Subject: [PATCH] feat: add the `--force-dpd` option gh-519 --- apps/gpclient/src/connect.rs | 4 ++++ crates/openconnect/src/ffi/mod.rs | 2 ++ crates/openconnect/src/ffi/vpn.c | 5 +++++ crates/openconnect/src/ffi/vpn.h | 2 ++ crates/openconnect/src/vpn.rs | 12 ++++++++++++ 5 files changed, 25 insertions(+) diff --git a/apps/gpclient/src/connect.rs b/apps/gpclient/src/connect.rs index dd6d1e4..551f0fd 100644 --- a/apps/gpclient/src/connect.rs +++ b/apps/gpclient/src/connect.rs @@ -96,6 +96,9 @@ pub(crate) struct ConnectArgs { #[arg(long, help = "Disable DTLS and ESP")] no_dtls: bool, + #[arg(long = "force-dpd", help = "Same as the '--force-dpd' option in the openconnect command")] + dpd_interval: Option, + #[cfg(feature = "webview-auth")] #[arg(long, help = "The HiDPI mode, useful for high-resolution screens")] hidpi: bool, @@ -328,6 +331,7 @@ impl<'a> ConnectHandler<'a> { .mtu(mtu) .disable_ipv6(self.args.disable_ipv6) .no_dtls(self.args.no_dtls) + .dpd_interval(self.args.dpd_interval.unwrap_or(0)) .build()?; let vpn = Arc::new(vpn); diff --git a/crates/openconnect/src/ffi/mod.rs b/crates/openconnect/src/ffi/mod.rs index 2a215fd..1c00631 100644 --- a/crates/openconnect/src/ffi/mod.rs +++ b/crates/openconnect/src/ffi/mod.rs @@ -26,6 +26,8 @@ pub(crate) struct ConnectOptions { pub mtu: u32, pub disable_ipv6: u32, pub no_dtls: u32, + + pub dpd_interval: u32, } #[link(name = "vpn")] diff --git a/crates/openconnect/src/ffi/vpn.c b/crates/openconnect/src/ffi/vpn.c index 5b34158..26885de 100644 --- a/crates/openconnect/src/ffi/vpn.c +++ b/crates/openconnect/src/ffi/vpn.c @@ -66,6 +66,7 @@ int vpn_connect(const vpn_options *options, vpn_connected_callback callback) INFO("MTU: %d", options->mtu); INFO("DISABLE_IPV6: %d", options->disable_ipv6); INFO("NO_DTLS: %d", options->no_dtls); + INFO("DPD_INTERVAL: %d", options->dpd_interval); vpninfo = openconnect_vpninfo_new(options->user_agent, validate_peer_cert, NULL, NULL, print_progress, NULL); @@ -106,6 +107,10 @@ int vpn_connect(const vpn_options *options, vpn_connected_callback callback) openconnect_disable_ipv6(vpninfo); } + if (options->dpd_interval > 0) { + openconnect_set_dpd(vpninfo, options->dpd_interval); + } + g_cmd_pipe_fd = openconnect_setup_cmd_pipe(vpninfo); if (g_cmd_pipe_fd < 0) { ERROR("openconnect_setup_cmd_pipe failed"); diff --git a/crates/openconnect/src/ffi/vpn.h b/crates/openconnect/src/ffi/vpn.h index 3b3c484..2650e8c 100644 --- a/crates/openconnect/src/ffi/vpn.h +++ b/crates/openconnect/src/ffi/vpn.h @@ -27,6 +27,8 @@ typedef struct vpn_options const int mtu; const int disable_ipv6; const int no_dtls; + + const int dpd_interval; } vpn_options; int vpn_connect(const vpn_options *options, vpn_connected_callback callback); diff --git a/crates/openconnect/src/vpn.rs b/crates/openconnect/src/vpn.rs index bd4c11b..92ab34f 100644 --- a/crates/openconnect/src/vpn.rs +++ b/crates/openconnect/src/vpn.rs @@ -31,6 +31,8 @@ pub struct Vpn { disable_ipv6: bool, no_dtls: bool, + dpd_interval: u32, + callback: OnConnectedCallback, } @@ -81,6 +83,7 @@ impl Vpn { mtu: self.mtu, disable_ipv6: self.disable_ipv6 as u32, no_dtls: self.no_dtls as u32, + dpd_interval: self.dpd_interval, } } @@ -131,6 +134,8 @@ pub struct VpnBuilder { mtu: u32, disable_ipv6: bool, no_dtls: bool, + + dpd_interval: u32, } impl VpnBuilder { @@ -155,6 +160,7 @@ impl VpnBuilder { mtu: 0, disable_ipv6: false, no_dtls: false, + dpd_interval: 0, } } @@ -223,6 +229,11 @@ impl VpnBuilder { self } + pub fn dpd_interval(mut self, dpd_interval: u32) -> Self { + self.dpd_interval = dpd_interval; + self + } + pub fn build(self) -> Result { let script = match self.script { Some(script) => { @@ -259,6 +270,7 @@ impl VpnBuilder { mtu: self.mtu, disable_ipv6: self.disable_ipv6, no_dtls: self.no_dtls, + dpd_interval: self.dpd_interval, callback: Default::default(), })