Run exit manager ping test only when registered to an exit

althea-net · Sep 18, 2023 · ce84f6f · ce84f6f
1 parent 2631eae
commit ce84f6f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/rita_client/src/exit_manager/exit_loop.rs b/rita_client/src/exit_manager/exit_loop.rs
@@ -78,16 +78,22 @@ pub fn start_exit_manager_loop() {
                                     }
                                 };
 
-                                // Run this ping test every PING_TEST_SPEED seconds
-                                if Instant::now() - em_state.last_connection_time > PING_TEST_SPEED {
-                                    if run_ping_test() {
-                                        em_state.last_connection_time = Instant::now();
-                                    } else {
-                                         // If this router has been in a bad state for >10 mins, reboot
-                                         if (Instant::now() - em_state.last_connection_time) > REBOOT_TIMEOUT {
-                                            let _res = KI.run_command("reboot", &[]);
+                                // Run ping test only when we are registered to prevent constant reboots
+                                if let ExitState::Registered { .. } = exit.info {
+                                    // Run this ping test every PING_TEST_SPEED seconds
+                                    if Instant::now() - em_state.last_connection_time > PING_TEST_SPEED {
+                                        if run_ping_test() {
+                                            em_state.last_connection_time = Instant::now();
+                                        } else {
+                                             // If this router has been in a bad state for >10 mins, reboot
+                                             if (Instant::now() - em_state.last_connection_time) > REBOOT_TIMEOUT {
+                                                let _res = KI.run_command("reboot", &[]);
+                                            }
                                         }
                                     }
+                                } else {
+                                    // reset our reboot timer every tick if not registered
+                                    em_state.last_connection_time = Instant::now();
                                 }
 
                                 // Get cluster exit list. This is saved locally and updated every tick depending on what exit we connect to.

diff --git a/rita_client/src/exit_manager/exit_switcher.rs b/rita_client/src/exit_manager/exit_switcher.rs
@@ -832,7 +832,7 @@ mod tests {
                     u16::MAX,
                     tracking_exit,
                     u16::MAX,
-                     best_exit,
+                    best_exit,
                     400
                 ),
                 &mut vec,