diff options
| author | Fuwn <[email protected]> | 2021-03-21 17:32:52 +0000 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2021-03-21 17:32:52 +0000 |
| commit | f22d483fc117616f05aeb24318252e690bea1b52 (patch) | |
| tree | a14aa78647f427c014da4e48546e9ced07d07426 /src | |
| parent | etc: add todo (diff) | |
| download | whirl-f22d483fc117616f05aeb24318252e690bea1b52.tar.xz whirl-f22d483fc117616f05aeb24318252e690bea1b52.zip | |
refactor: move broadcast function to separate module
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/mod.rs | 1 | ||||
| -rw-r--r-- | src/server/utils.rs | 13 | ||||
| -rw-r--r-- | src/server/world.rs | 12 |
3 files changed, 16 insertions, 10 deletions
diff --git a/src/server/mod.rs b/src/server/mod.rs index 4d08f2b..ae2ae83 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -1,2 +1,3 @@ pub mod auto; +pub mod utils; pub mod world; diff --git a/src/server/utils.rs b/src/server/utils.rs new file mode 100644 index 0000000..000b788 --- /dev/null +++ b/src/server/utils.rs @@ -0,0 +1,13 @@ +use std::collections::HashMap; +use mio::Token; +use mio::net::TcpStream; +use std::io::Write; + +pub fn broadcast_to_all_clients( + sockets: &HashMap<Token, TcpStream>, + message: &[u8] +) -> () { + for mut socket in sockets { + socket.1.write_all(message).unwrap(); + } +} diff --git a/src/server/world.rs b/src/server/world.rs index 340942f..4764b36 100644 --- a/src/server/world.rs +++ b/src/server/world.rs @@ -1,5 +1,5 @@ use mio::net::{TcpListener, TcpStream}; -use std::io::{Read, Write}; +use std::io::Read; use mio::{Poll, Token, Ready, PollOpt, Events}; use std::collections::HashMap; use std::str::from_utf8; @@ -7,21 +7,13 @@ use crate::cmd::buddy_list::create_buddy_list_notify_command; use crate::cmd::text::create_text_command; use crate::cmd::property::{create_property_update_command, create_property_request_command}; use rand::Rng; +use crate::server::utils::broadcast_to_all_clients; // pub struct ClientSocket { // tcp_stream: TcpStream, // username: String, // } -fn broadcast_to_all_clients( - sockets: &HashMap<Token, TcpStream>, - message: &[u8] -) -> () { - for mut socket in sockets { - socket.1.write_all(message).unwrap(); - } -} - pub struct WorldServer; impl WorldServer { pub fn new(listener: TcpListener) { |