TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-05-22 05:28:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix review

Browse Source
This commit is contained in:
rustdesk
2026-05-13 18:43:36 +08:00
parent 2643f00216
commit 2685a25e51
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core_main.rs
View File

@@ -679,10 +679,20 @@ pub fn core_main() -> Option<Vec<String>> {
"OK" => { "OK" => {
if let Some(ref new_id) = new_id { if let Some(ref new_id) = new_id {
if *new_id != local_id { if *new_id != local_id {
let _ = crate::ipc::set_config("id", new_id.clone()); if let Err(err) =
crate::ipc::set_config("id", new_id.clone())
{
println!(
"Failed to persist deployed id locally: {}",
err
);
std::process::exit(1);
}
} }
} }
let _ = crate::ipc::notify_deployed(); if let Err(err) = crate::ipc::notify_deployed() {
log::warn!("Failed to notify deployed state: {}", err);
}
println!("Device deployed."); println!("Device deployed.");
} }
"NOT_ENABLED" => { "NOT_ENABLED" => {

4
src/rendezvous_mediator.rs
View File

@@ -302,7 +302,7 @@ impl RendezvousMediator {
} }
Ok(register_pk_response::Result::NOT_DEPLOYED) => { Ok(register_pk_response::Result::NOT_DEPLOYED) => {
if !NEEDS_DEPLOY.load(Ordering::SeqCst) { if !NEEDS_DEPLOY.load(Ordering::SeqCst) {
log::warn!("Server requires deployment. Run `rustdesk --deploy <api_token>` on this device."); log::warn!("Server requires deployment. Run `rustdesk --deploy --token <api_token>` on this device.");
} }
NEEDS_DEPLOY.store(true, Ordering::SeqCst); NEEDS_DEPLOY.store(true, Ordering::SeqCst);
// Clear key_confirmed so the UI reflects the truth: this device is // Clear key_confirmed so the UI reflects the truth: this device is
@@ -699,7 +699,7 @@ impl RendezvousMediator {
// Throttle register_pk when the device is awaiting deployment: server // Throttle register_pk when the device is awaiting deployment: server
// already told us we're not in its db; sending more often than every // already told us we're not in its db; sending more often than every
// DEPLOY_RETRY_INTERVAL ms is wasted traffic until the operator runs // DEPLOY_RETRY_INTERVAL ms is wasted traffic until the operator runs
// `rustdesk --deploy`. // `rustdesk --deploy --token <api_token>`.
if NEEDS_DEPLOY.load(Ordering::SeqCst) { if NEEDS_DEPLOY.load(Ordering::SeqCst) {
let mut last = LAST_NOT_DEPLOYED_REGISTER.lock().await; let mut last = LAST_NOT_DEPLOYED_REGISTER.lock().await;
if let Some(t) = *last { if let Some(t) = *last {