fix: disconnect VPN when sleep

This commit is contained in:
Kevin Yue committed 2025-01-20 19:29:22 +08:00
1 parent ec85e857bc
commit b188d61be1
22 files changed
+526 -238

No files matched your search

+13 -9
View File
@@ -84,11 +84,11 @@ pub(crate) struct ConnectArgs {
#[arg(long, default_value = GP_USER_AGENT, help = "The user agent to use")]
user_agent: String,
#[arg(long, default_value = "Linux")]
#[arg(long, value_enum, default_value_t = ConnectArgs::default_os())]
os: Os,
#[arg(long)]
os_version: Option<String>,
#[arg(long, default_value_t = ConnectArgs::default_os_version())]
os_version: String,
#[arg(long, help = "Disable DTLS and ESP")]
no_dtls: bool,
@@ -113,12 +113,16 @@ pub(crate) struct ConnectArgs {
}
impl ConnectArgs {
fn os_version(&self) -> String {
if let Some(os_version) = &self.os_version {
return os_version.to_owned();
fn default_os() -> Os {
if cfg!(target_os = "macos") {
Os::Mac
} else {
Os::Linux
}
}
match self.os {
fn default_os_version() -> String {
match ConnectArgs::default_os() {
Os::Linux => format!("Linux {}", whoami::distro()),
Os::Windows => String::from("Microsoft Windows 11 Pro , 64-bit"),
Os::Mac => String::from("Apple Mac OS X 13.4.0"),
@@ -145,7 +149,7 @@ impl<'a> ConnectHandler<'a> {
GpParams::builder()
.user_agent(&self.args.user_agent)
.client_os(ClientOs::from(&self.args.os))
.os_version(self.args.os_version())
.os_version(self.args.os_version.clone())
.ignore_tls_errors(self.shared_args.ignore_tls_errors)
.certificate(self.args.certificate.clone())
.sslkey(self.args.sslkey.clone())
@@ -355,7 +359,7 @@ impl<'a> ConnectHandler<'a> {
None
};
let os_version = self.args.os_version();
let os_version = self.args.os_version.clone();
let verbose = self.shared_args.verbose.to_verbose_arg();
let auth_launcher = SamlAuthLauncher::new(&self.args.server)
.gateway(is_gateway)