Remove best_addr module

Author: matheus23

iroh/src/magicsock/node_map.rs

@@ -12,8 +12,8 @@ use stun_rs::TransactionId;
 use tracing::{debug, info, instrument, trace, warn};
 
 use self::{
-    best_addr::ClearReason,
     node_state::{NodeState, Options, PingHandled},
+    path_validity::ClearReason,
 };
 use super::{metrics::Metrics, ActorMessage, DiscoMessageSource, NodeIdMappedAddr};
 #[cfg(any(test, feature = "test-utils"))]
@@ -23,7 +23,6 @@ use crate::{
     watchable::Watcher,
 };
 
-mod best_addr;
 mod node_state;
 mod path_state;
 mod path_validity;

iroh/src/magicsock/node_map/best_addr.rs

@@ -17,8 +17,8 @@ use tokio::sync::mpsc;
 use tracing::{debug, event, info, instrument, trace, warn, Level};
 
 use super::{
-    best_addr::ClearReason,
     path_state::{summarize_node_paths, PathState},
+    path_validity::ClearReason,
     udp_paths::{NodeUdpPaths, UdpSendAddr},
     IpPort, Source,
 };

iroh/src/magicsock/node_map/node_state.rs

@@ -28,6 +28,14 @@ pub(super) enum Source {
     Udp,
 }
 
+#[derive(Debug, Clone, Copy)]
+pub enum ClearReason {
+    Reset,
+    Inactive,
+    PongTimeout,
+    MatchesOurLocalAddr,
+}
+
 impl Source {
     fn trust_duration(&self) -> Duration {
         match self {