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

remove temp support_windows_specific_session

Browse Source
This commit is contained in:
rustdesk 2024-04-20 15:13:04 +08:00
parent fb1aa9c028
commit f02a2e44d8
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -601,7 +601,8 @@ message OptionMessage {
BoolOption disable_keyboard = 12;
// Position 13 is used for Resolution. Remove later.
// Resolution custom_resolution = 13;
BoolOption support_windows_specific_session = 14;
// BoolOption support_windows_specific_session = 14;
// starting from 15 please, do not use removed fields
}
message TestDelay {

25
src/client.rs
View File

@ -1564,22 +1564,13 @@ impl LoginConfigHandler {
///
/// * `ignore_default` - If `true`, ignore the default value of the option.
fn get_option_message(&self, ignore_default: bool) -> Option<OptionMessage> {
if self.conn_type.eq(&ConnType::PORT_FORWARD) || self.conn_type.eq(&ConnType::RDP) {
if self.conn_type.eq(&ConnType::PORT_FORWARD) || self.conn_type.eq(&ConnType::RDP) || self.conn_type.eq(&ConnType::FILE_TRANSFER) {
return None;
}
let mut n = 0;
let mut msg = OptionMessage::new();
// Version 1.2.5 can remove this, and OptionMessage is not needed for file transfer
msg.support_windows_specific_session = BoolOption::Yes.into();
n += 1;
if self.conn_type.eq(&ConnType::FILE_TRANSFER) {
return Some(msg);
}
let q = self.image_quality.clone();
if let Some(q) = self.get_image_quality_enum(&q, ignore_default) {
msg.image_quality = q.into();
n += 1;
} else if q == "custom" {
let config = self.load_config();
let allow_more = !crate::using_public_server() || self.direct == Some(true);
@ -1602,32 +1593,25 @@ impl LoginConfigHandler {
msg.custom_fps = custom_fps;
*self.custom_fps.lock().unwrap() = Some(custom_fps as _);
}
n += 1;
}
let view_only = self.get_toggle_option("view-only");
if view_only {
msg.disable_keyboard = BoolOption::Yes.into();
n += 1;
}
if view_only || self.get_toggle_option("show-remote-cursor") {
msg.show_remote_cursor = BoolOption::Yes.into();
n += 1;
}
if !view_only && self.get_toggle_option("lock-after-session-end") {
msg.lock_after_session_end = BoolOption::Yes.into();
n += 1;
}
if self.get_toggle_option("disable-audio") {
msg.disable_audio = BoolOption::Yes.into();
n += 1;
}
if !view_only && self.get_toggle_option("enable-file-transfer") {
msg.enable_file_transfer = BoolOption::Yes.into();
n += 1;
}
if view_only || self.get_toggle_option("disable-clipboard") {
msg.disable_clipboard = BoolOption::Yes.into();
n += 1;
}
msg.supported_decoding =
hbb_common::protobuf::MessageField::some(Decoder::supported_decodings(
@ -1636,12 +1620,7 @@ impl LoginConfigHandler {
self.adapter_luid,
&self.mark_unsupported,
));
n += 1;
if n > 0 {
Some(msg)
} else {
None
}
Some(msg)
}
pub fn get_option_message_after_login(&self) -> Option<OptionMessage> {

3
src/server/connection.rs
View File

@ -1337,8 +1337,7 @@ impl Connection {
&& raii::AuthedConnID::remote_and_file_conn_count() == 1
&& sessions.len() > 1
&& sessions.iter().any(|e| e.sid == current_sid)
&& (get_version_number(&self.lr.version) > get_version_number("1.2.4")
|| self.lr.option.support_windows_specific_session == BoolOption::Yes.into())
&& get_version_number(&self.lr.version) >= get_version_number("1.2.4")
{
pi.windows_sessions = Some(WindowsSessions {
sessions,