hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make multiple attempts for _get_values_of_seat0

Browse Source 
Signed-off-by: Sahil Yeole <sahilyeole93@gmail.com>
This commit is contained in:
Sahil Yeole 2023-07-30 17:45:36 +05:30
parent c88219b769
commit 30c002831e
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
libs/hbb_common/src/platform/linux.rs
View File

@ -124,7 +124,7 @@ fn line_values(indices: &[usize], line: &str) -> Vec<String> {
#[inline] #[inline]
pub fn get_values_of_seat0(indices: &[usize]) -> Vec<String> { pub fn get_values_of_seat0(indices: &[usize]) -> Vec<String> {
_get_values_of_seat0(indices, true) _get_values_of_seat0(indices, true, 20)
} }
#[inline] #[inline]
@ -132,55 +132,51 @@ pub fn get_values_of_seat0_with_gdm_wayland(indices: &[usize]) -> Vec<String> {
_get_values_of_seat0(indices, false) _get_values_of_seat0(indices, false)
} }
fn _get_values_of_seat0(indices: &[usize], ignore_gdm_wayland: bool) -> Vec<String> { fn _get_values_of_seat0(indices: &[usize], ignore_gdm_wayland: bool, attempts: usize) -> Vec<String> {
let mut retry_attempt = 0; for _ in 0..attempts {
loop{ if let Ok(output) = run_loginctl(None) {
if let Ok(output) = run_loginctl(None) { for line in String::from_utf8_lossy(&output.stdout).lines() {
for line in String::from_utf8_lossy(&output.stdout).lines() { if line.contains("seat0") {
if line.contains("seat0") { if let Some(sid) = line.split_whitespace().next() {
if is_active(sid) {
if ignore_gdm_wayland {
if is_gdm_user(line.split_whitespace().nth(2).unwrap_or(""))
&& get_display_server_of_session(sid) == DISPLAY_SERVER_WAYLAND
{
continue;
}
}
return line_values(indices, line);
}
}
}
}
// some case, there is no seat0 https://github.com/rustdesk/rustdesk/issues/73
for line in String::from_utf8_lossy(&output.stdout).lines() {
if let Some(sid) = line.split_whitespace().next() { if let Some(sid) = line.split_whitespace().next() {
if is_active(sid) { if is_active(sid) {
let d = get_display_server_of_session(sid);
if ignore_gdm_wayland { if ignore_gdm_wayland {
if is_gdm_user(line.split_whitespace().nth(2).unwrap_or("")) if is_gdm_user(line.split_whitespace().nth(2).unwrap_or(""))
&& get_display_server_of_session(sid) == DISPLAY_SERVER_WAYLAND && d == DISPLAY_SERVER_WAYLAND
{ {
continue; continue;
} }
} }
if d == "tty" {
continue;
}
return line_values(indices, line); return line_values(indices, line);
} }
} }
} }
} }
// some case, there is no seat0 https://github.com/rustdesk/rustdesk/issues/73 // Wait for 300ms and try again
for line in String::from_utf8_lossy(&output.stdout).lines() { std::thread::sleep(std::time::Duration::from_millis(300));
if let Some(sid) = line.split_whitespace().next() {
if is_active(sid) {
let d = get_display_server_of_session(sid);
if ignore_gdm_wayland {
if is_gdm_user(line.split_whitespace().nth(2).unwrap_or(""))
&& d == DISPLAY_SERVER_WAYLAND
{
continue;
}
}
if d == "tty" {
continue;
}
return line_values(indices, line);
}
}
}
}
if retry_attempt >= 1 {
return line_values(indices, "");
}
// Increment the retry_attempt counter and wait for 5 seconds before retrying
retry_attempt += 1;
std::thread::sleep(Duration::from_secs(5));
} }
return line_values(indices, "");
} }
pub fn is_active(sid: &str) -> bool { pub fn is_active(sid: &str) -> bool {