From c1ab26aef36d5090cf548e4e072857125aa7a726 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Tue, 10 Jun 2025 22:12:14 +0800 Subject: [PATCH] feat: add the -i/--interface option (#512) --- apps/gpclient/src/connect.rs | 4 ++++ crates/openconnect/src/ffi/mod.rs | 1 + crates/openconnect/src/ffi/vpn.c | 4 +++- crates/openconnect/src/ffi/vpn.h | 1 + crates/openconnect/src/vpn.rs | 10 ++++++++++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/apps/gpclient/src/connect.rs b/apps/gpclient/src/connect.rs index d496e71..dd6d1e4 100644 --- a/apps/gpclient/src/connect.rs +++ b/apps/gpclient/src/connect.rs @@ -44,6 +44,9 @@ pub(crate) struct ConnectArgs { #[arg(long, short, help = "The VPNC script to use")] script: Option, + #[arg(long, short, help = "The IFNAME for tunnel interface")] + interface: Option, + #[arg(long, help = "Connect the server as a gateway, instead of a portal")] as_gateway: bool, @@ -313,6 +316,7 @@ impl<'a> ConnectHandler<'a> { let os = ClientOs::from(&self.args.os).to_openconnect_os().to_string(); let vpn = Vpn::builder(gateway, cookie) .script(self.args.script.clone()) + .interface(self.args.interface.clone()) .user_agent(self.args.user_agent.clone()) .os(Some(os)) .certificate(self.args.certificate.clone()) diff --git a/crates/openconnect/src/ffi/mod.rs b/crates/openconnect/src/ffi/mod.rs index 5b858ab..2a215fd 100644 --- a/crates/openconnect/src/ffi/mod.rs +++ b/crates/openconnect/src/ffi/mod.rs @@ -12,6 +12,7 @@ pub(crate) struct ConnectOptions { pub user_agent: *const c_char, pub script: *const c_char, + pub interface: *const c_char, pub os: *const c_char, pub certificate: *const c_char, pub sslkey: *const c_char, diff --git a/crates/openconnect/src/ffi/vpn.c b/crates/openconnect/src/ffi/vpn.c index c7a10a5..626cf25 100644 --- a/crates/openconnect/src/ffi/vpn.c +++ b/crates/openconnect/src/ffi/vpn.c @@ -11,6 +11,7 @@ void *g_user_data; static int g_cmd_pipe_fd; static const char *g_vpnc_script; +static const char *g_vpnc_interface; static vpn_connected_callback on_vpn_connected; /* Validate the peer certificate */ @@ -38,7 +39,7 @@ static void print_progress(__attribute__((unused)) void *_vpninfo, int level, co static void setup_tun_handler(void *_vpninfo) { - int ret = openconnect_setup_tun_device(_vpninfo, g_vpnc_script, NULL); + int ret = openconnect_setup_tun_device(_vpninfo, g_vpnc_script, g_vpnc_interface); if (!ret) { on_vpn_connected(g_cmd_pipe_fd, g_user_data); } @@ -53,6 +54,7 @@ int vpn_connect(const vpn_options *options, vpn_connected_callback callback) g_user_data = options->user_data; g_vpnc_script = options->script; + g_vpnc_interface = options->interface; on_vpn_connected = callback; INFO("User agent: %s", options->user_agent); diff --git a/crates/openconnect/src/ffi/vpn.h b/crates/openconnect/src/ffi/vpn.h index 7a674c7..3b3c484 100644 --- a/crates/openconnect/src/ffi/vpn.h +++ b/crates/openconnect/src/ffi/vpn.h @@ -13,6 +13,7 @@ typedef struct vpn_options const char *user_agent; const char *script; + const char *interface; const char *os; const char *certificate; const char *sslkey; diff --git a/crates/openconnect/src/vpn.rs b/crates/openconnect/src/vpn.rs index e5b3ba3..bd4c11b 100644 --- a/crates/openconnect/src/vpn.rs +++ b/crates/openconnect/src/vpn.rs @@ -16,6 +16,7 @@ pub struct Vpn { cookie: CString, user_agent: CString, script: CString, + interface: Option, os: CString, certificate: Option, sslkey: Option, @@ -65,6 +66,7 @@ impl Vpn { cookie: self.cookie.as_ptr(), user_agent: self.user_agent.as_ptr(), script: self.script.as_ptr(), + interface: Self::option_to_ptr(&self.interface), os: self.os.as_ptr(), certificate: Self::option_to_ptr(&self.certificate), @@ -113,6 +115,7 @@ pub struct VpnBuilder { server: String, cookie: String, script: Option, + interface: Option, user_agent: Option, os: Option, @@ -136,6 +139,7 @@ impl VpnBuilder { server: server.to_string(), cookie: cookie.to_string(), script: None, + interface: None, user_agent: None, os: None, @@ -159,6 +163,11 @@ impl VpnBuilder { self } + pub fn interface>>(mut self, interface: T) -> Self { + self.interface = interface.into(); + self + } + pub fn user_agent>>(mut self, user_agent: T) -> Self { self.user_agent = user_agent.into(); self @@ -235,6 +244,7 @@ impl VpnBuilder { cookie: Self::to_cstring(&self.cookie), user_agent: Self::to_cstring(&user_agent), script: Self::to_cstring(&script), + interface: self.interface.as_deref().map(Self::to_cstring), os: Self::to_cstring(&os), certificate: self.certificate.as_deref().map(Self::to_cstring),