aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/main.rs
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2020-10-12 02:20:15 +0200
committerGustav Sörnäs <gustav@sornas.net>2020-10-12 02:20:15 +0200
commitdec60d11b81a7dbef9286ac72be36ebaec95543a (patch)
treecb6ee9315b85100f8ddb7f0ecc2539520adbad15 /mumd/src/main.rs
parent95bf95c6882c063457e0269b0efc765b470827fd (diff)
downloadmum-dec60d11b81a7dbef9286ac72be36ebaec95543a.tar.gz
begin saving state
Co-authored-by: Eskil Queseth <eskilq@kth.se>
Diffstat (limited to 'mumd/src/main.rs')
-rw-r--r--mumd/src/main.rs12
1 files changed, 11 insertions, 1 deletions
diff --git a/mumd/src/main.rs b/mumd/src/main.rs
index 1608947..afc1b2e 100644
--- a/mumd/src/main.rs
+++ b/mumd/src/main.rs
@@ -1,6 +1,9 @@
mod audio;
mod network;
+mod command;
+mod state;
use crate::audio::Audio;
+use crate::state::Server;
use argparse::ArgumentParser;
use argparse::Store;
@@ -51,9 +54,12 @@ async fn main() {
audio.output_stream.play().unwrap();
let audio = Arc::new(Mutex::new(audio));
+ let server_state = Arc::new(Mutex::new(Server::new()));
+
// Run it
join!(
network::handle_tcp(
+ server_state,
server_addr,
server_host,
username,
@@ -61,6 +67,10 @@ async fn main() {
crypt_state_sender,
Arc::clone(&audio),
),
- network::handle_udp(server_addr, crypt_state_receiver, audio,),
+ network::handle_udp(
+ server_addr,
+ crypt_state_receiver,
+ audio,
+ ),
);
}