better user interface

easytier-core/src/peers/peer.rs

@@ -152,12 +152,11 @@ impl Drop for Peer {
 
 #[cfg(test)]
 mod tests {
-    use std::sync::Arc;
 
     use tokio::{sync::mpsc, time::timeout};
 
     use crate::{
-        common::{config_fs::ConfigFs, global_ctx::GlobalCtx, netns::NetNS, new_peer_id},
+        common::{global_ctx::tests::get_mock_global_ctx, new_peer_id},
         peers::peer_conn::PeerConn,
         tunnels::ring_tunnel::create_ring_tunnel_pair,
     };
@@ -168,12 +167,7 @@ mod tests {
     async fn close_peer() {
         let (local_packet_send, _local_packet_recv) = mpsc::channel(10);
         let (remote_packet_send, _remote_packet_recv) = mpsc::channel(10);
-        let global_ctx = Arc::new(GlobalCtx::new(
-            "test",
-            ConfigFs::new("/tmp/easytier-test"),
-            NetNS::new(None),
-            None,
-        ));
+        let global_ctx = get_mock_global_ctx();
         let local_peer = Peer::new(new_peer_id(), local_packet_send, global_ctx.clone());
         let remote_peer = Peer::new(new_peer_id(), remote_packet_send, global_ctx.clone());
 

easytier-core/src/peers/peer_conn.rs

@@ -540,10 +540,7 @@ mod tests {
     use std::sync::Arc;
 
     use super::*;
-    use crate::common::config_fs::ConfigFs;
     use crate::common::global_ctx::tests::get_mock_global_ctx;
-    use crate::common::global_ctx::GlobalCtx;
-    use crate::common::netns::NetNS;
     use crate::common::new_peer_id;
     use crate::tunnels::tunnel_filter::tests::DropSendTunnelFilter;
     use crate::tunnels::tunnel_filter::{PacketRecorderTunnelFilter, TunnelWithFilter};
@@ -562,27 +559,9 @@ mod tests {
         let c_peer_id = new_peer_id();
         let s_peer_id = new_peer_id();
 
-        let mut c_peer = PeerConn::new(
-            c_peer_id,
-            Arc::new(GlobalCtx::new(
-                "c",
-                ConfigFs::new_with_dir("c", "/tmp"),
-                NetNS::new(None),
-                None,
-            )),
-            Box::new(c),
-        );
+        let mut c_peer = PeerConn::new(c_peer_id, get_mock_global_ctx(), Box::new(c));
 
-        let mut s_peer = PeerConn::new(
-            s_peer_id,
-            Arc::new(GlobalCtx::new(
-                "c",
-                ConfigFs::new_with_dir("c", "/tmp"),
-                NetNS::new(None),
-                None,
-            )),
-            Box::new(s),
-        );
+        let mut s_peer = PeerConn::new(s_peer_id, get_mock_global_ctx(), Box::new(s));
 
         let (c_ret, s_ret) = tokio::join!(
             c_peer.do_handshake_as_client(),

easytier-core/src/peers/peer_ospf_route.rs

@@ -1004,6 +1004,7 @@ impl RouteSessionManager {
             tracing::info!(?service_impl.my_peer_id, ?peers, ?session_peers, ?initiator_candidates, "maintain_sessions begin");
 
             if initiator_candidates.is_empty() {
+                next_sleep_ms = 1000;
                 continue;
             }