Use public-ip as fallback (#295)

akula-bft · Sep 14, 2022 · 5938dad · 5938dad
1 parent 49aaa08
commit 5938dad
Show file tree

Hide file tree

Showing 3 changed files with 215 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -139,6 +139,7 @@ hashbrown = { version = "0.12.0", features = [
   "ahash-compile-time-rng",
 ] }
 dashmap = "5.3"
+public-ip = "0.2.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 e2p-fileflags = { git = "https://github.com/michaellass/e2p-fileflags" }

diff --git a/src/sentry/devp2p/disc/v4/node.rs b/src/sentry/devp2p/disc/v4/node.rs
@@ -250,7 +250,14 @@ impl Node {
                                 node_endpoint.write().address = Ip(v);
                             }
                             Err(e) => {
-                                debug!("Failed to get public IP: {}", e);
+                                debug!("Failed to get public IP via UPNP: {}", e);
+                                debug!("Trying with public_ip DNS/HTTP resolvers");
+                                if let Some(v) = public_ip::addr().await {
+                                    debug!("Discovered public IP: {}", v);
+                                    node_endpoint.write().address = Ip(v);
+                                } else {
+                                    debug!("Failed to get public IP via DNS/HTTP resolvers");
+                                }
                             }
                         }
                         sleep(UPNP_INTERVAL).await;