Possibly fix (#26)

RoboCup-SPL · Jun 13, 2023 · 2a36511 · 2a36511
1 parent 1786a91
commit 2a36511
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/game_controller_net/src/control_message_sender.rs b/game_controller_net/src/control_message_sender.rs
@@ -52,8 +52,8 @@ impl ControlMessageSender {
         })
     }
 
-    /// This function runs the sender until an error occurs.
-    pub async fn run(&self) -> Result<()> {
+    /// This function runs the sender indefinitely.
+    pub async fn run(&self) {
         let mut interval = interval(Self::SEND_INTERVAL);
         let mut packet_number: u8 = 0;
         loop {
@@ -70,7 +70,7 @@ impl ControlMessageSender {
                 self.to_monitor,
             )
             .into();
-            self.socket.send(&buffer).await?;
+            let _ = self.socket.send(&buffer).await;
             packet_number = packet_number.wrapping_add(1);
         }
     }

diff --git a/game_controller_net/src/status_message_forwarder.rs b/game_controller_net/src/status_message_forwarder.rs
@@ -39,7 +39,8 @@ impl StatusMessageForwarder {
         })
     }
 
-    /// This function runs the forwarder until an error occurs.
+    /// This function runs the forwarder until an error occurs. Network errors during sending are
+    /// ignored because the network might change and we shouldn't crash in that case.
     pub async fn run(&mut self) -> Result<()> {
         loop {
             let (source, buffer) = self.message_receiver.recv().await?;
@@ -54,7 +55,7 @@ impl StatusMessageForwarder {
                 }
                 _ => todo!("implement forwarding of IPv6 status messages"),
             };
-            self.socket.send(&prefixed_buffer).await?;
+            let _ = self.socket.send(&prefixed_buffer).await;
         }
     }
 }
diff --git a/game_controller_runtime/src/lib.rs b/game_controller_runtime/src/lib.rs
@@ -112,7 +112,7 @@ async fn start_network(
             .await
             .context("could not create control message sender")?;
 
-    join_set.spawn(async move { control_message_sender.run().await.unwrap() });
+    join_set.spawn(async move { control_message_sender.run().await });
 
     for team in teams {
         let team_message_receiver =
@@ -231,7 +231,8 @@ async fn event_loop(
                                     .await
                                     .unwrap()
                                     .run()
-                                    .await
+                                    .await;
+                                    Ok(())
                                 });
                             }
                             {