fix: use portal policy for session extension

This commit is contained in:
Kevin Yue committed 2026-05-06 23:20:57 +08:00
1 parent 731a0d895c
commit fb6db0dc12
10 files changed
+164 -49

No files matched your search

-1
View File
@@ -46,7 +46,6 @@ pub(crate) struct VpnSessionInfoRaw {
pub user_expires: c_long,
pub lifetime_warning_prior: c_int,
pub lifetime_warning_message: *const c_char,
pub allow_extend_session: c_int,
}
#[link(name = "vpn")]
-2
View File
@@ -59,8 +59,6 @@ static void setup_tun_handler(void *_vpninfo)
openconnect_get_gp_lifetime_notify_prior(_vpninfo),
.lifetime_warning_message =
openconnect_get_gp_lifetime_notify_message(_vpninfo),
.allow_extend_session =
openconnect_get_gp_allow_extend_session(_vpninfo),
};
on_vpn_connected(g_cmd_pipe_fd, &session_info, g_user_data);
}
-1
View File
@@ -9,7 +9,6 @@ typedef struct vpn_session_info {
long user_expires;
int lifetime_warning_prior;
const char *lifetime_warning_message;
int allow_extend_session;
} vpn_session_info;
typedef void (*vpn_connected_callback)(int cmd_pipe_fd,
-6
View File
@@ -16,7 +16,6 @@ pub struct VpnSessionInfo {
pub lifetime_secs: Option<u32>,
pub user_expires: Option<u32>,
pub lifetime_warning: Option<VpnSessionWarning>,
pub allow_extend_session: bool,
}
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -42,7 +41,6 @@ pub(crate) fn session_info_from_raw(raw: *const ffi::VpnSessionInfoRaw) -> VpnSe
(Some(prior_secs), Some(message)) => Some(VpnSessionWarning { prior_secs, message }),
_ => None,
},
allow_extend_session: raw.allow_extend_session != 0,
}
}
@@ -424,7 +422,6 @@ mod tests {
user_expires: 1_776_828_409,
lifetime_warning_prior: 1_800,
lifetime_warning_message: message.as_ptr(),
allow_extend_session: 1,
};
let info = session_info_from_raw(&raw);
@@ -438,7 +435,6 @@ mod tests {
message: "Session expires soon".to_string(),
})
);
assert!(info.allow_extend_session);
}
#[test]
@@ -449,7 +445,6 @@ mod tests {
user_expires: 0,
lifetime_warning_prior: 0,
lifetime_warning_message: std::ptr::null(),
allow_extend_session: 0,
};
let info = session_info_from_raw(&raw);
@@ -457,6 +452,5 @@ mod tests {
assert_eq!(info.user_expires, Some(1_776_828_409));
assert_eq!(info.lifetime_secs, None);
assert_eq!(info.lifetime_warning, None);
assert!(!info.allow_extend_session);
}
}