aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/main.rs
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2020-10-21 19:28:38 +0200
committerGustav Sörnäs <gustav@sornas.net>2020-10-21 19:28:38 +0200
commit92d64a493ced079645e7f0601ff9a573c1616203 (patch)
treea0f2df7493b9790be43e8a6c311fffbcd30480e3 /mumd/src/main.rs
parentb268bec2919c8ad418b52d8dc68a30d5b0f02be6 (diff)
parent9d865becb19e7ce870b23c4d96d9127baff44d56 (diff)
downloadmum-92d64a493ced079645e7f0601ff9a573c1616203.tar.gz
Merge branch 'network-rework' into 'main'
Add tcp event system Closes #26 See merge request gustav/mum!17
Diffstat (limited to 'mumd/src/main.rs')
-rw-r--r--mumd/src/main.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/mumd/src/main.rs b/mumd/src/main.rs
index 75726f8..e88eede 100644
--- a/mumd/src/main.rs
+++ b/mumd/src/main.rs
@@ -33,6 +33,7 @@ async fn main() {
)>();
let (connection_info_sender, connection_info_receiver) =
watch::channel::<Option<ConnectionInfo>>(None);
+ let (response_sender, response_receiver) = mpsc::unbounded_channel();
let state = State::new(packet_sender, connection_info_sender);
let state = Arc::new(Mutex::new(state));
@@ -43,13 +44,14 @@ async fn main() {
connection_info_receiver.clone(),
crypt_state_sender,
packet_receiver,
+ response_receiver,
),
network::udp::handle(
Arc::clone(&state),
connection_info_receiver.clone(),
crypt_state_receiver,
),
- command::handle(state, command_receiver,),
+ command::handle(state, command_receiver, response_sender),
spawn_blocking(move || {
// IpcSender is blocking
receive_oneshot_commands(command_sender);