aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network/tcp.rs
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2020-10-29 21:27:48 +0100
committerGustav Sörnäs <gustav@sornas.net>2020-10-29 21:27:48 +0100
commit3e7e375e65760a03b6692106ab0ed806ca65e470 (patch)
treeca30f277a9a81e2920c2637a7ca824ec711c8b6e /mumd/src/network/tcp.rs
parent7120ef134c952781ab6a6d23b6be390f915372f5 (diff)
parent69ec88d3fc2e3762cf596bbf0226b204ba35d874 (diff)
downloadmum-3e7e375e65760a03b6692106ab0ed806ca65e470.tar.gz
Merge branch 'libnotify' into main
Diffstat (limited to 'mumd/src/network/tcp.rs')
-rw-r--r--mumd/src/network/tcp.rs13
1 files changed, 2 insertions, 11 deletions
diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs
index c2cb234..630f46a 100644
--- a/mumd/src/network/tcp.rs
+++ b/mumd/src/network/tcp.rs
@@ -250,24 +250,15 @@ async fn listen(
}
ControlPacket::UserState(msg) => {
let mut state = state.lock().unwrap();
- let session = msg.get_session();
if *state.phase_receiver().borrow() == StatePhase::Connecting {
state.audio_mut().add_client(msg.get_session());
state.parse_user_state(*msg);
} else {
state.parse_user_state(*msg);
}
- let server = state.server_mut().unwrap();
- let user = server.users().get(&session).unwrap();
- info!("User {} connected to {}", user.name(), user.channel());
}
ControlPacket::UserRemove(msg) => {
- info!("User {} left", msg.get_session());
- state
- .lock()
- .unwrap()
- .audio_mut()
- .remove_client(msg.get_session());
+ state.lock().unwrap().remove_client(*msg);
}
ControlPacket::ChannelState(msg) => {
debug!("Channel state received");
@@ -367,4 +358,4 @@ async fn run_until_disconnection<T, F, G, H>(
};
join!(main_block, phase_transition_block);
-} \ No newline at end of file
+}