mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-05-07 02:09:06 +00:00
some minor fix (#113)
1. fix ospf route panic if no ipv4 assigned. 2. should refetch global peer latency map every 60s 3. remove regex dep because it's too large and unnecessary.
This commit is contained in:
Generated
+2
-3
@@ -1088,9 +1088,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "data-encoding"
|
name = "data-encoding"
|
||||||
version = "2.5.0"
|
version = "2.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
|
checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "defguard_wireguard_rs"
|
name = "defguard_wireguard_rs"
|
||||||
@@ -1298,7 +1298,6 @@ dependencies = [
|
|||||||
"quinn",
|
"quinn",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"rcgen",
|
"rcgen",
|
||||||
"regex",
|
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"ring 0.17.8",
|
"ring 0.17.8",
|
||||||
"rstest",
|
"rstest",
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
members = ["easytier", "easytier-gui/src-tauri"]
|
members = ["easytier", "easytier-gui/src-tauri"]
|
||||||
default-members = [ "easytier" ]
|
default-members = ["easytier"]
|
||||||
|
|
||||||
[profile.dev]
|
[profile.dev]
|
||||||
panic = "unwind"
|
panic = "unwind"
|
||||||
|
|||||||
@@ -58,8 +58,6 @@ async-trait = "0.1.74"
|
|||||||
dashmap = "5.5.3"
|
dashmap = "5.5.3"
|
||||||
timedmap = "=1.0.1"
|
timedmap = "=1.0.1"
|
||||||
|
|
||||||
regex = "1"
|
|
||||||
|
|
||||||
# for full-path zero-copy
|
# for full-path zero-copy
|
||||||
zerocopy = { version = "0.7.32", features = ["derive", "simd"] }
|
zerocopy = { version = "0.7.32", features = ["derive", "simd"] }
|
||||||
bytes = "1.5.0"
|
bytes = "1.5.0"
|
||||||
|
|||||||
@@ -229,8 +229,11 @@ impl ConfigLoader for TomlConfigLoader {
|
|||||||
match hostname {
|
match hostname {
|
||||||
Some(hostname) => {
|
Some(hostname) => {
|
||||||
if !hostname.is_empty() {
|
if !hostname.is_empty() {
|
||||||
let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap();
|
let mut name = hostname
|
||||||
let mut name = re.replace_all(&hostname, "").to_string();
|
.chars()
|
||||||
|
.filter(|c| c.is_ascii_alphanumeric() || *c == '-' || *c == '_')
|
||||||
|
.take(32)
|
||||||
|
.collect::<String>();
|
||||||
|
|
||||||
if name.len() > 32 {
|
if name.len() > 32 {
|
||||||
name = name.chars().take(32).collect::<String>();
|
name = name.chars().take(32).collect::<String>();
|
||||||
|
|||||||
@@ -196,6 +196,17 @@ impl PeerCenterInstance {
|
|||||||
let mut rpc_ctx = tarpc::context::current();
|
let mut rpc_ctx = tarpc::context::current();
|
||||||
rpc_ctx.deadline = SystemTime::now() + Duration::from_secs(3);
|
rpc_ctx.deadline = SystemTime::now() + Duration::from_secs(3);
|
||||||
|
|
||||||
|
if ctx
|
||||||
|
.job_ctx
|
||||||
|
.global_peer_map_update_time
|
||||||
|
.load()
|
||||||
|
.elapsed()
|
||||||
|
.as_secs()
|
||||||
|
> 60
|
||||||
|
{
|
||||||
|
ctx.job_ctx.global_peer_map_digest.store(Digest::default());
|
||||||
|
}
|
||||||
|
|
||||||
let ret = client
|
let ret = client
|
||||||
.get_global_peer_map(rpc_ctx, ctx.job_ctx.global_peer_map_digest.load())
|
.get_global_peer_map(rpc_ctx, ctx.job_ctx.global_peer_map_digest.load())
|
||||||
.await?;
|
.await?;
|
||||||
|
|||||||
@@ -537,6 +537,10 @@ impl RouteTable {
|
|||||||
self.peer_infos.insert(*peer_id, info.clone());
|
self.peer_infos.insert(*peer_id, info.clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if self.peer_infos.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// build next hop map
|
// build next hop map
|
||||||
self.next_hop_map.clear();
|
self.next_hop_map.clear();
|
||||||
self.next_hop_map.insert(my_peer_id, (my_peer_id, 0));
|
self.next_hop_map.insert(my_peer_id, (my_peer_id, 0));
|
||||||
|
|||||||
@@ -60,6 +60,8 @@ bitflags::bitflags! {
|
|||||||
struct PeerManagerHeaderFlags: u8 {
|
struct PeerManagerHeaderFlags: u8 {
|
||||||
const ENCRYPTED = 0b0000_0001;
|
const ENCRYPTED = 0b0000_0001;
|
||||||
const LATENCY_FIRST = 0b0000_0010;
|
const LATENCY_FIRST = 0b0000_0010;
|
||||||
|
|
||||||
|
const _ = !0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user