revert back from lan discovery merge

This commit is contained in:
open-trade
2022-01-10 18:05:42 +08:00
parent b400e4305f
commit 9a92b6ac4a
19 changed files with 26 additions and 701 deletions

View File

@@ -7,7 +7,6 @@ use hbb_common::{
config::{Config, CONNECT_TIMEOUT, RELAY_PORT},
log,
message_proto::*,
base_proto::*,
protobuf::{Message as _, ProtobufEnum},
rendezvous_proto::*,
sleep,
@@ -28,7 +27,6 @@ mod connection;
pub mod input_service;
mod service;
mod video_service;
pub mod udp;
use hbb_common::tcp::new_listener;
@@ -265,7 +263,6 @@ pub fn check_zombie() {
#[tokio::main]
pub async fn start_server(is_server: bool, _tray: bool) {
// TODO: Add a graceful shutdown handler, and attach all servers to that handler.
#[cfg(target_os = "linux")]
{
log::info!("DISPLAY={:?}", std::env::var("DISPLAY"));
@@ -278,13 +275,6 @@ pub async fn start_server(is_server: bool, _tray: bool) {
std::process::exit(-1);
}
});
let _server_guard = match udp::start_udp_server().await {
Ok(s) => Some(s),
Err(e) => {
log::warn!("Failed to start udp server {}", e);
None
}
};
input_service::fix_key_down_timeout_loop();
crate::RendezvousMediator::start_all().await;
} else {