Merge branch 'master' into forapi

# Conflicts:
#	Cargo.lock
#	libs/hbb_common/protos/rendezvous.proto
#	libs/hbb_common/src/tcp.rs
#	libs/hbb_common~master
This commit is contained in:
lejianwen committed 2025-01-20 22:43:32 +08:00
commit 45c900a7e6
28 files changed
+1397 -5413

No files matched your search

+1
View File
@@ -32,6 +32,7 @@ fn main() -> ResultType<()> {
}
let rmem = get_arg("rmem").parse::<usize>().unwrap_or(RMEM);
let serial: i32 = get_arg("serial").parse().unwrap_or(0);
crate::common::check_software_update();
RendezvousServer::start(port, serial, &get_arg_or("key", "-".to_owned()), rmem)?;
Ok(())
}