sync Tue Dec 12 10:26:30 AM CET 2023

src/killswitch/mod.rs

@@ -8,7 +8,6 @@ use std::net::IpAddr;
 pub fn default() -> Result<String> {
     if let Ok(interface) = default_net::get_default_interface() {
         println!("Default network interface");
-        println!("");
         println!("  Name: {}", interface.name);
 
         let ipv4 = interface.ipv4.iter().map(|ip| ip).collect::<Vec<_>>();

src/killswitch/whoami.rs

@@ -1,16 +1,33 @@
 use anyhow::{anyhow, Result};
 
+const MYIP_URLS: [&str; 3] = [
+    "https://myip.country/ip",
+    "http://trackip.net/ip",
+    "https://checkip.amazonaws.com",
+];
+
 pub fn whoami() -> Result<String> {
     let client = reqwest::blocking::Client::builder()
         .user_agent("killswitch")
         .build()?;
 
-    let resp = client.get("https://myip.country/ip").send()?;
-
-    if resp.status().is_success() {
-        let body = resp.text()?;
-        Ok(body)
-    } else {
-        Err(anyhow!("Failed to get public IP: {}", resp.status()))
+    for url in &MYIP_URLS {
+        match client.get(*url).send() {
+            Ok(resp) if resp.status().is_success() => {
+                let body = resp.text()?;
+                return Ok(body);
+            }
+            Ok(_) => {
+                // Continue to the next URL if the response is not successful
+                continue;
+            }
+            Err(err) => {
+                // Log the error or handle it as needed
+                eprintln!("Error fetching IP from {}: {}", url, err);
+                continue;
+            }
+        }
     }
+
+    Err(anyhow!("Failed to get public IP from all URLs"))
 }