Using new Stream type adapted to the update of submodules (#11581)

* [fix bug] fix all err stream type.

* [update] update hbb_common.

* [bug fix] Stream in other platform.
This commit is contained in:
YinMo19
2025-04-28 00:47:33 +08:00
committed by GitHub
parent 16e9e716b6
commit c9d5e15ac0
6 changed files with 11 additions and 13 deletions

View File

@@ -27,7 +27,7 @@ use hbb_common::{
self,
time::{Duration, Instant, Interval},
},
ResultType,
ResultType, Stream,
};
use crate::{
@@ -832,7 +832,7 @@ pub fn is_modifier(evt: &KeyEvent) -> bool {
pub fn check_software_update() {
if is_custom_client() {
return;
}
}
let opt = config::LocalConfig::get_option(config::keys::OPTION_ENABLE_CHECK_UPDATE);
if config::option2bool(config::keys::OPTION_ENABLE_CHECK_UPDATE, &opt) {
std::thread::spawn(move || allow_err!(check_software_update_()));
@@ -1196,7 +1196,7 @@ pub fn pk_to_fingerprint(pk: Vec<u8>) -> String {
#[inline]
pub async fn get_next_nonkeyexchange_msg(
conn: &mut FramedStream,
conn: &mut Stream,
timeout: Option<u64>,
) -> Option<RendezvousMessage> {
let timeout = timeout.unwrap_or(READ_TIMEOUT);
@@ -1265,7 +1265,7 @@ pub fn check_process(arg: &str, mut same_uid: bool) -> bool {
false
}
pub async fn secure_tcp(conn: &mut FramedStream, key: &str) -> ResultType<()> {
pub async fn secure_tcp(conn: &mut Stream, key: &str) -> ResultType<()> {
let rs_pk = get_rs_pk(key);
let Some(rs_pk) = rs_pk else {
bail!("Handshake failed: invalid public key from rendezvous server");