diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-04-11 22:53:11 +0200 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-04-11 22:53:11 +0200 |
| commit | 4da882513c9a692161ff00e4421325ffc7d4af24 (patch) | |
| tree | 582eb70de16bbf9f2400b360ea87b1ed67a4917b | |
| parent | 6a0349287066261d7953b4220de5dd4df05049c0 (diff) | |
| download | mum-4da882513c9a692161ff00e4421325ffc7d4af24.tar.gz | |
always send response to server list
| -rw-r--r-- | mumd/src/command.rs | 4 | ||||
| -rw-r--r-- | mumd/src/state.rs | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mumd/src/command.rs b/mumd/src/command.rs index e1c91ab..1337dce 100644 --- a/mumd/src/command.rs +++ b/mumd/src/command.rs @@ -57,9 +57,7 @@ pub async fn handle( id, addr, Box::new(move |packet| { - if let Some(packet) = packet { - response_sender.send(converter(packet)).unwrap(); - } + response_sender.send(converter(packet)).unwrap(); }), )); if res.is_err() { diff --git a/mumd/src/state.rs b/mumd/src/state.rs index 1f7331a..b6e2abb 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -43,7 +43,7 @@ pub enum ExecutionContext { Now(Box<dyn FnOnce() -> mumlib::error::Result<Option<CommandResponse>>>), Ping( Box<dyn FnOnce() -> mumlib::error::Result<SocketAddr>>, - Box<dyn FnOnce(PongPacket) -> mumlib::error::Result<Option<CommandResponse>> + Send>, + Box<dyn FnOnce(Option<PongPacket>) -> mumlib::error::Result<Option<CommandResponse>> + Send>, ), } @@ -387,7 +387,7 @@ impl State { } }), Box::new(move |pong| { - Ok(Some(CommandResponse::ServerStatus { + Ok(pong.map(|pong| CommandResponse::ServerStatus { version: pong.version, users: pong.users, max_users: pong.max_users, |