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

fix_proto_defs: fix protobuf definitions

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2022-07-31 22:31:17 +08:00
parent 1ad1480cfc
commit 2a6cd5853e
5 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libs/hbb_common/protos/message.proto
View File

@ -499,33 +499,33 @@ message AudioFrame {
message BackNotification { message BackNotification {
// no need to consider block input by someone else // no need to consider block input by someone else
enum BlockInputState { enum BlockInputState {
StateUnknown = 1; BlkStateUnknown = 0;
OnSucceeded = 2; BlkOnSucceeded = 2;
OnFailed = 3; BlkOnFailed = 3;
OffSucceeded = 4; BlkOffSucceeded = 4;
OffFailed = 5; BlkOffFailed = 5;
} }
enum PrivacyModeState { enum PrivacyModeState {
StateUnknown = 1; PrvStateUnknown = 0;
// Privacy mode on by someone else // Privacy mode on by someone else
OnByOther = 2; PrvOnByOther = 2;
// Privacy mode is not supported on the remote side // Privacy mode is not supported on the remote side
NotSupported = 3; PrvNotSupported = 3;
// Privacy mode on by self // Privacy mode on by self
OnSucceeded = 4; PrvOnSucceeded = 4;
// Privacy mode on by self, but denied // Privacy mode on by self, but denied
OnFailedDenied = 5; PrvOnFailedDenied = 5;
// Some plugins are not found // Some plugins are not found
OnFailedPlugin = 6; PrvOnFailedPlugin = 6;
// Privacy mode on by self, but failed // Privacy mode on by self, but failed
OnFailed = 7; PrvOnFailed = 7;
// Privacy mode off by self // Privacy mode off by self
OffSucceeded = 8; PrvOffSucceeded = 8;
// Ctrl + P // Ctrl + P
OffByPeer = 9; PrvOffByPeer = 9;
// Privacy mode off by self, but failed // Privacy mode off by self, but failed
OffFailed = 10; PrvOffFailed = 10;
OffUnknown = 11; PrvOffUnknown = 11;
} }
oneof union { oneof union {

2
src/server.rs
View File

@ -101,7 +101,7 @@ async fn accept_connection_(server: ServerPtr, socket: Stream, secure: bool) ->
async fn check_privacy_mode_on(stream: &mut Stream) -> ResultType<()> { async fn check_privacy_mode_on(stream: &mut Stream) -> ResultType<()> {
if video_service::get_privacy_mode_conn_id() > 0 { if video_service::get_privacy_mode_conn_id() > 0 {
let msg_out = let msg_out =
crate::common::make_privacy_mode_msg(back_notification::PrivacyModeState::OnByOther); crate::common::make_privacy_mode_msg(back_notification::PrivacyModeState::PrvOnByOther);
timeout(CONNECT_TIMEOUT, stream.send(&msg_out)).await??; timeout(CONNECT_TIMEOUT, stream.send(&msg_out)).await??;
} }
Ok(()) Ok(())

28
src/server/connection.rs
View File

@ -306,24 +306,24 @@ impl Connection {
ipc::PrivacyModeState::OffSucceeded => { ipc::PrivacyModeState::OffSucceeded => {
video_service::set_privacy_mode_conn_id(0); video_service::set_privacy_mode_conn_id(0);
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OffSucceeded, back_notification::PrivacyModeState::PrvOffSucceeded,
) )
} }
ipc::PrivacyModeState::OffFailed => { ipc::PrivacyModeState::OffFailed => {
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OffFailed, back_notification::PrivacyModeState::PrvOffFailed,
) )
} }
ipc::PrivacyModeState::OffByPeer => { ipc::PrivacyModeState::OffByPeer => {
video_service::set_privacy_mode_conn_id(0); video_service::set_privacy_mode_conn_id(0);
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OffByPeer, back_notification::PrivacyModeState::PrvOffByPeer,
) )
} }
ipc::PrivacyModeState::OffUnknown => { ipc::PrivacyModeState::OffUnknown => {
video_service::set_privacy_mode_conn_id(0); video_service::set_privacy_mode_conn_id(0);
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OffUnknown, back_notification::PrivacyModeState::PrvOffUnknown,
) )
} }
}; };
@ -463,7 +463,7 @@ impl Connection {
} else { } else {
Self::send_block_input_error( Self::send_block_input_error(
&tx, &tx,
back_notification::BlockInputState::OnFailed, back_notification::BlockInputState::BlkOnFailed,
); );
} }
} }
@ -473,7 +473,7 @@ impl Connection {
} else { } else {
Self::send_block_input_error( Self::send_block_input_error(
&tx, &tx,
back_notification::BlockInputState::OffFailed, back_notification::BlockInputState::BlkOffFailed,
); );
} }
} }
@ -1316,7 +1316,7 @@ impl Connection {
BoolOption::Yes => { BoolOption::Yes => {
let msg_out = if !video_service::is_privacy_mode_supported() { let msg_out = if !video_service::is_privacy_mode_supported() {
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::NotSupported, back_notification::PrivacyModeState::PrvNotSupported,
) )
} else { } else {
match privacy_mode::turn_on_privacy(self.inner.id) { match privacy_mode::turn_on_privacy(self.inner.id) {
@ -1324,7 +1324,7 @@ impl Connection {
if video_service::test_create_capturer(self.inner.id, 5_000) { if video_service::test_create_capturer(self.inner.id, 5_000) {
video_service::set_privacy_mode_conn_id(self.inner.id); video_service::set_privacy_mode_conn_id(self.inner.id);
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OnSucceeded, back_notification::PrivacyModeState::PrvOnSucceeded,
) )
} else { } else {
log::error!( log::error!(
@ -1333,12 +1333,12 @@ impl Connection {
video_service::set_privacy_mode_conn_id(0); video_service::set_privacy_mode_conn_id(0);
let _ = privacy_mode::turn_off_privacy(self.inner.id); let _ = privacy_mode::turn_off_privacy(self.inner.id);
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OnFailed, back_notification::PrivacyModeState::PrvOnFailed,
) )
} }
} }
Ok(false) => crate::common::make_privacy_mode_msg( Ok(false) => crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OnFailedPlugin, back_notification::PrivacyModeState::PrvOnFailedPlugin,
), ),
Err(e) => { Err(e) => {
log::error!("Failed to turn on privacy mode. {}", e); log::error!("Failed to turn on privacy mode. {}", e);
@ -1346,7 +1346,7 @@ impl Connection {
let _ = privacy_mode::turn_off_privacy(0); let _ = privacy_mode::turn_off_privacy(0);
} }
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OnFailed, back_notification::PrivacyModeState::PrvOnFailed,
) )
} }
} }
@ -1356,7 +1356,7 @@ impl Connection {
BoolOption::No => { BoolOption::No => {
let msg_out = if !video_service::is_privacy_mode_supported() { let msg_out = if !video_service::is_privacy_mode_supported() {
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::NotSupported, back_notification::PrivacyModeState::PrvNotSupported,
) )
} else { } else {
video_service::set_privacy_mode_conn_id(0); video_service::set_privacy_mode_conn_id(0);
@ -1531,12 +1531,12 @@ mod privacy_mode {
let res = turn_off_privacy(_conn_id, None); let res = turn_off_privacy(_conn_id, None);
match res { match res {
Ok(_) => crate::common::make_privacy_mode_msg( Ok(_) => crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OffSucceeded, back_notification::PrivacyModeState::PrvOffSucceeded,
), ),
Err(e) => { Err(e) => {
log::error!("Failed to turn off privacy mode {}", e); log::error!("Failed to turn off privacy mode {}", e);
crate::common::make_privacy_mode_msg( crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OffFailed, back_notification::PrivacyModeState::PrvOffFailed,
) )
} }
} }

2
src/server/video_service.rs
View File

@ -583,7 +583,7 @@ fn check_privacy_mode_changed(sp: &GenericService, privacy_mode_id: i32) -> Resu
if privacy_mode_id != privacy_mode_id_2 { if privacy_mode_id != privacy_mode_id_2 {
if privacy_mode_id_2 != 0 { if privacy_mode_id_2 != 0 {
let msg_out = crate::common::make_privacy_mode_msg( let msg_out = crate::common::make_privacy_mode_msg(
back_notification::PrivacyModeState::OnByOther, back_notification::PrivacyModeState::PrvOnByOther,
); );
sp.send_to_others(msg_out, privacy_mode_id_2); sp.send_to_others(msg_out, privacy_mode_id_2);
} }

32
src/ui/remote.rs
View File

@ -2398,14 +2398,14 @@ impl Remote {
match notification.union { match notification.union {
Some(back_notification::Union::BlockInputState(state)) => { Some(back_notification::Union::BlockInputState(state)) => {
self.handle_back_msg_block_input( self.handle_back_msg_block_input(
state.enum_value_or(back_notification::BlockInputState::StateUnknown), state.enum_value_or(back_notification::BlockInputState::BlkStateUnknown),
) )
.await; .await;
} }
Some(back_notification::Union::PrivacyModeState(state)) => { Some(back_notification::Union::PrivacyModeState(state)) => {
if !self if !self
.handle_back_msg_privacy_mode( .handle_back_msg_privacy_mode(
state.enum_value_or(back_notification::PrivacyModeState::StateUnknown), state.enum_value_or(back_notification::PrivacyModeState::PrvStateUnknown),
) )
.await .await
{ {
@ -2424,18 +2424,18 @@ impl Remote {
async fn handle_back_msg_block_input(&mut self, state: back_notification::BlockInputState) { async fn handle_back_msg_block_input(&mut self, state: back_notification::BlockInputState) {
match state { match state {
back_notification::BlockInputState::OnSucceeded => { back_notification::BlockInputState::BlkOnSucceeded => {
self.update_block_input_state(true); self.update_block_input_state(true);
} }
back_notification::BlockInputState::OnFailed => { back_notification::BlockInputState::BlkOnFailed => {
self.handler self.handler
.msgbox("custom-error", "Block user input", "Failed"); .msgbox("custom-error", "Block user input", "Failed");
self.update_block_input_state(false); self.update_block_input_state(false);
} }
back_notification::BlockInputState::OffSucceeded => { back_notification::BlockInputState::BlkOffSucceeded => {
self.update_block_input_state(false); self.update_block_input_state(false);
} }
back_notification::BlockInputState::OffFailed => { back_notification::BlockInputState::BlkOffFailed => {
self.handler self.handler
.msgbox("custom-error", "Unblock user input", "Failed"); .msgbox("custom-error", "Unblock user input", "Failed");
} }
@ -2457,7 +2457,7 @@ impl Remote {
state: back_notification::PrivacyModeState, state: back_notification::PrivacyModeState,
) -> bool { ) -> bool {
match state { match state {
back_notification::PrivacyModeState::OnByOther => { back_notification::PrivacyModeState::PrvOnByOther => {
self.handler.msgbox( self.handler.msgbox(
"error", "error",
"Connecting...", "Connecting...",
@ -2465,46 +2465,46 @@ impl Remote {
); );
return false; return false;
} }
back_notification::PrivacyModeState::NotSupported => { back_notification::PrivacyModeState::PrvNotSupported => {
self.handler self.handler
.msgbox("custom-error", "Privacy mode", "Unsupported"); .msgbox("custom-error", "Privacy mode", "Unsupported");
self.update_privacy_mode(false); self.update_privacy_mode(false);
} }
back_notification::PrivacyModeState::OnSucceeded => { back_notification::PrivacyModeState::PrvOnSucceeded => {
self.handler self.handler
.msgbox("custom-nocancel", "Privacy mode", "In privacy mode"); .msgbox("custom-nocancel", "Privacy mode", "In privacy mode");
self.update_privacy_mode(true); self.update_privacy_mode(true);
} }
back_notification::PrivacyModeState::OnFailedDenied => { back_notification::PrivacyModeState::PrvOnFailedDenied => {
self.handler self.handler
.msgbox("custom-error", "Privacy mode", "Peer denied"); .msgbox("custom-error", "Privacy mode", "Peer denied");
self.update_privacy_mode(false); self.update_privacy_mode(false);
} }
back_notification::PrivacyModeState::OnFailedPlugin => { back_notification::PrivacyModeState::PrvOnFailedPlugin => {
self.handler self.handler
.msgbox("custom-error", "Privacy mode", "Please install plugins"); .msgbox("custom-error", "Privacy mode", "Please install plugins");
self.update_privacy_mode(false); self.update_privacy_mode(false);
} }
back_notification::PrivacyModeState::OnFailed => { back_notification::PrivacyModeState::PrvOnFailed => {
self.handler self.handler
.msgbox("custom-error", "Privacy mode", "Failed"); .msgbox("custom-error", "Privacy mode", "Failed");
self.update_privacy_mode(false); self.update_privacy_mode(false);
} }
back_notification::PrivacyModeState::OffSucceeded => { back_notification::PrivacyModeState::PrvOffSucceeded => {
self.handler self.handler
.msgbox("custom-nocancel", "Privacy mode", "Out privacy mode"); .msgbox("custom-nocancel", "Privacy mode", "Out privacy mode");
self.update_privacy_mode(false); self.update_privacy_mode(false);
} }
back_notification::PrivacyModeState::OffByPeer => { back_notification::PrivacyModeState::PrvOffByPeer => {
self.handler self.handler
.msgbox("custom-error", "Privacy mode", "Peer exit"); .msgbox("custom-error", "Privacy mode", "Peer exit");
self.update_privacy_mode(false); self.update_privacy_mode(false);
} }
back_notification::PrivacyModeState::OffFailed => { back_notification::PrivacyModeState::PrvOffFailed => {
self.handler self.handler
.msgbox("custom-error", "Privacy mode", "Failed to turn off"); .msgbox("custom-error", "Privacy mode", "Failed to turn off");
} }
back_notification::PrivacyModeState::OffUnknown => { back_notification::PrivacyModeState::PrvOffUnknown => {
self.handler self.handler
.msgbox("custom-error", "Privacy mode", "Turned off"); .msgbox("custom-error", "Privacy mode", "Turned off");
// log::error!("Privacy mode is turned off with unknown reason"); // log::error!("Privacy mode is turned off with unknown reason");