From b94ab414a0c40323003cc0280faa58e0300302d7 Mon Sep 17 00:00:00 2001
From: Luna Yao <40349250+ZnqbuZ@users.noreply.github.com>
Date: Fri, 17 Apr 2026 18:50:12 +0200
Subject: [PATCH] replace parking_lot with std

---
 easytier/src/common/global_ctx.rs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/easytier/src/common/global_ctx.rs b/easytier/src/common/global_ctx.rs
index fd82a69e..d648c07d 100644
--- a/easytier/src/common/global_ctx.rs
+++ b/easytier/src/common/global_ctx.rs
@@ -1,5 +1,12 @@
+use arc_swap::ArcSwap;
+use crossbeam::atomic::AtomicCell;
+use dashmap::DashMap;
+use hmac::{Hmac, Mac};
+use sha2::Sha256;
+use socket2::Protocol;
+use std::sync::RwLock;
 use std::{
-    collections::{HashMap, hash_map::DefaultHasher},
+    collections::{hash_map::DefaultHasher, HashMap},
     hash::Hasher,
     iter,
     net::{IpAddr, SocketAddr},
@@ -7,15 +14,12 @@ use std::{
     time::{SystemTime, UNIX_EPOCH},
 };
 
-use arc_swap::ArcSwap;
-use dashmap::DashMap;
-
 use super::{
-    PeerId,
     config::{ConfigLoader, Flags},
     netns::NetNS,
     network::IPCollector,
     stun::{StunInfoCollector, StunInfoCollectorTrait},
+    PeerId,
 };
 #[cfg(feature = "magic-dns")]
 use crate::dns::{
@@ -37,11 +41,6 @@ use crate::{
     rpc_service::protected_port,
     tunnel::matches_protocol,
 };
-use crossbeam::atomic::AtomicCell;
-use hmac::{Hmac, Mac};
-use parking_lot::RwLock;
-use sha2::Sha256;
-use socket2::Protocol;
 
 pub type NetworkIdentity = crate::common::config::NetworkIdentity;
 
@@ -684,11 +683,11 @@ impl GlobalCtx {
 #[cfg(feature = "magic-dns")]
 impl DnsGlobalCtxExt for GlobalCtx {
     fn dns_server(&self) -> Option<Arc<DnsServer>> {
-        self.dns_server.read().clone()
+        self.dns_server.read().unwrap().clone()
     }
 
     fn set_dns_server(&self, dns: Option<Arc<DnsServer>>) {
-        *self.dns_server.write() = dns;
+        *self.dns_server.write().unwrap() = dns;
     }
 
     fn dns_self_zone(&self) -> crate::dns::config::zone::ZoneConfig {