diff options
| author | Eskil Queseth <eskilq@kth.se> | 2020-10-31 02:27:26 +0100 |
|---|---|---|
| committer | Eskil Queseth <eskilq@kth.se> | 2020-10-31 02:27:26 +0100 |
| commit | 11c823701b12f10933b40044a12cc4048ccf8bd2 (patch) | |
| tree | b3d0b6c844383f8a45cd5081459928b75136ab95 /mumd/src/main.rs | |
| parent | 8fb4edd72dfcb2b71e91eedc5861360101374967 (diff) | |
| download | mum-11c823701b12f10933b40044a12cc4048ccf8bd2.tar.gz | |
add support for mumctl server list
Diffstat (limited to 'mumd/src/main.rs')
| -rw-r--r-- | mumd/src/main.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mumd/src/main.rs b/mumd/src/main.rs index 37ff0dd..70cc21b 100644 --- a/mumd/src/main.rs +++ b/mumd/src/main.rs @@ -36,11 +36,12 @@ async fn main() { let (connection_info_sender, connection_info_receiver) = watch::channel::<Option<ConnectionInfo>>(None); let (response_sender, response_receiver) = mpsc::unbounded_channel(); + let (ping_request_sender, ping_request_receiver) = mpsc::unbounded_channel(); let state = State::new(packet_sender, connection_info_sender); let state = Arc::new(Mutex::new(state)); - let (_, _, _, e) = join!( + let (_, _, _, e, _) = join!( network::tcp::handle( Arc::clone(&state), connection_info_receiver.clone(), @@ -53,11 +54,19 @@ async fn main() { connection_info_receiver.clone(), crypt_state_receiver, ), - command::handle(state, command_receiver, response_sender), + command::handle( + state, + command_receiver, + response_sender, + ping_request_sender, + ), spawn_blocking(move || { // IpcSender is blocking receive_oneshot_commands(command_sender); }), + network::udp::handle_pings( + ping_request_receiver + ), ); e.unwrap(); } |
