aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/client.rs
diff options
context:
space:
mode:
authorEskil Queseth <eskilq@kth.se>2021-05-19 02:09:58 +0200
committerEskil Queseth <eskilq@kth.se>2021-05-19 02:09:58 +0200
commitf551de2bbc5e41c5cd76e36c2b0a6f10d9b4cddf (patch)
tree750cbad28427067b66fa690236a25ea3374bd9aa /mumd/src/client.rs
parentcf81a1141cdc6a6db842d992d065eba74829e0c7 (diff)
downloadmum-f551de2bbc5e41c5cd76e36c2b0a6f10d9b4cddf.tar.gz
remove event_register_handler from tcp stack
Diffstat (limited to 'mumd/src/client.rs')
-rw-r--r--mumd/src/client.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/mumd/src/client.rs b/mumd/src/client.rs
index 9c2c2a0..3c491da 100644
--- a/mumd/src/client.rs
+++ b/mumd/src/client.rs
@@ -1,4 +1,4 @@
-use crate::command;
+use crate::{command, network::tcp::TcpEventQueue};
use crate::error::ClientError;
use crate::network::{tcp, udp, ConnectionInfo};
use crate::state::State;
@@ -24,8 +24,7 @@ pub async fn handle(
mpsc::unbounded_channel::<ControlPacket<Serverbound>>();
let (ping_request_sender, ping_request_receiver) =
mpsc::unbounded_channel();
- let (response_sender, response_receiver) =
- mpsc::unbounded_channel();
+ let event_queue = TcpEventQueue::new();
let state = Arc::new(RwLock::new(state));
@@ -36,7 +35,7 @@ pub async fn handle(
crypt_state_sender,
packet_sender.clone(),
packet_receiver,
- response_receiver,
+ event_queue.clone(),
).fuse() => r.map_err(|e| ClientError::TcpError(e)),
_ = udp::handle(
Arc::clone(&state),
@@ -46,7 +45,7 @@ pub async fn handle(
_ = command::handle(
state,
command_receiver,
- response_sender,
+ event_queue,
ping_request_sender,
packet_sender,
connection_info_sender,