From 77fda0f5274fbd393ecd446101e4b2a16d3b094f Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Wed, 24 May 2023 10:02:08 +0800 Subject: [PATCH] refactor: rename to vpn_options --- common/src/vpn/mod.rs | 2 +- common/src/vpn/vpn.c | 2 +- common/src/vpn/vpn.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/vpn/mod.rs b/common/src/vpn/mod.rs index b755db4..e64faca 100644 --- a/common/src/vpn/mod.rs +++ b/common/src/vpn/mod.rs @@ -128,7 +128,7 @@ impl Vpn { pub async fn disconnect(&self) { if self.status().await == VpnStatus::Disconnected { - info!("VPN already disconnected, skipping disconnect"); + info!("VPN is not connected, nothing to do"); return; } diff --git a/common/src/vpn/vpn.c b/common/src/vpn/vpn.c index 2c677d8..54620bf 100644 --- a/common/src/vpn/vpn.c +++ b/common/src/vpn/vpn.c @@ -45,7 +45,7 @@ static void setup_tun_handler(void *_vpninfo) } /* Initialize VPN connection */ -int vpn_connect(const Options *options) +int vpn_connect(const vpn_options *options) { struct openconnect_info *vpninfo; struct utsname utsbuf; diff --git a/common/src/vpn/vpn.h b/common/src/vpn/vpn.h index a853cb4..573fd5c 100644 --- a/common/src/vpn/vpn.h +++ b/common/src/vpn/vpn.h @@ -3,15 +3,15 @@ #include #include -typedef struct Options +typedef struct vpn_options { const char *server; const char *cookie; const char *script; void *user_data; -} Options; +} vpn_options; -int vpn_connect(const Options *options); +int vpn_connect(const vpn_options *options); void vpn_disconnect(); extern void on_vpn_connected(int cmd_pipe_fd, void *user_data);