gruberb/protohackers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Send error on not supported frame

Browse source
This commit is contained in:
Bastian Gruber 2023-05-22 14:56:07 +02:00
parent 3178c07f84
commit c57c0de2db
No known key found for this signature in database
GPG key ID: BE9F8C772B188CBF
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
problem_06/src/server.rs
View file

@ -131,13 +131,17 @@ impl Handler {
while !self.shutdown.is_shutdown() { while !self.shutdown.is_shutdown() {
tokio::select! { tokio::select! {
res = self.connection.read_frame() => { res = self.connection.read_frame() => {
match res? { match res {
Some(frame) => { Ok(Some(frame)) => {
if let Err(e) = self.handle_client_frame(self.db.clone(), frame, send_message.clone()).await { if let Err(e) = self.handle_client_frame(self.db.clone(), frame, send_message.clone()).await {
error!("Error handling frame: {e:?}"); error!("Error handling frame: {e:?}");
} }
}, },
None => return Ok(()), Ok(None) => return Ok(()),
Err(_) => {
let _ = self.connection.write_frame(ServerFrames::Error { msg: "Not supported frame sent".to_string() }).await;
return Ok(());
}
} }
} }
message = receive_message.recv() => { message = receive_message.recv() => {
@ -198,7 +202,11 @@ impl Handler {
ClientFrames::IAmCamera { road, mile, limit } => { ClientFrames::IAmCamera { road, mile, limit } => {
info!("Receive new camera: {road} at {mile} with limit {limit}"); info!("Receive new camera: {road} at {mile} with limit {limit}");
if self.connection_type.is_some() { if self.connection_type.is_some() {
let _ = send_message.send(ServerFrames::Error { msg: "Already connected as camera".to_string() }).await; let _ = send_message
.send(ServerFrames::Error {
msg: "Already connected as camera".to_string(),
})
.await;
return Err("Already connected".into()); return Err("Already connected".into());
} }
self.set_connection_type(ConnectionType::Camera); self.set_connection_type(ConnectionType::Camera);
@ -214,7 +222,11 @@ impl Handler {
} }
ClientFrames::IAmDispatcher { roads } => { ClientFrames::IAmDispatcher { roads } => {
if self.connection_type.is_some() { if self.connection_type.is_some() {
let _ = send_message.send(ServerFrames::Error { msg: "Already connected as dispatcher".to_string() }).await; let _ = send_message
.send(ServerFrames::Error {
msg: "Already connected as dispatcher".to_string(),
})
.await;
return Err("Already connected".into()); return Err("Already connected".into());
} }