mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-10-29 16:05:35 +00:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
  fanyangandCopilot Autofix powered by AI
|
c5041aec2d | ||
|
fanyangandCopilot Autofix powered by AI
|
7fc954a6dc | ||
 copilot-swe-agent[bot]
|
cf3087d7ca | ||
|
copilot-swe-agent[bot]
|
7a8c7356fa | ||
|
fanyang
|
f24735a86f | ||
  
|
7756a15cbe | ||
|
fanyang
|
741460e1e4 | ||
|
fanyang
|
13412895c5 |
Generated
+117
-143
@@ -129,6 +129,12 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anes"
|
||||||
|
version = "0.1.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anstream"
|
name = "anstream"
|
||||||
version = "0.6.15"
|
version = "0.6.15"
|
||||||
@@ -257,12 +263,6 @@ version = "0.7.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
|
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ascii"
|
|
||||||
version = "1.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-broadcast"
|
name = "async-broadcast"
|
||||||
version = "0.7.2"
|
version = "0.7.2"
|
||||||
@@ -1145,6 +1145,12 @@ dependencies = [
|
|||||||
"toml 0.9.12+spec-1.1.0",
|
"toml 0.9.12+spec-1.1.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cast"
|
||||||
|
version = "0.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
version = "1.2.10"
|
version = "1.2.10"
|
||||||
@@ -1255,10 +1261,31 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chunked_transfer"
|
name = "ciborium"
|
||||||
version = "1.5.0"
|
version = "0.2.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901"
|
checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
|
||||||
|
dependencies = [
|
||||||
|
"ciborium-io",
|
||||||
|
"ciborium-ll",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ciborium-io"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ciborium-ll"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
|
||||||
|
dependencies = [
|
||||||
|
"ciborium-io",
|
||||||
|
"half",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cidr"
|
name = "cidr"
|
||||||
@@ -1605,6 +1632,42 @@ dependencies = [
|
|||||||
"cfg-if",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "criterion"
|
||||||
|
version = "0.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
|
||||||
|
dependencies = [
|
||||||
|
"anes",
|
||||||
|
"cast",
|
||||||
|
"ciborium",
|
||||||
|
"clap",
|
||||||
|
"criterion-plot",
|
||||||
|
"is-terminal",
|
||||||
|
"itertools 0.10.5",
|
||||||
|
"num-traits",
|
||||||
|
"once_cell",
|
||||||
|
"oorandom",
|
||||||
|
"plotters",
|
||||||
|
"rayon",
|
||||||
|
"regex",
|
||||||
|
"serde",
|
||||||
|
"serde_derive",
|
||||||
|
"serde_json",
|
||||||
|
"tinytemplate",
|
||||||
|
"walkdir",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "criterion-plot"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
|
||||||
|
dependencies = [
|
||||||
|
"cast",
|
||||||
|
"itertools 0.10.5",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "critical-section"
|
name = "critical-section"
|
||||||
version = "1.2.0"
|
version = "1.2.0"
|
||||||
@@ -2100,16 +2163,6 @@ dependencies = [
|
|||||||
"dirs-sys 0.5.0",
|
"dirs-sys 0.5.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dirs-next"
|
|
||||||
version = "2.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"dirs-sys-next",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dirs-sys"
|
name = "dirs-sys"
|
||||||
version = "0.3.7"
|
version = "0.3.7"
|
||||||
@@ -2133,17 +2186,6 @@ dependencies = [
|
|||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dirs-sys-next"
|
|
||||||
version = "0.1.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"redox_users 0.4.5",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dispatch2"
|
name = "dispatch2"
|
||||||
version = "0.3.1"
|
version = "0.3.1"
|
||||||
@@ -2299,6 +2341,7 @@ dependencies = [
|
|||||||
"clap_complete",
|
"clap_complete",
|
||||||
"clap_complete_nushell",
|
"clap_complete_nushell",
|
||||||
"console-subscriber",
|
"console-subscriber",
|
||||||
|
"criterion",
|
||||||
"crossbeam",
|
"crossbeam",
|
||||||
"ctor 0.8.0",
|
"ctor 0.8.0",
|
||||||
"dashmap",
|
"dashmap",
|
||||||
@@ -2322,7 +2365,6 @@ dependencies = [
|
|||||||
"hickory-resolver",
|
"hickory-resolver",
|
||||||
"hickory-server",
|
"hickory-server",
|
||||||
"hmac",
|
"hmac",
|
||||||
"hotpath",
|
|
||||||
"http",
|
"http",
|
||||||
"http_req",
|
"http_req",
|
||||||
"humansize",
|
"humansize",
|
||||||
@@ -2665,12 +2707,6 @@ version = "1.2.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
|
checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "encode_unicode"
|
|
||||||
version = "1.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "encoding"
|
name = "encoding"
|
||||||
version = "0.2.33"
|
version = "0.2.33"
|
||||||
@@ -3929,61 +3965,6 @@ dependencies = [
|
|||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hotpath"
|
|
||||||
version = "0.18.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "dc2c28b1fa962e433f800ed1ea0bf53dc028d3745cf2acec6cfd28b65ac96afa"
|
|
||||||
dependencies = [
|
|
||||||
"arc-swap",
|
|
||||||
"cfg-if",
|
|
||||||
"crossbeam-channel",
|
|
||||||
"flate2",
|
|
||||||
"flume 0.12.0",
|
|
||||||
"futures-util",
|
|
||||||
"hdrhistogram",
|
|
||||||
"hotpath-macros",
|
|
||||||
"hotpath-meta",
|
|
||||||
"libc",
|
|
||||||
"object",
|
|
||||||
"parking_lot",
|
|
||||||
"pin-project-lite",
|
|
||||||
"prettytable-rs",
|
|
||||||
"quanta",
|
|
||||||
"regex",
|
|
||||||
"rustc-demangle",
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"tiny_http",
|
|
||||||
"tokio",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hotpath-macros"
|
|
||||||
version = "0.18.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a585238d8daf746e27df0f24d1bbdcd2410e9febff63f9a0173f90d7e71c50f6"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.117",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hotpath-macros-meta"
|
|
||||||
version = "0.18.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "309f63c2f755dead454dd4b3ea8ab5c947f14f8ea435fbcd37fa820e17290e80"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hotpath-meta"
|
|
||||||
version = "0.18.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "68faa91a9e1114dff668cd90560f332da6bbde40dae37ec28ea1c43ca5ce3be3"
|
|
||||||
dependencies = [
|
|
||||||
"hotpath-macros-meta",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "html5ever"
|
name = "html5ever"
|
||||||
version = "0.29.1"
|
version = "0.29.1"
|
||||||
@@ -5952,15 +5933,6 @@ dependencies = [
|
|||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "object"
|
|
||||||
version = "0.36.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
|
|
||||||
dependencies = [
|
|
||||||
"memchr",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "once_cell"
|
name = "once_cell"
|
||||||
version = "1.21.3"
|
version = "1.21.3"
|
||||||
@@ -5971,6 +5943,12 @@ dependencies = [
|
|||||||
"portable-atomic",
|
"portable-atomic",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "oorandom"
|
||||||
|
version = "11.1.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "opaque-debug"
|
name = "opaque-debug"
|
||||||
version = "0.3.1"
|
version = "0.3.1"
|
||||||
@@ -6601,6 +6579,34 @@ dependencies = [
|
|||||||
"time",
|
"time",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "plotters"
|
||||||
|
version = "0.3.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
|
||||||
|
dependencies = [
|
||||||
|
"num-traits",
|
||||||
|
"plotters-backend",
|
||||||
|
"plotters-svg",
|
||||||
|
"wasm-bindgen",
|
||||||
|
"web-sys",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "plotters-backend"
|
||||||
|
version = "0.3.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "plotters-svg"
|
||||||
|
version = "0.3.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
|
||||||
|
dependencies = [
|
||||||
|
"plotters-backend",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pnet"
|
name = "pnet"
|
||||||
version = "0.35.0"
|
version = "0.35.0"
|
||||||
@@ -6831,19 +6837,6 @@ dependencies = [
|
|||||||
"syn 2.0.117",
|
"syn 2.0.117",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "prettytable-rs"
|
|
||||||
version = "0.10.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
|
|
||||||
dependencies = [
|
|
||||||
"encode_unicode",
|
|
||||||
"is-terminal",
|
|
||||||
"lazy_static",
|
|
||||||
"term",
|
|
||||||
"unicode-width 0.1.11",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "primeorder"
|
name = "primeorder"
|
||||||
version = "0.13.6"
|
version = "0.13.6"
|
||||||
@@ -7903,12 +7896,6 @@ dependencies = [
|
|||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rustc-demangle"
|
|
||||||
version = "0.1.27"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustc-hash"
|
name = "rustc-hash"
|
||||||
version = "2.1.0"
|
version = "2.1.0"
|
||||||
@@ -9833,17 +9820,6 @@ dependencies = [
|
|||||||
"utf-8",
|
"utf-8",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "term"
|
|
||||||
version = "0.7.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
|
|
||||||
dependencies = [
|
|
||||||
"dirs-next",
|
|
||||||
"rustversion",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "terminal_size"
|
name = "terminal_size"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
@@ -9999,18 +9975,6 @@ version = "1.0.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "825f6c8a18bc36d56a62f66af7296385b628c9c5543a8663d4c217fc920bfefd"
|
checksum = "825f6c8a18bc36d56a62f66af7296385b628c9c5543a8663d4c217fc920bfefd"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tiny_http"
|
|
||||||
version = "0.12.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82"
|
|
||||||
dependencies = [
|
|
||||||
"ascii",
|
|
||||||
"chunked_transfer",
|
|
||||||
"httpdate",
|
|
||||||
"log",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinystr"
|
name = "tinystr"
|
||||||
version = "0.7.6"
|
version = "0.7.6"
|
||||||
@@ -10021,6 +9985,16 @@ dependencies = [
|
|||||||
"zerovec",
|
"zerovec",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tinytemplate"
|
||||||
|
version = "1.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
|
||||||
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinyvec"
|
name = "tinyvec"
|
||||||
version = "1.8.0"
|
version = "1.8.0"
|
||||||
|
|||||||
@@ -11,8 +11,17 @@ const props = defineProps<{
|
|||||||
|
|
||||||
const list = defineModel<string[]>({ required: true })
|
const list = defineModel<string[]>({ required: true })
|
||||||
|
|
||||||
|
const fallbackUrl = () => {
|
||||||
|
const protoKeys = Object.keys(props.protos)
|
||||||
|
const defaultProto = protoKeys.includes('tcp')
|
||||||
|
? 'tcp'
|
||||||
|
: (protoKeys[0] ?? 'tcp')
|
||||||
|
const defaultPort = props.protos[defaultProto] ?? 11010
|
||||||
|
return `${defaultProto}://0.0.0.0:${defaultPort}`
|
||||||
|
}
|
||||||
|
|
||||||
const addUrl = () => {
|
const addUrl = () => {
|
||||||
list.value.push(props.defaultUrl || 'tcp://0.0.0.0:11010')
|
list.value.push(props.defaultUrl || fallbackUrl())
|
||||||
}
|
}
|
||||||
|
|
||||||
const removeUrl = (index: number) => {
|
const removeUrl = (index: number) => {
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
import { mount } from '@vue/test-utils'
|
||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
import { defineComponent, h, nextTick, ref } from 'vue'
|
||||||
|
import UrlListInput from '../src/components/UrlListInput.vue'
|
||||||
|
|
||||||
|
const ButtonStub = defineComponent({
|
||||||
|
name: 'Button',
|
||||||
|
emits: ['click'],
|
||||||
|
setup(_, { slots, emit }) {
|
||||||
|
return () => h('button', { onClick: (event: MouseEvent) => emit('click', event) }, slots.default?.())
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const UrlInputStub = defineComponent({
|
||||||
|
name: 'UrlInput',
|
||||||
|
setup(_, { slots }) {
|
||||||
|
return () => h('div', slots.actions?.())
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
function mountUrlListInput(protos: Record<string, number>, defaultUrl?: string) {
|
||||||
|
const urls = ref<string[]>([])
|
||||||
|
const wrapper = mount(defineComponent({
|
||||||
|
components: { UrlListInput },
|
||||||
|
setup() {
|
||||||
|
return { urls, protos, defaultUrl }
|
||||||
|
},
|
||||||
|
template: `
|
||||||
|
<UrlListInput
|
||||||
|
v-model="urls"
|
||||||
|
:protos="protos"
|
||||||
|
:default-url="defaultUrl"
|
||||||
|
add-label="add_url"
|
||||||
|
/>
|
||||||
|
`,
|
||||||
|
}), {
|
||||||
|
global: {
|
||||||
|
stubs: {
|
||||||
|
Button: ButtonStub,
|
||||||
|
UrlInput: UrlInputStub,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
return { wrapper, urls }
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('UrlListInput.vue add fallback', () => {
|
||||||
|
it('derives the fallback URL from protos when defaultUrl is not provided', async () => {
|
||||||
|
const { wrapper, urls } = mountUrlListInput({ tcp: 11010, udp: 11010 })
|
||||||
|
|
||||||
|
await wrapper.find('.cursor-pointer').trigger('click')
|
||||||
|
await nextTick()
|
||||||
|
|
||||||
|
expect(urls.value).toEqual(['tcp://0.0.0.0:11010'])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('falls back to the first available protocol when tcp is not present', async () => {
|
||||||
|
const { wrapper, urls } = mountUrlListInput({ udp: 22000 })
|
||||||
|
|
||||||
|
await wrapper.find('.cursor-pointer').trigger('click')
|
||||||
|
await nextTick()
|
||||||
|
|
||||||
|
expect(urls.value).toEqual(['udp://0.0.0.0:22000'])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('falls back to tcp default port when protos is empty', async () => {
|
||||||
|
const { wrapper, urls } = mountUrlListInput({})
|
||||||
|
|
||||||
|
await wrapper.find('.cursor-pointer').trigger('click')
|
||||||
|
await nextTick()
|
||||||
|
|
||||||
|
expect(urls.value).toEqual(['tcp://0.0.0.0:11010'])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('supports port-zero fallback from protos', async () => {
|
||||||
|
const { wrapper, urls } = mountUrlListInput({ tcp: 0, udp: 0 })
|
||||||
|
|
||||||
|
await wrapper.find('.cursor-pointer').trigger('click')
|
||||||
|
await nextTick()
|
||||||
|
|
||||||
|
expect(urls.value).toEqual(['tcp://0.0.0.0:0'])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('uses defaultUrl when provided', async () => {
|
||||||
|
const { wrapper, urls } = mountUrlListInput({ tcp: 11010 }, 'udp://0.0.0.0:22000')
|
||||||
|
|
||||||
|
await wrapper.find('.cursor-pointer').trigger('click')
|
||||||
|
await nextTick()
|
||||||
|
|
||||||
|
expect(urls.value).toEqual(['udp://0.0.0.0:22000'])
|
||||||
|
})
|
||||||
|
})
|
||||||
+15
-10
@@ -28,6 +28,14 @@ path = "src/easytier-cli.rs"
|
|||||||
name = "easytier"
|
name = "easytier"
|
||||||
path = "src/lib.rs"
|
path = "src/lib.rs"
|
||||||
|
|
||||||
|
[[bench]]
|
||||||
|
name = "tx_throughput"
|
||||||
|
harness = false
|
||||||
|
|
||||||
|
[[bench]]
|
||||||
|
name = "packet_bytes_extraction"
|
||||||
|
harness = false
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
git-version = "0.3.9"
|
git-version = "0.3.9"
|
||||||
|
|
||||||
@@ -52,7 +60,6 @@ toml = "0.8.12"
|
|||||||
chrono = { version = "0.4.37", features = ["serde"] }
|
chrono = { version = "0.4.37", features = ["serde"] }
|
||||||
|
|
||||||
guarden = "0.2"
|
guarden = "0.2"
|
||||||
hotpath = { version = "0.18", default-features = false, optional = true }
|
|
||||||
quanta = "0.12"
|
quanta = "0.12"
|
||||||
|
|
||||||
delegate = "0.13.5"
|
delegate = "0.13.5"
|
||||||
@@ -337,6 +344,7 @@ zip = "4.0.0"
|
|||||||
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
criterion = "0.5.1"
|
||||||
serial_test = "3.0.0"
|
serial_test = "3.0.0"
|
||||||
rstest = "0.25.0"
|
rstest = "0.25.0"
|
||||||
futures-util = "0.3.31"
|
futures-util = "0.3.31"
|
||||||
@@ -403,17 +411,14 @@ jemalloc-prof = [
|
|||||||
"jemalloc-sys/stats",
|
"jemalloc-sys/stats",
|
||||||
]
|
]
|
||||||
tracing = ["tokio/tracing", "dep:console-subscriber"]
|
tracing = ["tokio/tracing", "dep:console-subscriber"]
|
||||||
hotpath = [
|
|
||||||
"dep:hotpath",
|
|
||||||
"hotpath/hotpath",
|
|
||||||
"hotpath/tokio",
|
|
||||||
"hotpath/parking_lot",
|
|
||||||
"hotpath/flume",
|
|
||||||
]
|
|
||||||
hotpath-cpu = ["hotpath", "hotpath/hotpath-cpu"]
|
|
||||||
hotpath-alloc = ["hotpath", "hotpath/hotpath-alloc"]
|
|
||||||
magic-dns = ["dep:hickory-client", "dep:hickory-server"]
|
magic-dns = ["dep:hickory-client", "dep:hickory-server"]
|
||||||
faketcp = ["dep:flume"]
|
faketcp = ["dep:flume"]
|
||||||
zstd = ["dep:zstd"]
|
zstd = ["dep:zstd"]
|
||||||
|
# Deprecated: hotpath profiling has been removed. These feature aliases are
|
||||||
|
# retained as no-ops so existing build scripts using `--features hotpath*`
|
||||||
|
# continue to work without pulling in any dependencies.
|
||||||
|
hotpath = []
|
||||||
|
hotpath-cpu = ["hotpath"]
|
||||||
|
hotpath-alloc = ["hotpath"]
|
||||||
# For Network Extension on macOS
|
# For Network Extension on macOS
|
||||||
macos-ne = []
|
macos-ne = []
|
||||||
|
|||||||
@@ -0,0 +1,162 @@
|
|||||||
|
# Benchmarks
|
||||||
|
|
||||||
|
Criterion benchmarks for EasyTier hot paths.
|
||||||
|
|
||||||
|
| Bench | What it measures |
|
||||||
|
| --------------------------- | -------------------------------------------------------------------------------- |
|
||||||
|
| `tx_throughput` | End-to-end TX injection path through `peer_manager::send_msg_by_ip` |
|
||||||
|
| `packet_bytes_extraction` | `ZCPacket::payload_bytes` / `tunnel_payload_bytes` extraction (advance hot path) |
|
||||||
|
|
||||||
|
## Packet Bytes Extraction
|
||||||
|
|
||||||
|
Criterion benchmark for `ZCPacket` bytes extraction — the methods touched by the
|
||||||
|
`advance`-based slicing refactor. Measures `payload_bytes` and
|
||||||
|
`tunnel_payload_bytes` at two payload sizes (1280, 4096). Setup
|
||||||
|
(`ZCPacket::new_with_payload`) runs in the benchmark harness's preparation
|
||||||
|
phase and is excluded from the timed region, so the numbers reflect only the
|
||||||
|
extraction call.
|
||||||
|
|
||||||
|
### Quick start
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo bench --bench packet_bytes_extraction
|
||||||
|
```
|
||||||
|
|
||||||
|
Smoke run:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
PACKET_BYTES_MEASUREMENT_SECS=2 \
|
||||||
|
PACKET_BYTES_WARMUP_SECS=1 \
|
||||||
|
PACKET_BYTES_SAMPLE_SIZE=10 \
|
||||||
|
cargo bench --bench packet_bytes_extraction -- --quiet
|
||||||
|
```
|
||||||
|
|
||||||
|
### Environment variables
|
||||||
|
|
||||||
|
| Variable | Default | Notes |
|
||||||
|
| ------------------------------- | ------- | ---------------------------- |
|
||||||
|
| `PACKET_BYTES_MEASUREMENT_SECS` | `10` | Criterion `measurement_time` |
|
||||||
|
| `PACKET_BYTES_WARMUP_SECS` | `3` | Criterion `warm_up_time` |
|
||||||
|
| `PACKET_BYTES_SAMPLE_SIZE` | `10` | Criterion `sample_size` (min 10) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## TX Throughput Benchmark
|
||||||
|
|
||||||
|
Criterion benchmark for EasyTier's TX injection path (`peer_manager::send_msg_by_ip`).
|
||||||
|
|
||||||
|
## What it measures
|
||||||
|
|
||||||
|
The benchmark sets up two EasyTier instances (`hot-a` / `hot-b`) and drives
|
||||||
|
packets from `hot-a` to `hot-b` via `peer_manager.send_msg_by_ip`. This is the
|
||||||
|
same entry point `easytier-core` uses for daily forwarded traffic, so the
|
||||||
|
numbers reflect the real TX hot path: NIC pipeline → route lookup →
|
||||||
|
compress/encrypt → peer connection → tunnel send.
|
||||||
|
|
||||||
|
Two variants are reported per tunnel kind:
|
||||||
|
|
||||||
|
| Bench | What it measures |
|
||||||
|
| --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
|
| `tx_throughput/<tunnel>` | Serial baseline. One send in flight at a time. Reports per-packet CPU cost (TX injection latency). |
|
||||||
|
| `tx_throughput/<tunnel>-saturate` | Spawns `TX_THROUGHPUT_INFLIGHT` tokio tasks that independently pump `send_msg_by_ip`. Reports the aggregate throughput ceiling the peer manager + tunnel can sustain across worker threads. |
|
||||||
|
|
||||||
|
> **Out of scope (by design):** TUN read/write (`no_tun = true`), compression
|
||||||
|
> (default `None`), reverse/RX-side measurement, multi-peer fanout. Add
|
||||||
|
> separate benchmarks if you need those.
|
||||||
|
|
||||||
|
## Quick start
|
||||||
|
|
||||||
|
### ring tunnel (no root, fastest)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo bench --bench tx_throughput
|
||||||
|
```
|
||||||
|
|
||||||
|
Smoke run (faster iteration):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
TX_THROUGHPUT_MEASUREMENT_SECS=2 \
|
||||||
|
TX_THROUGHPUT_WARMUP_SECS=1 \
|
||||||
|
TX_THROUGHPUT_SAMPLE_SIZE=10 \
|
||||||
|
cargo bench --bench tx_throughput -- --quiet
|
||||||
|
```
|
||||||
|
|
||||||
|
### tcp / udp tunnels (requires Docker + root)
|
||||||
|
|
||||||
|
The benchmark creates a Docker network and registers each container's netns
|
||||||
|
under `/var/run/netns`, which requires root. Run the whole command under
|
||||||
|
`sudo`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo TX_THROUGHPUT_TUNNEL=tcp \
|
||||||
|
TX_THROUGHPUT_MEASUREMENT_SECS=5 \
|
||||||
|
TX_THROUGHPUT_WARMUP_SECS=2 \
|
||||||
|
TX_THROUGHPUT_INFLIGHT=64 \
|
||||||
|
cargo bench --bench tx_throughput -- --quiet
|
||||||
|
|
||||||
|
sudo TX_THROUGHPUT_TUNNEL=udp cargo bench --bench tx_throughput -- --quiet
|
||||||
|
```
|
||||||
|
|
||||||
|
> If `sudo` cannot find `cargo`, use `sudo -E` or the absolute path
|
||||||
|
> (`$(which cargo)`).
|
||||||
|
|
||||||
|
## Environment variables
|
||||||
|
|
||||||
|
| Variable | Default | Notes |
|
||||||
|
| -------------------------------- | --------------------- | -------------------------------------- |
|
||||||
|
| `TX_THROUGHPUT_TUNNEL` | `ring` | `ring` / `tcp` / `udp` |
|
||||||
|
| `TX_THROUGHPUT_PKT_SIZE` | `1400` | IP total length in bytes |
|
||||||
|
| `TX_THROUGHPUT_WORKER_THREADS` | `4` | tokio worker threads |
|
||||||
|
| `TX_THROUGHPUT_INFLIGHT` | `64` | saturate-mode concurrency (task count) |
|
||||||
|
| `TX_THROUGHPUT_TUNNEL_PORT` | `35521` | tcp/udp listen port |
|
||||||
|
| `TX_THROUGHPUT_MEASUREMENT_SECS` | `10` | Criterion `measurement_time` |
|
||||||
|
| `TX_THROUGHPUT_WARMUP_SECS` | `3` | Criterion `warm_up_time` |
|
||||||
|
| `TX_THROUGHPUT_SAMPLE_SIZE` | `10` | Criterion `sample_size` (min 10) |
|
||||||
|
| `TX_THROUGHPUT_DOCKER_IMAGE` | `busybox:latest` | tcp/udp only |
|
||||||
|
| `TX_THROUGHPUT_DOCKER_NET` | `easytier-bench-<id>` | auto-generated unique name |
|
||||||
|
| `TX_THROUGHPUT_DOCKER_SUBNET` | `172.31.250.0/24` | |
|
||||||
|
| `TX_THROUGHPUT_DOCKER_IP_A` | `172.31.250.2` | |
|
||||||
|
| `TX_THROUGHPUT_DOCKER_IP_B` | `172.31.250.3` | |
|
||||||
|
|
||||||
|
## Parameter sweeps
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Packet size
|
||||||
|
for sz in 64 256 1400 9000; do
|
||||||
|
TX_THROUGHPUT_PKT_SIZE=$sz cargo bench --bench tx_throughput -- --quick
|
||||||
|
done
|
||||||
|
|
||||||
|
# Inflight depth (self-check: depth=1 should match serial baseline)
|
||||||
|
for d in 1 4 16 64 256; do
|
||||||
|
TX_THROUGHPUT_INFLIGHT=$d cargo bench --bench tx_throughput -- --quick
|
||||||
|
done
|
||||||
|
|
||||||
|
# Worker threads
|
||||||
|
for w in 1 2 4 8; do
|
||||||
|
TX_THROUGHPUT_WORKER_THREADS=$w cargo bench --bench tx_throughput -- --quick
|
||||||
|
done
|
||||||
|
```
|
||||||
|
|
||||||
|
## Interpreting results
|
||||||
|
|
||||||
|
- **`<tunnel>`** reports per-packet latency. Lower is better. Throughput
|
||||||
|
column here is "what one in-flight sender sustains".
|
||||||
|
- **`<tunnel>-saturate`** reports aggregate throughput across
|
||||||
|
`TX_THROUGHPUT_INFLIGHT` concurrent senders. If this matches the serial
|
||||||
|
baseline, the TX path is bottlenecked on an internal serialization point
|
||||||
|
(lock, single-threaded queue, etc.) rather than CPU or link bandwidth.
|
||||||
|
|
||||||
|
### Known finding (ring, single peer)
|
||||||
|
|
||||||
|
On the ring tunnel with a single destination peer, saturate does **not** beat
|
||||||
|
serial (observed ~277 MiB/s saturate vs ~288 MiB/s serial on a 4-worker
|
||||||
|
runtime). This points to a serialization point inside the peer-connection TX
|
||||||
|
path. Tunnels with real I/O await points (tcp/udp via Docker) are expected to
|
||||||
|
show a saturate > serial gap; verify with the sudo commands above.
|
||||||
|
|
||||||
|
## Output artifacts
|
||||||
|
|
||||||
|
Criterion writes HTML reports + SVG plots under
|
||||||
|
`easytier/target/criterion/`. Open `tx_throughput/<tunnel>/report/index.html`
|
||||||
|
or `.../<tunnel>-saturate/report/index.html` in a browser to inspect
|
||||||
|
distributions and regressions across runs.
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
use std::hint::black_box;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use criterion::{BatchSize, Criterion, Throughput, criterion_group, criterion_main};
|
||||||
|
|
||||||
|
use easytier::tunnel::packet_def::ZCPacket;
|
||||||
|
|
||||||
|
const PAYLOAD_SIZES: &[usize] = &[1280, 4096];
|
||||||
|
|
||||||
|
fn env_parse<T: std::str::FromStr>(key: &str, default: T) -> T {
|
||||||
|
std::env::var(key)
|
||||||
|
.ok()
|
||||||
|
.and_then(|v| v.parse().ok())
|
||||||
|
.unwrap_or(default)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bench_payload_bytes(c: &mut Criterion) {
|
||||||
|
let mut group = c.benchmark_group("payload_bytes");
|
||||||
|
for &size in PAYLOAD_SIZES {
|
||||||
|
let data = vec![0u8; size];
|
||||||
|
group.throughput(Throughput::Bytes(size as u64));
|
||||||
|
group.bench_with_input(format!("{size}"), &data, |b, data| {
|
||||||
|
b.iter_batched(
|
||||||
|
|| ZCPacket::new_with_payload(black_box(data)),
|
||||||
|
|p| black_box(p).payload_bytes(),
|
||||||
|
BatchSize::SmallInput,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
group.finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bench_tunnel_payload_bytes(c: &mut Criterion) {
|
||||||
|
let mut group = c.benchmark_group("tunnel_payload_bytes");
|
||||||
|
for &size in PAYLOAD_SIZES {
|
||||||
|
let data = vec![0u8; size];
|
||||||
|
group.throughput(Throughput::Bytes(size as u64));
|
||||||
|
group.bench_with_input(format!("{size}"), &data, |b, data| {
|
||||||
|
b.iter_batched(
|
||||||
|
|| ZCPacket::new_with_payload(black_box(data)),
|
||||||
|
|p| black_box(p).tunnel_payload_bytes(),
|
||||||
|
BatchSize::SmallInput,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
group.finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn criterion_config() -> Criterion {
|
||||||
|
let measurement_secs = env_parse("PACKET_BYTES_MEASUREMENT_SECS", 10u64);
|
||||||
|
let warmup_secs = env_parse("PACKET_BYTES_WARMUP_SECS", 3u64);
|
||||||
|
let sample_size = env_parse("PACKET_BYTES_SAMPLE_SIZE", 10usize).max(10);
|
||||||
|
|
||||||
|
Criterion::default()
|
||||||
|
.measurement_time(Duration::from_secs(measurement_secs))
|
||||||
|
.warm_up_time(Duration::from_secs(warmup_secs))
|
||||||
|
.sample_size(sample_size)
|
||||||
|
}
|
||||||
|
|
||||||
|
criterion_group! {
|
||||||
|
name = benches;
|
||||||
|
config = criterion_config();
|
||||||
|
targets = bench_payload_bytes, bench_tunnel_payload_bytes
|
||||||
|
}
|
||||||
|
criterion_main!(benches);
|
||||||
@@ -0,0 +1,472 @@
|
|||||||
|
use std::{
|
||||||
|
net::IpAddr,
|
||||||
|
path::PathBuf,
|
||||||
|
process::{Command, Stdio},
|
||||||
|
str::FromStr,
|
||||||
|
sync::Arc,
|
||||||
|
sync::atomic::{AtomicU64, Ordering},
|
||||||
|
time::{Duration, Instant, SystemTime, UNIX_EPOCH},
|
||||||
|
};
|
||||||
|
|
||||||
|
use bytes::BytesMut;
|
||||||
|
use criterion::{Criterion, Throughput, criterion_group, criterion_main};
|
||||||
|
|
||||||
|
use easytier::{
|
||||||
|
common::config::{ConfigLoader, TomlConfigLoader},
|
||||||
|
instance::instance::Instance,
|
||||||
|
tunnel::{
|
||||||
|
packet_def::ZCPacket, ring::RingTunnelConnector, tcp::TcpTunnelConnector,
|
||||||
|
udp::UdpTunnelConnector,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const VIRTUAL_IP_A: &str = "10.144.144.1";
|
||||||
|
const VIRTUAL_IP_B: &str = "10.144.144.2";
|
||||||
|
const DEFAULT_DOCKER_SUBNET: &str = "172.31.250.0/24";
|
||||||
|
const DEFAULT_DOCKER_IP_A: &str = "172.31.250.2";
|
||||||
|
const DEFAULT_DOCKER_IP_B: &str = "172.31.250.3";
|
||||||
|
const DEFAULT_TUNNEL_PORT: u16 = 35521;
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug)]
|
||||||
|
enum TunnelKind {
|
||||||
|
Ring,
|
||||||
|
Tcp,
|
||||||
|
Udp,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TunnelKind {
|
||||||
|
fn as_str(self) -> &'static str {
|
||||||
|
match self {
|
||||||
|
TunnelKind::Ring => "ring",
|
||||||
|
TunnelKind::Tcp => "tcp",
|
||||||
|
TunnelKind::Udp => "udp",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FromStr for TunnelKind {
|
||||||
|
type Err = String;
|
||||||
|
|
||||||
|
fn from_str(value: &str) -> Result<Self, Self::Err> {
|
||||||
|
match value {
|
||||||
|
"ring" => Ok(TunnelKind::Ring),
|
||||||
|
"tcp" => Ok(TunnelKind::Tcp),
|
||||||
|
"udp" => Ok(TunnelKind::Udp),
|
||||||
|
other => Err(format!(
|
||||||
|
"unsupported TX_THROUGHPUT_TUNNEL={other:?}; expected ring, tcp, or udp"
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct BenchTopology {
|
||||||
|
_docker: Option<DockerNetns>,
|
||||||
|
inst_a: Instance,
|
||||||
|
_inst_b: Instance,
|
||||||
|
dst: IpAddr,
|
||||||
|
packet: ZCPacket,
|
||||||
|
}
|
||||||
|
|
||||||
|
struct DockerNetns {
|
||||||
|
network: String,
|
||||||
|
container_a: String,
|
||||||
|
container_b: String,
|
||||||
|
netns_a: String,
|
||||||
|
netns_b: String,
|
||||||
|
ip_a: String,
|
||||||
|
netns_a_path: PathBuf,
|
||||||
|
netns_b_path: PathBuf,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl DockerNetns {
|
||||||
|
fn create() -> Self {
|
||||||
|
let id = unique_id();
|
||||||
|
let image = env_string("TX_THROUGHPUT_DOCKER_IMAGE", "busybox:latest");
|
||||||
|
let network = env_string("TX_THROUGHPUT_DOCKER_NET", &format!("easytier-bench-{id}"));
|
||||||
|
let subnet = env_string("TX_THROUGHPUT_DOCKER_SUBNET", DEFAULT_DOCKER_SUBNET);
|
||||||
|
let ip_a = env_string("TX_THROUGHPUT_DOCKER_IP_A", DEFAULT_DOCKER_IP_A);
|
||||||
|
let ip_b = env_string("TX_THROUGHPUT_DOCKER_IP_B", DEFAULT_DOCKER_IP_B);
|
||||||
|
let container_a = format!("easytier-bench-a-{id}");
|
||||||
|
let container_b = format!("easytier-bench-b-{id}");
|
||||||
|
let netns_a = format!("easytier-bench-a-{id}");
|
||||||
|
let netns_b = format!("easytier-bench-b-{id}");
|
||||||
|
|
||||||
|
docker(&[
|
||||||
|
"network", "create", "--driver", "bridge", "--subnet", &subnet, &network,
|
||||||
|
]);
|
||||||
|
|
||||||
|
let mut docker_netns = Self {
|
||||||
|
network,
|
||||||
|
container_a,
|
||||||
|
container_b,
|
||||||
|
netns_a,
|
||||||
|
netns_b,
|
||||||
|
ip_a: ip_a.clone(),
|
||||||
|
netns_a_path: PathBuf::new(),
|
||||||
|
netns_b_path: PathBuf::new(),
|
||||||
|
};
|
||||||
|
|
||||||
|
docker_netns.start_container(&docker_netns.container_a, &ip_a, &image);
|
||||||
|
docker_netns.start_container(&docker_netns.container_b, &ip_b, &image);
|
||||||
|
|
||||||
|
let pid_a = docker(&["inspect", "-f", "{{.State.Pid}}", &docker_netns.container_a]);
|
||||||
|
let pid_b = docker(&["inspect", "-f", "{{.State.Pid}}", &docker_netns.container_b]);
|
||||||
|
|
||||||
|
docker_netns.netns_a_path = register_netns(&docker_netns.netns_a, &pid_a);
|
||||||
|
docker_netns.netns_b_path = register_netns(&docker_netns.netns_b, &pid_b);
|
||||||
|
docker_netns
|
||||||
|
}
|
||||||
|
|
||||||
|
fn start_container(&self, name: &str, ip: &str, image: &str) {
|
||||||
|
docker(&[
|
||||||
|
"run",
|
||||||
|
"-d",
|
||||||
|
"--name",
|
||||||
|
name,
|
||||||
|
"--network",
|
||||||
|
&self.network,
|
||||||
|
"--ip",
|
||||||
|
ip,
|
||||||
|
image,
|
||||||
|
"sleep",
|
||||||
|
"3600",
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for DockerNetns {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let _ = std::fs::remove_file(&self.netns_a_path);
|
||||||
|
let _ = std::fs::remove_file(&self.netns_b_path);
|
||||||
|
docker_ignore(&["rm", "-f", &self.container_a, &self.container_b]);
|
||||||
|
docker_ignore(&["network", "rm", &self.network]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bench_tx_throughput(c: &mut Criterion) {
|
||||||
|
let tunnel = env_string("TX_THROUGHPUT_TUNNEL", "ring")
|
||||||
|
.parse::<TunnelKind>()
|
||||||
|
.unwrap_or_else(|err| panic!("{err}"));
|
||||||
|
let packet_size = env_parse("TX_THROUGHPUT_PKT_SIZE", 1400usize);
|
||||||
|
const MIN_PKT_SIZE: usize = 28; // IPv4 (20) + UDP (8) header
|
||||||
|
assert!(
|
||||||
|
packet_size >= MIN_PKT_SIZE,
|
||||||
|
"TX_THROUGHPUT_PKT_SIZE={packet_size} is smaller than the minimum {MIN_PKT_SIZE} (IPv4+UDP headers)"
|
||||||
|
);
|
||||||
|
let worker_threads = env_parse("TX_THROUGHPUT_WORKER_THREADS", 4usize);
|
||||||
|
let inflight_depth = env_parse("TX_THROUGHPUT_INFLIGHT", 64usize).max(1);
|
||||||
|
let runtime = tokio::runtime::Builder::new_multi_thread()
|
||||||
|
.worker_threads(worker_threads)
|
||||||
|
.enable_all()
|
||||||
|
.build()
|
||||||
|
.expect("create tokio runtime");
|
||||||
|
|
||||||
|
let topology = runtime.block_on(setup_topology(tunnel, packet_size));
|
||||||
|
let peer_manager = topology.inst_a.get_peer_manager();
|
||||||
|
let packet = topology.packet.clone();
|
||||||
|
let dst = topology.dst;
|
||||||
|
|
||||||
|
eprintln!(
|
||||||
|
"tx_throughput: tunnel={} inflight={} workers={} pkt_size={}",
|
||||||
|
tunnel.as_str(),
|
||||||
|
inflight_depth.max(1),
|
||||||
|
worker_threads,
|
||||||
|
packet_size
|
||||||
|
);
|
||||||
|
|
||||||
|
let mut group = c.benchmark_group("tx_throughput");
|
||||||
|
group.throughput(Throughput::Bytes(packet_size as u64));
|
||||||
|
|
||||||
|
// Serial baseline: one packet in flight at a time.
|
||||||
|
// Measures per-packet CPU cost (TX injection latency).
|
||||||
|
group.bench_function(tunnel.as_str(), |b| {
|
||||||
|
b.iter_custom(|iterations| {
|
||||||
|
let pm = peer_manager.clone();
|
||||||
|
let pkt = packet.clone();
|
||||||
|
runtime.block_on(async move {
|
||||||
|
let start = Instant::now();
|
||||||
|
for _ in 0..iterations {
|
||||||
|
pm.send_msg_by_ip(pkt.clone(), dst, false)
|
||||||
|
.await
|
||||||
|
.expect("send packet by EasyTier IP");
|
||||||
|
}
|
||||||
|
start.elapsed()
|
||||||
|
})
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Saturate: spawn TX_THROUGHPUT_INFLIGHT worker tasks, each independently
|
||||||
|
// pumping send_msg_by_ip. Work is distributed across tokio worker threads,
|
||||||
|
// exposing the peer manager + tunnel's true aggregate throughput ceiling.
|
||||||
|
// With TX_THROUGHPUT_INFLIGHT=1 it degrades to the serial baseline.
|
||||||
|
group.bench_function(format!("{}-saturate", tunnel.as_str()), |b| {
|
||||||
|
b.iter_custom(|iterations| {
|
||||||
|
let pm = peer_manager.clone();
|
||||||
|
let pkt = packet.clone();
|
||||||
|
let concurrency = inflight_depth.min(iterations as usize).max(1);
|
||||||
|
runtime.block_on(async move {
|
||||||
|
let counter = Arc::new(AtomicU64::new(iterations));
|
||||||
|
let start = Instant::now();
|
||||||
|
let mut handles = Vec::with_capacity(concurrency);
|
||||||
|
for _ in 0..concurrency {
|
||||||
|
let pm = pm.clone();
|
||||||
|
let pkt = pkt.clone();
|
||||||
|
let counter = counter.clone();
|
||||||
|
handles.push(tokio::spawn(async move {
|
||||||
|
loop {
|
||||||
|
if counter
|
||||||
|
.fetch_update(Ordering::AcqRel, Ordering::Acquire, |cur| {
|
||||||
|
if cur > 0 { Some(cur - 1) } else { None }
|
||||||
|
})
|
||||||
|
.is_err()
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
pm.send_msg_by_ip(pkt.clone(), dst, false)
|
||||||
|
.await
|
||||||
|
.expect("send packet by EasyTier IP");
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
for h in handles {
|
||||||
|
h.await.expect("saturate worker task panicked");
|
||||||
|
}
|
||||||
|
start.elapsed()
|
||||||
|
})
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
group.finish();
|
||||||
|
|
||||||
|
runtime.block_on(async move {
|
||||||
|
drop(topology);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn setup_topology(tunnel: TunnelKind, packet_size: usize) -> BenchTopology {
|
||||||
|
let tunnel_port = env_parse("TX_THROUGHPUT_TUNNEL_PORT", DEFAULT_TUNNEL_PORT);
|
||||||
|
let docker = match tunnel {
|
||||||
|
TunnelKind::Ring => None,
|
||||||
|
TunnelKind::Tcp | TunnelKind::Udp => Some(DockerNetns::create()),
|
||||||
|
};
|
||||||
|
|
||||||
|
let (netns_a, netns_b) = match &docker {
|
||||||
|
Some(docker) => (Some(docker.netns_a.clone()), Some(docker.netns_b.clone())),
|
||||||
|
None => (None, None),
|
||||||
|
};
|
||||||
|
let listeners_a = match tunnel {
|
||||||
|
TunnelKind::Ring => Vec::new(),
|
||||||
|
TunnelKind::Tcp | TunnelKind::Udp => vec![
|
||||||
|
format!("{}://0.0.0.0:{}", tunnel.as_str(), tunnel_port)
|
||||||
|
.parse()
|
||||||
|
.unwrap(),
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut inst_a = Instance::new(no_tun_config("hot-a", VIRTUAL_IP_A, netns_a, listeners_a));
|
||||||
|
let mut inst_b = Instance::new(no_tun_config("hot-b", VIRTUAL_IP_B, netns_b, Vec::new()));
|
||||||
|
|
||||||
|
inst_a.run().await.expect("inst_a run");
|
||||||
|
inst_b.run().await.expect("inst_b run");
|
||||||
|
|
||||||
|
match tunnel {
|
||||||
|
TunnelKind::Ring => inst_b
|
||||||
|
.get_conn_manager()
|
||||||
|
.add_connector(RingTunnelConnector::new(
|
||||||
|
format!("ring://{}", inst_a.id()).parse().unwrap(),
|
||||||
|
)),
|
||||||
|
TunnelKind::Tcp => inst_b
|
||||||
|
.get_conn_manager()
|
||||||
|
.add_connector(TcpTunnelConnector::new(
|
||||||
|
format!(
|
||||||
|
"tcp://{}:{}",
|
||||||
|
docker.as_ref().expect("tcp benchmark needs Docker").ip_a,
|
||||||
|
tunnel_port
|
||||||
|
)
|
||||||
|
.parse()
|
||||||
|
.unwrap(),
|
||||||
|
)),
|
||||||
|
TunnelKind::Udp => inst_b
|
||||||
|
.get_conn_manager()
|
||||||
|
.add_connector(UdpTunnelConnector::new(
|
||||||
|
format!(
|
||||||
|
"udp://{}:{}",
|
||||||
|
docker.as_ref().expect("udp benchmark needs Docker").ip_a,
|
||||||
|
tunnel_port
|
||||||
|
)
|
||||||
|
.parse()
|
||||||
|
.unwrap(),
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
|
||||||
|
wait_for_routes(&inst_a, &inst_b).await;
|
||||||
|
|
||||||
|
BenchTopology {
|
||||||
|
_docker: docker,
|
||||||
|
inst_a,
|
||||||
|
_inst_b: inst_b,
|
||||||
|
dst: VIRTUAL_IP_B.parse().unwrap(),
|
||||||
|
packet: make_data_packet(VIRTUAL_IP_A, VIRTUAL_IP_B, packet_size),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn wait_for_routes(inst_a: &Instance, inst_b: &Instance) {
|
||||||
|
tokio::time::timeout(Duration::from_secs(15), async {
|
||||||
|
loop {
|
||||||
|
let routes_a = inst_a.get_peer_manager().list_routes().await;
|
||||||
|
let routes_b = inst_b.get_peer_manager().list_routes().await;
|
||||||
|
if !routes_a.is_empty() && !routes_b.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
tokio::time::sleep(Duration::from_millis(500)).await;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.expect("EasyTier routes did not converge within 15s");
|
||||||
|
}
|
||||||
|
|
||||||
|
fn make_data_packet(src: &str, dst: &str, total_size: usize) -> ZCPacket {
|
||||||
|
use std::net::Ipv4Addr;
|
||||||
|
|
||||||
|
let hdr_len = 28;
|
||||||
|
let payload_len = total_size.saturating_sub(hdr_len);
|
||||||
|
let ip_total_len = (hdr_len + payload_len) as u16;
|
||||||
|
let mut buf = BytesMut::with_capacity(total_size);
|
||||||
|
|
||||||
|
buf.extend_from_slice(&[
|
||||||
|
0x45,
|
||||||
|
0x00,
|
||||||
|
(ip_total_len >> 8) as u8,
|
||||||
|
(ip_total_len & 0xff) as u8,
|
||||||
|
0x00,
|
||||||
|
0x00,
|
||||||
|
0x40,
|
||||||
|
0x00,
|
||||||
|
0x40,
|
||||||
|
0x11,
|
||||||
|
0x00,
|
||||||
|
0x00,
|
||||||
|
]);
|
||||||
|
let src: Ipv4Addr = src.parse().unwrap();
|
||||||
|
buf.extend_from_slice(&src.octets());
|
||||||
|
let dst: Ipv4Addr = dst.parse().unwrap();
|
||||||
|
buf.extend_from_slice(&dst.octets());
|
||||||
|
|
||||||
|
let udp_len = (8 + payload_len) as u16;
|
||||||
|
buf.extend_from_slice(&[
|
||||||
|
0x30,
|
||||||
|
0x39,
|
||||||
|
0xd4,
|
||||||
|
0x31,
|
||||||
|
(udp_len >> 8) as u8,
|
||||||
|
(udp_len & 0xff) as u8,
|
||||||
|
0x00,
|
||||||
|
0x00,
|
||||||
|
]);
|
||||||
|
|
||||||
|
buf.resize(total_size, 0xaa);
|
||||||
|
ZCPacket::new_with_payload(&buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn no_tun_config(
|
||||||
|
name: &str,
|
||||||
|
ipv4: &str,
|
||||||
|
netns: Option<String>,
|
||||||
|
listeners: Vec<url::Url>,
|
||||||
|
) -> TomlConfigLoader {
|
||||||
|
let config = TomlConfigLoader::default();
|
||||||
|
config.set_inst_name(name.to_owned());
|
||||||
|
config.set_netns(netns);
|
||||||
|
config.set_ipv4(Some(ipv4.parse().unwrap()));
|
||||||
|
config.set_listeners(listeners);
|
||||||
|
let mut flags = config.get_flags();
|
||||||
|
flags.no_tun = true;
|
||||||
|
config.set_flags(flags);
|
||||||
|
config
|
||||||
|
}
|
||||||
|
|
||||||
|
fn register_netns(name: &str, pid: &str) -> PathBuf {
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
{
|
||||||
|
let dir = PathBuf::from("/var/run/netns");
|
||||||
|
std::fs::create_dir_all(&dir).expect("create /var/run/netns");
|
||||||
|
let path = dir.join(name);
|
||||||
|
let _ = std::fs::remove_file(&path);
|
||||||
|
std::os::unix::fs::symlink(format!("/proc/{pid}/ns/net"), &path)
|
||||||
|
.expect("link Docker netns into /var/run/netns");
|
||||||
|
path
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
{
|
||||||
|
let _ = (name, pid);
|
||||||
|
panic!("Docker netns benchmark requires Linux");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn docker(args: &[&str]) -> String {
|
||||||
|
let output = Command::new("docker")
|
||||||
|
.args(args)
|
||||||
|
.output()
|
||||||
|
.unwrap_or_else(|err| panic!("failed to run docker {args:?}: {err}"));
|
||||||
|
if !output.status.success() {
|
||||||
|
panic!(
|
||||||
|
"docker {:?} failed with status {:?}: {}",
|
||||||
|
args,
|
||||||
|
output.status.code(),
|
||||||
|
String::from_utf8_lossy(&output.stderr)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
String::from_utf8_lossy(&output.stdout).trim().to_owned()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn docker_ignore(args: &[&str]) {
|
||||||
|
let _ = Command::new("docker")
|
||||||
|
.args(args)
|
||||||
|
.stdout(Stdio::null())
|
||||||
|
.stderr(Stdio::null())
|
||||||
|
.status();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn env_string(name: &str, default: &str) -> String {
|
||||||
|
std::env::var(name).unwrap_or_else(|_| default.to_owned())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn env_parse<T>(name: &str, default: T) -> T
|
||||||
|
where
|
||||||
|
T: FromStr,
|
||||||
|
T::Err: std::fmt::Display,
|
||||||
|
{
|
||||||
|
match std::env::var(name) {
|
||||||
|
Ok(value) => value
|
||||||
|
.parse()
|
||||||
|
.unwrap_or_else(|err| panic!("invalid {name}={value:?}: {err}")),
|
||||||
|
Err(_) => default,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn criterion_config() -> Criterion {
|
||||||
|
let measurement_secs = env_parse("TX_THROUGHPUT_MEASUREMENT_SECS", 10u64);
|
||||||
|
let warmup_secs = env_parse("TX_THROUGHPUT_WARMUP_SECS", 3u64);
|
||||||
|
let sample_size = env_parse("TX_THROUGHPUT_SAMPLE_SIZE", 10usize).max(10);
|
||||||
|
|
||||||
|
Criterion::default()
|
||||||
|
.measurement_time(Duration::from_secs(measurement_secs))
|
||||||
|
.warm_up_time(Duration::from_secs(warmup_secs))
|
||||||
|
.sample_size(sample_size)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn unique_id() -> String {
|
||||||
|
let nanos = SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)
|
||||||
|
.expect("system clock before UNIX epoch")
|
||||||
|
.as_nanos();
|
||||||
|
format!("{}-{nanos}", std::process::id())
|
||||||
|
}
|
||||||
|
|
||||||
|
criterion_group! {
|
||||||
|
name = benches;
|
||||||
|
config = criterion_config();
|
||||||
|
targets = bench_tx_throughput
|
||||||
|
}
|
||||||
|
criterion_main!(benches);
|
||||||
@@ -6,7 +6,7 @@ use std::{
|
|||||||
time::{Duration, SystemTime, UNIX_EPOCH},
|
time::{Duration, SystemTime, UNIX_EPOCH},
|
||||||
};
|
};
|
||||||
|
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
|
|
||||||
use crate::common::{config::ConfigLoader, global_ctx::ArcGlobalCtx, token_bucket::TokenBucket};
|
use crate::common::{config::ConfigLoader, global_ctx::ArcGlobalCtx, token_bucket::TokenBucket};
|
||||||
use crate::proto::acl::*;
|
use crate::proto::acl::*;
|
||||||
|
|||||||
@@ -219,6 +219,7 @@ pub struct GlobalCtx {
|
|||||||
|
|
||||||
running_listeners: Mutex<Vec<url::Url>>,
|
running_listeners: Mutex<Vec<url::Url>>,
|
||||||
advertised_ipv6_public_addr_prefix: Mutex<Option<cidr::Ipv6Cidr>>,
|
advertised_ipv6_public_addr_prefix: Mutex<Option<cidr::Ipv6Cidr>>,
|
||||||
|
tun_device_name: Mutex<Option<String>>,
|
||||||
|
|
||||||
flags: ArcSwap<Flags>,
|
flags: ArcSwap<Flags>,
|
||||||
|
|
||||||
@@ -336,6 +337,7 @@ impl GlobalCtx {
|
|||||||
|
|
||||||
running_listeners: Mutex::new(Vec::new()),
|
running_listeners: Mutex::new(Vec::new()),
|
||||||
advertised_ipv6_public_addr_prefix: Mutex::new(None),
|
advertised_ipv6_public_addr_prefix: Mutex::new(None),
|
||||||
|
tun_device_name: Mutex::new(None),
|
||||||
|
|
||||||
flags: ArcSwap::new(Arc::new(flags)),
|
flags: ArcSwap::new(Arc::new(flags)),
|
||||||
|
|
||||||
@@ -370,6 +372,24 @@ impl GlobalCtx {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn set_tun_device_name(&self, name: Option<String>) {
|
||||||
|
*self.tun_device_name.lock().unwrap() = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn set_tun_device_ready(&self, name: String) {
|
||||||
|
self.set_tun_device_name(Some(name.clone()));
|
||||||
|
self.issue_event(GlobalCtxEvent::TunDeviceReady(name));
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn set_tun_device_error(&self, error: String) {
|
||||||
|
self.set_tun_device_name(None);
|
||||||
|
self.issue_event(GlobalCtxEvent::TunDeviceError(error));
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_tun_device_name(&self) -> Option<String> {
|
||||||
|
self.tun_device_name.lock().unwrap().clone()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn check_network_in_whitelist(&self, network_name: &str) -> Result<(), anyhow::Error> {
|
pub fn check_network_in_whitelist(&self, network_name: &str) -> Result<(), anyhow::Error> {
|
||||||
if self
|
if self
|
||||||
.get_flags()
|
.get_flags()
|
||||||
@@ -825,6 +845,36 @@ pub mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_tun_device_name_tracks_explicit_runtime_state() {
|
||||||
|
let config = TomlConfigLoader::default();
|
||||||
|
let global_ctx = GlobalCtx::new(config);
|
||||||
|
|
||||||
|
assert_eq!(global_ctx.get_tun_device_name(), None);
|
||||||
|
|
||||||
|
global_ctx.issue_event(GlobalCtxEvent::TunDeviceReady("ignored".to_string()));
|
||||||
|
assert_eq!(global_ctx.get_tun_device_name(), None);
|
||||||
|
|
||||||
|
let mut subscriber = global_ctx.subscribe();
|
||||||
|
|
||||||
|
global_ctx.set_tun_device_ready("easytier0".to_string());
|
||||||
|
assert_eq!(
|
||||||
|
global_ctx.get_tun_device_name(),
|
||||||
|
Some("easytier0".to_string())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
subscriber.recv().await.unwrap(),
|
||||||
|
GlobalCtxEvent::TunDeviceReady("easytier0".to_string())
|
||||||
|
);
|
||||||
|
|
||||||
|
global_ctx.set_tun_device_error("closed".to_string());
|
||||||
|
assert_eq!(global_ctx.get_tun_device_name(), None);
|
||||||
|
assert_eq!(
|
||||||
|
subscriber.recv().await.unwrap(),
|
||||||
|
GlobalCtxEvent::TunDeviceError("closed".to_string())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn trusted_key_source_lookup_is_precise() {
|
async fn trusted_key_source_lookup_is_precise() {
|
||||||
let config = TomlConfigLoader::default();
|
let config = TomlConfigLoader::default();
|
||||||
|
|||||||
@@ -177,3 +177,20 @@ pub(crate) fn list_ipv6_route_messages()
|
|||||||
pub(crate) fn get_interface_index(name: &str) -> Result<u32, Error> {
|
pub(crate) fn get_interface_index(name: &str) -> Result<u32, Error> {
|
||||||
netlink::NetlinkIfConfiger::get_interface_index(name)
|
netlink::NetlinkIfConfiger::get_interface_index(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
pub(crate) fn add_ipv6_ndp_proxy(name: &str, address: Ipv6Addr) -> Result<(), Error> {
|
||||||
|
netlink::NetlinkIfConfiger::add_ipv6_ndp_proxy(name, address)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
pub(crate) fn remove_ipv6_ndp_proxy(name: &str, address: Ipv6Addr) -> Result<(), Error> {
|
||||||
|
netlink::NetlinkIfConfiger::remove_ipv6_ndp_proxy(name, address)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
pub(crate) fn list_ipv6_ndp_proxy(
|
||||||
|
name: &str,
|
||||||
|
) -> Result<std::collections::BTreeSet<Ipv6Addr>, Error> {
|
||||||
|
netlink::NetlinkIfConfiger::list_ipv6_ndp_proxy(name)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
use std::{
|
use std::{
|
||||||
|
collections::BTreeSet,
|
||||||
ffi::CString,
|
ffi::CString,
|
||||||
fmt::Debug,
|
fmt::Debug,
|
||||||
net::{IpAddr, Ipv4Addr, Ipv6Addr},
|
net::{IpAddr, Ipv4Addr, Ipv6Addr},
|
||||||
@@ -16,6 +17,10 @@ use netlink_packet_core::{
|
|||||||
use netlink_packet_route::{
|
use netlink_packet_route::{
|
||||||
AddressFamily, RouteNetlinkMessage,
|
AddressFamily, RouteNetlinkMessage,
|
||||||
address::{AddressAttribute, AddressMessage},
|
address::{AddressAttribute, AddressMessage},
|
||||||
|
neighbour::{
|
||||||
|
NeighbourAddress, NeighbourAttribute, NeighbourFlags, NeighbourHeader, NeighbourMessage,
|
||||||
|
NeighbourState,
|
||||||
|
},
|
||||||
route::{
|
route::{
|
||||||
RouteAddress, RouteAttribute, RouteHeader, RouteMessage, RouteProtocol, RouteScope,
|
RouteAddress, RouteAttribute, RouteHeader, RouteMessage, RouteProtocol, RouteScope,
|
||||||
RouteType,
|
RouteType,
|
||||||
@@ -375,6 +380,105 @@ impl NetlinkIfConfiger {
|
|||||||
pub(crate) fn list_ipv6_route_messages() -> Result<Vec<RouteMessage>, Error> {
|
pub(crate) fn list_ipv6_route_messages() -> Result<Vec<RouteMessage>, Error> {
|
||||||
Self::list_route_messages(AddressFamily::Inet6)
|
Self::list_route_messages(AddressFamily::Inet6)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn ipv6_ndp_proxy_message(name: &str, address: Ipv6Addr) -> Result<NeighbourMessage, Error> {
|
||||||
|
let mut message = NeighbourMessage::default();
|
||||||
|
message.header = NeighbourHeader {
|
||||||
|
family: AddressFamily::Inet6,
|
||||||
|
ifindex: Self::get_interface_index(name)?,
|
||||||
|
state: NeighbourState::Permanent,
|
||||||
|
flags: NeighbourFlags::Proxy,
|
||||||
|
kind: RouteType::Unicast,
|
||||||
|
};
|
||||||
|
message
|
||||||
|
.attributes
|
||||||
|
.push(NeighbourAttribute::Destination(NeighbourAddress::Inet6(
|
||||||
|
address,
|
||||||
|
)));
|
||||||
|
Ok(message)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn add_ipv6_ndp_proxy(name: &str, address: Ipv6Addr) -> Result<(), Error> {
|
||||||
|
send_netlink_req_and_wait_one_resp(
|
||||||
|
RouteNetlinkMessage::NewNeighbour(Self::ipv6_ndp_proxy_message(name, address)?),
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn remove_ipv6_ndp_proxy(name: &str, address: Ipv6Addr) -> Result<(), Error> {
|
||||||
|
send_netlink_req_and_wait_one_resp(
|
||||||
|
RouteNetlinkMessage::DelNeighbour(Self::ipv6_ndp_proxy_message(name, address)?),
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn list_neighbour_messages(
|
||||||
|
address_family: AddressFamily,
|
||||||
|
) -> Result<Vec<NeighbourMessage>, Error> {
|
||||||
|
let mut message = NeighbourMessage::default();
|
||||||
|
message.header.family = address_family;
|
||||||
|
message.header.flags = NeighbourFlags::Proxy;
|
||||||
|
|
||||||
|
let s = send_netlink_req(
|
||||||
|
RouteNetlinkMessage::GetNeighbour(message),
|
||||||
|
NLM_F_REQUEST | NLM_F_DUMP,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
let mut ret_vec = vec![];
|
||||||
|
let mut resp = Vec::<u8>::new();
|
||||||
|
loop {
|
||||||
|
if resp.is_empty() {
|
||||||
|
let (new_resp, _) = s.recv_from_full()?;
|
||||||
|
resp = new_resp;
|
||||||
|
}
|
||||||
|
|
||||||
|
let ret = NetlinkMessage::<RouteNetlinkMessage>::deserialize(&resp)
|
||||||
|
.with_context(|| "Failed to deserialize netlink neighbour message")?;
|
||||||
|
resp = resp.split_off(ret.buffer_len());
|
||||||
|
|
||||||
|
tracing::debug!("net link response <<< {:?}", ret);
|
||||||
|
|
||||||
|
match ret.payload {
|
||||||
|
NetlinkPayload::Error(e) => {
|
||||||
|
if e.code == NonZero::new(0) {
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
|
return Err(e.to_io().into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
NetlinkPayload::InnerMessage(RouteNetlinkMessage::NewNeighbour(m)) => {
|
||||||
|
ret_vec.push(m);
|
||||||
|
}
|
||||||
|
NetlinkPayload::Done(_) => {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
p => {
|
||||||
|
tracing::error!("Unexpected netlink response: {:?}", p);
|
||||||
|
return Err(anyhow::anyhow!("Unexpected netlink response").into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(ret_vec)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn list_ipv6_ndp_proxy(name: &str) -> Result<BTreeSet<Ipv6Addr>, Error> {
|
||||||
|
let ifindex = Self::get_interface_index(name)?;
|
||||||
|
|
||||||
|
Ok(Self::list_neighbour_messages(AddressFamily::Inet6)?
|
||||||
|
.into_iter()
|
||||||
|
.filter(|message| {
|
||||||
|
message.header.ifindex == ifindex
|
||||||
|
&& message.header.flags.contains(NeighbourFlags::Proxy)
|
||||||
|
})
|
||||||
|
.filter_map(|message| {
|
||||||
|
message.attributes.into_iter().find_map(|attr| match attr {
|
||||||
|
NeighbourAttribute::Destination(NeighbourAddress::Inet6(addr)) => Some(addr),
|
||||||
|
_ => None,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::cell::UnsafeCell;
|
use std::cell::UnsafeCell;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ use crate::proto::common::{NatType, StunInfo};
|
|||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
use chrono::Local;
|
use chrono::Local;
|
||||||
use crossbeam::atomic::AtomicCell;
|
use crossbeam::atomic::AtomicCell;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use rand::seq::IteratorRandom;
|
use rand::seq::IteratorRandom;
|
||||||
use socket2::{SockAddr, SockRef};
|
use socket2::{SockAddr, SockRef};
|
||||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ use std::{
|
|||||||
time::Duration,
|
time::Duration,
|
||||||
};
|
};
|
||||||
|
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
common::{
|
common::{
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use dashmap::DashSet;
|
use dashmap::DashSet;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use tokio::{sync::mpsc, task::JoinSet, time::timeout};
|
use tokio::{sync::mpsc, task::JoinSet, time::timeout};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use anyhow::{Context, Error};
|
use anyhow::{Context, Error};
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use rand::Rng as _;
|
use rand::Rng as _;
|
||||||
use tokio::task::JoinSet;
|
use tokio::task::JoinSet;
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use tokio::sync::Mutex;
|
use tokio::sync::Mutex;
|
||||||
use tokio_util::task::AbortOnDropHandle;
|
use tokio_util::task::AbortOnDropHandle;
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use std::{
|
|||||||
use crossbeam::atomic::AtomicCell;
|
use crossbeam::atomic::AtomicCell;
|
||||||
use dashmap::{DashMap, DashSet};
|
use dashmap::{DashMap, DashSet};
|
||||||
use guarden::defer;
|
use guarden::defer;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use rand::seq::SliceRandom as _;
|
use rand::seq::SliceRandom as _;
|
||||||
use tokio::{net::UdpSocket, sync::Mutex, task::JoinSet};
|
use tokio::{net::UdpSocket, sync::Mutex, task::JoinSet};
|
||||||
use tracing::{Instrument, Level, instrument};
|
use tracing::{Instrument, Level, instrument};
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use std::{sync::Arc, time::Duration};
|
use std::{sync::Arc, time::Duration};
|
||||||
|
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use tokio::net::UdpSocket;
|
use tokio::net::UdpSocket;
|
||||||
use tokio_util::task::AbortOnDropHandle;
|
use tokio_util::task::AbortOnDropHandle;
|
||||||
|
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ use both_easy_sym::{PunchBothEasySymHoleClient, PunchBothEasySymHoleServer};
|
|||||||
use common::{PunchHoleServerCommon, UdpNatType, UdpPunchClientMethod};
|
use common::{PunchHoleServerCommon, UdpNatType, UdpPunchClientMethod};
|
||||||
use cone::{PunchConeHoleClient, PunchConeHoleServer};
|
use cone::{PunchConeHoleClient, PunchConeHoleServer};
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
|
use quanta::Instant;
|
||||||
use sym_to_cone::{PunchSymToConeHoleClient, PunchSymToConeHoleServer};
|
use sym_to_cone::{PunchSymToConeHoleClient, PunchSymToConeHoleServer};
|
||||||
use tokio::{sync::Mutex, task::JoinHandle};
|
use tokio::{sync::Mutex, task::JoinHandle};
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ use std::{
|
|||||||
|
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
use guarden::defer;
|
use guarden::defer;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use rand::{Rng, seq::SliceRandom};
|
use rand::{Rng, seq::SliceRandom};
|
||||||
use tokio::{net::UdpSocket, sync::RwLock};
|
use tokio::{net::UdpSocket, sync::RwLock};
|
||||||
use tokio_util::task::AbortOnDropHandle;
|
use tokio_util::task::AbortOnDropHandle;
|
||||||
|
|||||||
@@ -1,11 +1,5 @@
|
|||||||
use easytier::core;
|
use easytier::core;
|
||||||
|
|
||||||
#[cfg(all(
|
|
||||||
feature = "hotpath-alloc",
|
|
||||||
any(feature = "jemalloc", feature = "mimalloc")
|
|
||||||
))]
|
|
||||||
compile_error!("feature `hotpath-alloc` cannot be enabled together with `jemalloc` or `mimalloc`");
|
|
||||||
|
|
||||||
#[cfg(all(feature = "mimalloc", not(feature = "jemalloc")))]
|
#[cfg(all(feature = "mimalloc", not(feature = "jemalloc")))]
|
||||||
use mimalloc::MiMalloc;
|
use mimalloc::MiMalloc;
|
||||||
|
|
||||||
@@ -30,16 +24,6 @@ pub static malloc_conf: &[u8] = b"retain:false\0";
|
|||||||
rust_i18n::i18n!("locales", fallback = "en");
|
rust_i18n::i18n!("locales", fallback = "en");
|
||||||
|
|
||||||
#[tokio::main(flavor = "current_thread")]
|
#[tokio::main(flavor = "current_thread")]
|
||||||
#[cfg_attr(
|
|
||||||
all(
|
|
||||||
feature = "hotpath",
|
|
||||||
not(all(
|
|
||||||
feature = "hotpath-alloc",
|
|
||||||
any(feature = "jemalloc", feature = "mimalloc")
|
|
||||||
))
|
|
||||||
),
|
|
||||||
hotpath::main
|
|
||||||
)]
|
|
||||||
async fn main() -> std::process::ExitCode {
|
async fn main() -> std::process::ExitCode {
|
||||||
core::main().await
|
core::main().await
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,13 +7,13 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use pnet::packet::{
|
use pnet::packet::{
|
||||||
Packet,
|
Packet,
|
||||||
icmp::{self, IcmpCode, IcmpTypes, MutableIcmpPacket, echo_reply::MutableEchoReplyPacket},
|
icmp::{self, IcmpCode, IcmpTypes, MutableIcmpPacket, echo_reply::MutableEchoReplyPacket},
|
||||||
ip::IpNextHeaderProtocols,
|
ip::IpNextHeaderProtocols,
|
||||||
ipv4::Ipv4Packet,
|
ipv4::Ipv4Packet,
|
||||||
};
|
};
|
||||||
|
use quanta::Instant;
|
||||||
use socket2::Socket;
|
use socket2::Socket;
|
||||||
use tokio::{
|
use tokio::{
|
||||||
sync::{Mutex, mpsc::UnboundedSender},
|
sync::{Mutex, mpsc::UnboundedSender},
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use pnet::packet::Packet;
|
use pnet::packet::Packet;
|
||||||
use pnet::packet::ip::IpNextHeaderProtocol;
|
use pnet::packet::ip::IpNextHeaderProtocol;
|
||||||
use pnet::packet::ipv4::{self, Ipv4Flags, Ipv4Packet, MutableIpv4Packet};
|
use pnet::packet::ipv4::{self, Ipv4Flags, Ipv4Packet, MutableIpv4Packet};
|
||||||
|
use quanta::Instant;
|
||||||
use std::net::Ipv4Addr;
|
use std::net::Ipv4Addr;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
|
|||||||
@@ -1018,7 +1018,7 @@ impl TcpProxyRpc for QuicProxyDstRpcService {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use bytes::Buf;
|
use bytes::Buf;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
|
|
||||||
/// Helper function: Create a pair of interconnected QuicSockets.
|
/// Helper function: Create a pair of interconnected QuicSockets.
|
||||||
/// Data sent by socket_a will enter socket_b's rx, and vice versa.
|
/// Data sent by socket_a will enter socket_b's rx, and vice versa.
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use crossbeam::atomic::AtomicCell;
|
use crossbeam::atomic::AtomicCell;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
#[cfg(feature = "kcp")]
|
#[cfg(feature = "kcp")]
|
||||||
use kcp_sys::{endpoint::KcpEndpoint, stream::KcpStream};
|
use kcp_sys::{endpoint::KcpEndpoint, stream::KcpStream};
|
||||||
|
use quanta::Instant;
|
||||||
use tokio_util::sync::{CancellationToken, DropGuard};
|
use tokio_util::sync::{CancellationToken, DropGuard};
|
||||||
use tokio_util::task::AbortOnDropHandle;
|
use tokio_util::task::AbortOnDropHandle;
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use anyhow::Context as _;
|
use anyhow::Context as _;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use tokio::io::{AsyncRead, AsyncWrite};
|
use tokio::io::{AsyncRead, AsyncWrite};
|
||||||
|
|
||||||
use crate::{common::error::Error, gateway::fast_socks5::server::AsyncTcpConnector};
|
use crate::{common::error::Error, gateway::fast_socks5::server::AsyncTcpConnector};
|
||||||
|
|||||||
@@ -3,12 +3,12 @@ use cidr::Ipv4Inet;
|
|||||||
use core::panic;
|
use core::panic;
|
||||||
use crossbeam::atomic::AtomicCell;
|
use crossbeam::atomic::AtomicCell;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use pnet::packet::MutablePacket;
|
use pnet::packet::MutablePacket;
|
||||||
use pnet::packet::Packet;
|
use pnet::packet::Packet;
|
||||||
use pnet::packet::ip::IpNextHeaderProtocols;
|
use pnet::packet::ip::IpNextHeaderProtocols;
|
||||||
use pnet::packet::ipv4::{Ipv4Packet, MutableIpv4Packet};
|
use pnet::packet::ipv4::{Ipv4Packet, MutableIpv4Packet};
|
||||||
use pnet::packet::tcp::{MutableTcpPacket, TcpPacket, ipv4_checksum};
|
use pnet::packet::tcp::{MutableTcpPacket, TcpPacket, ipv4_checksum};
|
||||||
|
use quanta::Instant;
|
||||||
use socket2::{SockRef, TcpKeepalive};
|
use socket2::{SockRef, TcpKeepalive};
|
||||||
use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4};
|
use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4};
|
||||||
use std::sync::atomic::{AtomicBool, AtomicU16};
|
use std::sync::atomic::{AtomicBool, AtomicU16};
|
||||||
|
|||||||
@@ -8,13 +8,13 @@ use bytes::{BufMut, BytesMut};
|
|||||||
use cidr::Ipv4Inet;
|
use cidr::Ipv4Inet;
|
||||||
use crossbeam::atomic::AtomicCell;
|
use crossbeam::atomic::AtomicCell;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use pnet::packet::{
|
use pnet::packet::{
|
||||||
Packet,
|
Packet,
|
||||||
ip::IpNextHeaderProtocols,
|
ip::IpNextHeaderProtocols,
|
||||||
ipv4::Ipv4Packet,
|
ipv4::Ipv4Packet,
|
||||||
udp::{self, MutableUdpPacket},
|
udp::{self, MutableUdpPacket},
|
||||||
};
|
};
|
||||||
|
use quanta::Instant;
|
||||||
use tokio::sync::mpsc::{Receiver, Sender, channel, error::TrySendError};
|
use tokio::sync::mpsc::{Receiver, Sender, channel, error::TrySendError};
|
||||||
use tokio::{
|
use tokio::{
|
||||||
net::UdpSocket,
|
net::UdpSocket,
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
//! No-op stand-in for the `hotpath` macros used by this crate, selected when
|
|
||||||
//! the `hotpath` feature is disabled.
|
|
||||||
//!
|
|
||||||
//! Keeping `hotpath` as an optional dependency means default builds do not pull
|
|
||||||
//! the profiler (or any of its transitive dependencies) into the dependency
|
|
||||||
//! graph. These macros expand to their input unchanged, mirroring `hotpath`'s
|
|
||||||
//! own disabled mode so call sites compile identically with or without the
|
|
||||||
//! feature.
|
|
||||||
//!
|
|
||||||
//! The macros are `#[macro_export]`-ed so that `lib.rs`' `extern crate self as
|
|
||||||
//! hotpath` alias exposes them through the same `hotpath::...` paths used when
|
|
||||||
//! the feature is enabled.
|
|
||||||
|
|
||||||
/// No-op mirroring `hotpath::channel!`: returns the channel expression
|
|
||||||
/// unchanged (dropping any optional trailing `label`/`log`/`capacity` args).
|
|
||||||
#[doc(hidden)]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! channel {
|
|
||||||
($expr:expr $(, $($rest:tt)*)?) => {
|
|
||||||
$expr
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// No-op mirroring `hotpath::mutex!`: returns the expression unchanged.
|
|
||||||
#[doc(hidden)]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! mutex {
|
|
||||||
($expr:expr $(, $($rest:tt)*)?) => {
|
|
||||||
$expr
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// No-op mirroring `hotpath::rw_lock!`: returns the expression unchanged.
|
|
||||||
#[doc(hidden)]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! rw_lock {
|
|
||||||
($expr:expr $(, $($rest:tt)*)?) => {
|
|
||||||
$expr
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -65,9 +65,9 @@ use crate::vpn_portal::{self, VpnPortal};
|
|||||||
use super::dns_server::{MAGIC_DNS_FAKE_IP, runner::DnsRunner};
|
use super::dns_server::{MAGIC_DNS_FAKE_IP, runner::DnsRunner};
|
||||||
use super::listeners::ListenerManager;
|
use super::listeners::ListenerManager;
|
||||||
use super::public_ipv6_provider::{
|
use super::public_ipv6_provider::{
|
||||||
reconcile_public_ipv6_provider_runtime, run_public_ipv6_provider_reconcile_task,
|
PublicIpv6ProviderReconcileTask, reconcile_public_ipv6_provider_runtime,
|
||||||
should_run_public_ipv6_provider_reconcile, validate_public_ipv6_config,
|
run_public_ipv6_provider_reconcile_task, should_run_public_ipv6_provider_reconcile,
|
||||||
validate_public_ipv6_config_values,
|
validate_public_ipv6_config, validate_public_ipv6_config_values,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[cfg(feature = "socks5")]
|
#[cfg(feature = "socks5")]
|
||||||
@@ -194,6 +194,44 @@ impl NicCtxContainer {
|
|||||||
|
|
||||||
#[cfg(feature = "tun")]
|
#[cfg(feature = "tun")]
|
||||||
type ArcNicCtx = Arc<Mutex<Option<NicCtxContainer>>>;
|
type ArcNicCtx = Arc<Mutex<Option<NicCtxContainer>>>;
|
||||||
|
type ArcPublicIpv6ProviderTaskSlot = Arc<PublicIpv6ProviderTaskSlot>;
|
||||||
|
|
||||||
|
struct PublicIpv6ProviderTaskSlot {
|
||||||
|
task: Mutex<Option<PublicIpv6ProviderReconcileTask>>,
|
||||||
|
closing: AtomicBool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PublicIpv6ProviderTaskSlot {
|
||||||
|
fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
task: Mutex::new(None),
|
||||||
|
closing: AtomicBool::new(false),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn ensure_started(&self, global_ctx: &ArcGlobalCtx) {
|
||||||
|
let mut task = self.task.lock().await;
|
||||||
|
if self.closing.load(Ordering::Acquire) || task.is_some() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
*task = run_public_ipv6_provider_reconcile_task(global_ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn shutdown(&self) {
|
||||||
|
self.closing.store(true, Ordering::Release);
|
||||||
|
let task = self.task.lock().await.take();
|
||||||
|
if let Some(task) = task {
|
||||||
|
task.shutdown().await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn ensure_public_ipv6_provider_reconcile_task(
|
||||||
|
global_ctx: &ArcGlobalCtx,
|
||||||
|
task_slot: &ArcPublicIpv6ProviderTaskSlot,
|
||||||
|
) {
|
||||||
|
task_slot.ensure_started(global_ctx).await;
|
||||||
|
}
|
||||||
|
|
||||||
pub struct InstanceRpcServerHook {
|
pub struct InstanceRpcServerHook {
|
||||||
rpc_portal_whitelist: Vec<IpCidr>,
|
rpc_portal_whitelist: Vec<IpCidr>,
|
||||||
@@ -254,6 +292,7 @@ pub struct InstanceConfigPatcher {
|
|||||||
socks5_server: Weak<Socks5Server>,
|
socks5_server: Weak<Socks5Server>,
|
||||||
peer_manager: Weak<PeerManager>,
|
peer_manager: Weak<PeerManager>,
|
||||||
conn_manager: Weak<ManualConnectorManager>,
|
conn_manager: Weak<ManualConnectorManager>,
|
||||||
|
public_ipv6_provider_task: ArcPublicIpv6ProviderTaskSlot,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl InstanceConfigPatcher {
|
impl InstanceConfigPatcher {
|
||||||
@@ -324,7 +363,6 @@ impl InstanceConfigPatcher {
|
|||||||
self.patch_mapped_listeners(patch.mapped_listeners).await?;
|
self.patch_mapped_listeners(patch.mapped_listeners).await?;
|
||||||
self.patch_connector(patch.connectors).await?;
|
self.patch_connector(patch.connectors).await?;
|
||||||
|
|
||||||
let provider_reconcile_was_running = should_run_public_ipv6_provider_reconcile(&global_ctx);
|
|
||||||
let mut provider_config_changed = false;
|
let mut provider_config_changed = false;
|
||||||
if let Some(hostname) = patch.hostname {
|
if let Some(hostname) = patch.hostname {
|
||||||
global_ctx.set_hostname(hostname.clone());
|
global_ctx.set_hostname(hostname.clone());
|
||||||
@@ -362,10 +400,12 @@ impl InstanceConfigPatcher {
|
|||||||
if provider_config_changed {
|
if provider_config_changed {
|
||||||
reconcile_public_ipv6_provider_runtime(&global_ctx).await;
|
reconcile_public_ipv6_provider_runtime(&global_ctx).await;
|
||||||
|
|
||||||
let provider_reconcile_should_run =
|
if should_run_public_ipv6_provider_reconcile(&global_ctx) {
|
||||||
should_run_public_ipv6_provider_reconcile(&global_ctx);
|
ensure_public_ipv6_provider_reconcile_task(
|
||||||
if !provider_reconcile_was_running && provider_reconcile_should_run {
|
&global_ctx,
|
||||||
run_public_ipv6_provider_reconcile_task(&global_ctx);
|
&self.public_ipv6_provider_task,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -647,6 +687,7 @@ pub struct Instance {
|
|||||||
socks5_server: Arc<Socks5Server>,
|
socks5_server: Arc<Socks5Server>,
|
||||||
|
|
||||||
proxy_cidrs_monitor: Option<AbortOnDropHandle<()>>,
|
proxy_cidrs_monitor: Option<AbortOnDropHandle<()>>,
|
||||||
|
public_ipv6_provider_task: ArcPublicIpv6ProviderTaskSlot,
|
||||||
|
|
||||||
global_ctx: ArcGlobalCtx,
|
global_ctx: ArcGlobalCtx,
|
||||||
}
|
}
|
||||||
@@ -734,6 +775,7 @@ impl Instance {
|
|||||||
socks5_server,
|
socks5_server,
|
||||||
|
|
||||||
proxy_cidrs_monitor: None,
|
proxy_cidrs_monitor: None,
|
||||||
|
public_ipv6_provider_task: Arc::new(PublicIpv6ProviderTaskSlot::new()),
|
||||||
|
|
||||||
global_ctx,
|
global_ctx,
|
||||||
}
|
}
|
||||||
@@ -1034,7 +1076,11 @@ impl Instance {
|
|||||||
.await?;
|
.await?;
|
||||||
self.listener_manager.lock().await.run().await?;
|
self.listener_manager.lock().await.run().await?;
|
||||||
self.peer_manager.run().await?;
|
self.peer_manager.run().await?;
|
||||||
run_public_ipv6_provider_reconcile_task(&self.global_ctx);
|
ensure_public_ipv6_provider_reconcile_task(
|
||||||
|
&self.global_ctx,
|
||||||
|
&self.public_ipv6_provider_task,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
#[cfg(feature = "tun")]
|
#[cfg(feature = "tun")]
|
||||||
{
|
{
|
||||||
@@ -1347,6 +1393,7 @@ impl Instance {
|
|||||||
socks5_server: Arc::downgrade(&self.socks5_server),
|
socks5_server: Arc::downgrade(&self.socks5_server),
|
||||||
peer_manager: Arc::downgrade(&self.peer_manager),
|
peer_manager: Arc::downgrade(&self.peer_manager),
|
||||||
conn_manager: Arc::downgrade(&self.conn_manager),
|
conn_manager: Arc::downgrade(&self.conn_manager),
|
||||||
|
public_ipv6_provider_task: self.public_ipv6_provider_task.clone(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1602,6 +1649,7 @@ impl Instance {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn clear_resources(&mut self) {
|
pub async fn clear_resources(&mut self) {
|
||||||
|
self.public_ipv6_provider_task.shutdown().await;
|
||||||
self.peer_manager.clear_resources().await;
|
self.peer_manager.clear_resources().await;
|
||||||
#[cfg(feature = "tun")]
|
#[cfg(feature = "tun")]
|
||||||
let _ = self.nic_ctx.lock().await.take();
|
let _ = self.nic_ctx.lock().await.take();
|
||||||
@@ -1787,6 +1835,21 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn public_ipv6_provider_task_slot_does_not_restart_after_shutdown() {
|
||||||
|
let global_ctx = get_mock_global_ctx();
|
||||||
|
let slot = std::sync::Arc::new(super::PublicIpv6ProviderTaskSlot::new());
|
||||||
|
global_ctx.config.set_ipv6_public_addr_provider(true);
|
||||||
|
global_ctx
|
||||||
|
.config
|
||||||
|
.set_ipv6_public_addr_prefix(Some("2001:db8::/48".parse().unwrap()));
|
||||||
|
|
||||||
|
slot.shutdown().await;
|
||||||
|
super::ensure_public_ipv6_provider_reconcile_task(&global_ctx, &slot).await;
|
||||||
|
|
||||||
|
assert!(slot.task.lock().await.is_none());
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn validate_public_ipv6_patch_allows_enabling_auto_with_manual_ipv6() {
|
async fn validate_public_ipv6_patch_allows_enabling_auto_with_manual_ipv6() {
|
||||||
let global_ctx = get_mock_global_ctx();
|
let global_ctx = get_mock_global_ctx();
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ use std::sync::{Arc, Weak};
|
|||||||
|
|
||||||
use crate::common::global_ctx::{ArcGlobalCtx, GlobalCtxEvent};
|
use crate::common::global_ctx::{ArcGlobalCtx, GlobalCtxEvent};
|
||||||
use crate::peers::peer_manager::PeerManager;
|
use crate::peers::peer_manager::PeerManager;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use tokio_util::task::AbortOnDropHandle;
|
use tokio_util::task::AbortOnDropHandle;
|
||||||
|
|
||||||
/// ProxyCidrsMonitor monitors changes in proxy CIDRs from peer routes
|
/// ProxyCidrsMonitor monitors changes in proxy CIDRs from peer routes
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -24,7 +24,7 @@ use crate::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use byteorder::WriteBytesExt as _;
|
use byteorder::WriteBytesExt as _;
|
||||||
use bytes::{BufMut, BytesMut};
|
use bytes::{Buf, BufMut, BytesMut};
|
||||||
use cidr::{Ipv4Inet, Ipv6Inet};
|
use cidr::{Ipv4Inet, Ipv6Inet};
|
||||||
use futures::{SinkExt, Stream, StreamExt, lock::BiLock, ready};
|
use futures::{SinkExt, Stream, StreamExt, lock::BiLock, ready};
|
||||||
use pin_project_lite::pin_project;
|
use pin_project_lite::pin_project;
|
||||||
@@ -180,12 +180,13 @@ impl ZCPacketToBytes for TunZCPacketToBytes {
|
|||||||
assert!(payload_offset >= 4);
|
assert!(payload_offset >= 4);
|
||||||
|
|
||||||
let ret = if self.has_packet_info {
|
let ret = if self.has_packet_info {
|
||||||
let mut inner = inner.split_off(payload_offset - 4);
|
inner.advance(payload_offset - 4);
|
||||||
let proto = infer_proto(&inner[4..]);
|
let proto = infer_proto(&inner[4..]);
|
||||||
self.fill_packet_info(&mut inner[0..4], proto)?;
|
self.fill_packet_info(&mut inner[0..4], proto)?;
|
||||||
inner
|
inner
|
||||||
} else {
|
} else {
|
||||||
inner.split_off(payload_offset)
|
inner.advance(payload_offset);
|
||||||
|
inner
|
||||||
};
|
};
|
||||||
|
|
||||||
tracing::debug!(?ret, ?payload_offset, "convert zc packet to tun packet");
|
tracing::debug!(?ret, ?payload_offset, "convert zc packet to tun packet");
|
||||||
@@ -1361,12 +1362,11 @@ impl NicCtx {
|
|||||||
}
|
}
|
||||||
|
|
||||||
self.global_ctx
|
self.global_ctx
|
||||||
.issue_event(GlobalCtxEvent::TunDeviceReady(nic.ifname().to_string()));
|
.set_tun_device_ready(nic.ifname().to_string());
|
||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
self.global_ctx
|
self.global_ctx.set_tun_device_error(err.to_string());
|
||||||
.issue_event(GlobalCtxEvent::TunDeviceError(err.to_string()));
|
|
||||||
return Err(err);
|
return Err(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1405,12 +1405,11 @@ impl NicCtx {
|
|||||||
match nic.create_dev_for_mobile(tun_fd).await {
|
match nic.create_dev_for_mobile(tun_fd).await {
|
||||||
Ok(ret) => {
|
Ok(ret) => {
|
||||||
self.global_ctx
|
self.global_ctx
|
||||||
.issue_event(GlobalCtxEvent::TunDeviceReady(nic.ifname().to_string()));
|
.set_tun_device_ready(nic.ifname().to_string());
|
||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
self.global_ctx
|
self.global_ctx.set_tun_device_error(err.to_string());
|
||||||
.issue_event(GlobalCtxEvent::TunDeviceError(err.to_string()));
|
|
||||||
return Err(err);
|
return Err(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -173,7 +173,12 @@ impl EasyTierLauncher {
|
|||||||
#[cfg(mobile)]
|
#[cfg(mobile)]
|
||||||
Self::run_routine_for_mobile(&instance, &data, &mut tasks).await;
|
Self::run_routine_for_mobile(&instance, &data, &mut tasks).await;
|
||||||
|
|
||||||
instance.run().await?;
|
if let Err(err) = instance.run().await {
|
||||||
|
tasks.abort_all();
|
||||||
|
drop(tasks);
|
||||||
|
instance.clear_resources().await;
|
||||||
|
return Err(err.into());
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(feature = "ffi-dataplane")]
|
#[cfg(feature = "ffi-dataplane")]
|
||||||
data.data_plane
|
data.data_plane
|
||||||
|
|||||||
+1
-20
@@ -5,29 +5,10 @@ use std::io;
|
|||||||
use clap::Command;
|
use clap::Command;
|
||||||
use clap_complete::{Generator, Shell};
|
use clap_complete::{Generator, Shell};
|
||||||
|
|
||||||
// When the `hotpath` feature is off, alias the current crate as `hotpath` so
|
|
||||||
// call sites keep using `hotpath::...` paths, and provide a local no-op shim
|
|
||||||
// for the profiling macros. This keeps `hotpath` an optional dependency: the
|
|
||||||
// profiler is absent from the dependency graph entirely in default builds.
|
|
||||||
#[cfg(not(feature = "hotpath"))]
|
|
||||||
extern crate self as hotpath;
|
|
||||||
#[cfg(not(feature = "hotpath"))]
|
|
||||||
mod hotpath_off;
|
|
||||||
|
|
||||||
// When the `hotpath` feature is off, expose a local `instant` module backed by
|
|
||||||
// `quanta::Instant` so call sites can uniformly write `use hotpath::instant::Instant;`
|
|
||||||
// regardless of whether the feature is enabled. With the feature on, the real
|
|
||||||
// `hotpath` crate provides the same path (also `quanta::Instant` on Linux), so
|
|
||||||
// the two modes resolve to the identical type.
|
|
||||||
#[cfg(not(feature = "hotpath"))]
|
|
||||||
pub mod instant {
|
|
||||||
pub type Instant = quanta::Instant;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Re-export `Instant` at the crate root so public APIs that expose it
|
// Re-export `Instant` at the crate root so public APIs that expose it
|
||||||
// (e.g. `Route::get_peer_info_last_update_time`) reference a deliberate
|
// (e.g. `Route::get_peer_info_last_update_time`) reference a deliberate
|
||||||
// public type rather than leaking an inaccessible one.
|
// public type rather than leaking an inaccessible one.
|
||||||
pub use hotpath::instant::Instant;
|
pub use quanta::Instant;
|
||||||
|
|
||||||
mod arch;
|
mod arch;
|
||||||
mod gateway;
|
mod gateway;
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ use std::{
|
|||||||
|
|
||||||
use arc_swap::ArcSwap;
|
use arc_swap::ArcSwap;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use pnet::packet::ipv6::Ipv6Packet;
|
use pnet::packet::ipv6::Ipv6Packet;
|
||||||
use pnet::packet::{
|
use pnet::packet::{
|
||||||
Packet as _, ip::IpNextHeaderProtocols, ipv4::Ipv4Packet, tcp::TcpPacket, udp::UdpPacket,
|
Packet as _, ip::IpNextHeaderProtocols, ipv4::Ipv4Packet, tcp::TcpPacket, udp::UdpPacket,
|
||||||
};
|
};
|
||||||
|
use quanta::Instant;
|
||||||
|
|
||||||
use crate::proto::acl::{AclStats, Protocol};
|
use crate::proto::acl::{AclStats, Protocol};
|
||||||
use crate::tunnel::packet_def::PacketType;
|
use crate::tunnel::packet_def::PacketType;
|
||||||
@@ -404,7 +404,7 @@ mod tests {
|
|||||||
sync::Arc,
|
sync::Arc,
|
||||||
};
|
};
|
||||||
|
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
common::acl_processor::PacketInfo,
|
common::acl_processor::PacketInfo,
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ type BoxNicPacketFilter = Box<dyn NicPacketFilter + Send + Sync>;
|
|||||||
pub type PacketRecvChan = tokio::sync::mpsc::Sender<ZCPacket>;
|
pub type PacketRecvChan = tokio::sync::mpsc::Sender<ZCPacket>;
|
||||||
pub type PacketRecvChanReceiver = tokio::sync::mpsc::Receiver<ZCPacket>;
|
pub type PacketRecvChanReceiver = tokio::sync::mpsc::Receiver<ZCPacket>;
|
||||||
pub fn create_packet_recv_chan() -> (PacketRecvChan, PacketRecvChanReceiver) {
|
pub fn create_packet_recv_chan() -> (PacketRecvChan, PacketRecvChanReceiver) {
|
||||||
hotpath::channel!(tokio::sync::mpsc::channel(128))
|
tokio::sync::mpsc::channel(128)
|
||||||
}
|
}
|
||||||
pub async fn recv_packet_from_chan(
|
pub async fn recv_packet_from_chan(
|
||||||
packet_recv_chan_receiver: &mut PacketRecvChanReceiver,
|
packet_recv_chan_receiver: &mut PacketRecvChanReceiver,
|
||||||
|
|||||||
@@ -207,7 +207,6 @@ impl Peer {
|
|||||||
.map(|conn| conn.clone())
|
.map(|conn| conn.clone())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "Peer"))]
|
|
||||||
pub async fn send_msg(&self, msg: ZCPacket) -> Result<(), Error> {
|
pub async fn send_msg(&self, msg: ZCPacket) -> Result<(), Error> {
|
||||||
let Some(conn) = self.select_conn().await else {
|
let Some(conn) = self.select_conn().await else {
|
||||||
return Err(Error::PeerNoConnectionError(self.peer_node_id));
|
return Err(Error::PeerNoConnectionError(self.peer_node_id));
|
||||||
|
|||||||
@@ -11,9 +11,6 @@ use std::{
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
#[cfg(feature = "hotpath")]
|
|
||||||
use hotpath::wrap::tokio::sync::Mutex;
|
|
||||||
#[cfg(not(feature = "hotpath"))]
|
|
||||||
use tokio::sync::Mutex;
|
use tokio::sync::Mutex;
|
||||||
|
|
||||||
use base64::Engine as _;
|
use base64::Engine as _;
|
||||||
@@ -384,12 +381,12 @@ impl PeerConn {
|
|||||||
session_filter,
|
session_filter,
|
||||||
noise_handshake_result: None,
|
noise_handshake_result: None,
|
||||||
|
|
||||||
tunnel: Arc::new(hotpath::mutex!(tokio::sync::Mutex::new(Box::new(
|
tunnel: Arc::new(Mutex::new(
|
||||||
guard!([mut mpsc_tunnel] mpsc_tunnel.close()),
|
Box::new(guard!([mut mpsc_tunnel] mpsc_tunnel.close()))
|
||||||
)
|
as Box<dyn Any + Send + 'static>,
|
||||||
as Box<dyn Any + Send + 'static>))),
|
)),
|
||||||
sink,
|
sink,
|
||||||
recv: hotpath::mutex!(tokio::sync::Mutex::new(Some(recv))),
|
recv: Mutex::new(Some(recv)),
|
||||||
tunnel_info,
|
tunnel_info,
|
||||||
|
|
||||||
tasks: JoinSet::new(),
|
tasks: JoinSet::new(),
|
||||||
@@ -1466,7 +1463,6 @@ impl PeerConn {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "PeerConn"))]
|
|
||||||
pub async fn send_msg(&self, msg: ZCPacket) -> Result<(), Error> {
|
pub async fn send_msg(&self, msg: ZCPacket) -> Result<(), Error> {
|
||||||
Ok(self.sink.send(msg).await?)
|
Ok(self.sink.send(msg).await?)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use std::{
|
|||||||
time::Duration,
|
time::Duration,
|
||||||
};
|
};
|
||||||
|
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use rand::{Rng, thread_rng};
|
use rand::{Rng, thread_rng};
|
||||||
use tokio::{
|
use tokio::{
|
||||||
sync::broadcast,
|
sync::broadcast,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ use anyhow::Context;
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use cidr::{Ipv4Cidr, Ipv6Cidr};
|
use cidr::{Ipv4Cidr, Ipv6Cidr};
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use std::collections::BTreeSet;
|
use std::collections::BTreeSet;
|
||||||
use std::{
|
use std::{
|
||||||
fmt::Debug,
|
fmt::Debug,
|
||||||
@@ -11,9 +11,6 @@ use std::{
|
|||||||
time::{Duration, SystemTime},
|
time::{Duration, SystemTime},
|
||||||
};
|
};
|
||||||
|
|
||||||
#[cfg(feature = "hotpath")]
|
|
||||||
use hotpath::wrap::tokio::sync::{Mutex, RwLock};
|
|
||||||
#[cfg(not(feature = "hotpath"))]
|
|
||||||
use tokio::sync::{Mutex, RwLock};
|
use tokio::sync::{Mutex, RwLock};
|
||||||
use tokio::{
|
use tokio::{
|
||||||
sync::mpsc::{self, UnboundedReceiver, UnboundedSender},
|
sync::mpsc::{self, UnboundedReceiver, UnboundedSender},
|
||||||
@@ -279,8 +276,8 @@ impl PeerManager {
|
|||||||
let rpc_tspt = Arc::new(RpcTransport {
|
let rpc_tspt = Arc::new(RpcTransport {
|
||||||
my_peer_id,
|
my_peer_id,
|
||||||
peers: Arc::downgrade(&peers),
|
peers: Arc::downgrade(&peers),
|
||||||
foreign_peers: hotpath::mutex!(tokio::sync::Mutex::new(None)),
|
foreign_peers: Mutex::new(None),
|
||||||
packet_recv: hotpath::mutex!(tokio::sync::Mutex::new(peer_rpc_tspt_recv)),
|
packet_recv: Mutex::new(peer_rpc_tspt_recv),
|
||||||
peer_rpc_tspt_sender,
|
peer_rpc_tspt_sender,
|
||||||
encryptor: encryptor.clone(),
|
encryptor: encryptor.clone(),
|
||||||
is_secure_mode_enabled,
|
is_secure_mode_enabled,
|
||||||
@@ -412,21 +409,17 @@ impl PeerManager {
|
|||||||
global_ctx,
|
global_ctx,
|
||||||
nic_channel,
|
nic_channel,
|
||||||
|
|
||||||
tasks: hotpath::mutex!(tokio::sync::Mutex::new(JoinSet::new())),
|
tasks: Mutex::new(JoinSet::new()),
|
||||||
|
|
||||||
packet_recv: Arc::new(hotpath::mutex!(tokio::sync::Mutex::new(Some(packet_recv)))),
|
packet_recv: Arc::new(Mutex::new(Some(packet_recv))),
|
||||||
|
|
||||||
peers,
|
peers,
|
||||||
|
|
||||||
peer_rpc_mgr,
|
peer_rpc_mgr,
|
||||||
peer_rpc_tspt: rpc_tspt,
|
peer_rpc_tspt: rpc_tspt,
|
||||||
|
|
||||||
peer_packet_process_pipeline: Arc::new(hotpath::rw_lock!(tokio::sync::RwLock::new(
|
peer_packet_process_pipeline: Arc::new(RwLock::new(Vec::new())),
|
||||||
Vec::new()
|
nic_packet_process_pipeline: Arc::new(RwLock::new(Vec::new())),
|
||||||
))),
|
|
||||||
nic_packet_process_pipeline: Arc::new(hotpath::rw_lock!(tokio::sync::RwLock::new(
|
|
||||||
Vec::new()
|
|
||||||
))),
|
|
||||||
|
|
||||||
route_algo_inst,
|
route_algo_inst,
|
||||||
|
|
||||||
@@ -437,7 +430,7 @@ impl PeerManager {
|
|||||||
encryptor,
|
encryptor,
|
||||||
data_compress_algo,
|
data_compress_algo,
|
||||||
|
|
||||||
exit_nodes: hotpath::rw_lock!(tokio::sync::RwLock::new(exit_nodes)),
|
exit_nodes: RwLock::new(exit_nodes),
|
||||||
|
|
||||||
reserved_my_peer_id_map: DashMap::new(),
|
reserved_my_peer_id_map: DashMap::new(),
|
||||||
recent_have_traffic: Arc::new(DashMap::new()),
|
recent_have_traffic: Arc::new(DashMap::new()),
|
||||||
@@ -1444,7 +1437,6 @@ impl PeerManager {
|
|||||||
self.get_route().get_foreign_network_summary().await
|
self.get_route().get_foreign_network_summary().await
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "PeerManager"))]
|
|
||||||
async fn run_nic_packet_process_pipeline(&self, data: &mut ZCPacket) -> bool {
|
async fn run_nic_packet_process_pipeline(&self, data: &mut ZCPacket) -> bool {
|
||||||
// Enforce ACL for outbound (NIC-originated) packets. If ACL denies, stop processing.
|
// Enforce ACL for outbound (NIC-originated) packets. If ACL denies, stop processing.
|
||||||
if !self.global_ctx.get_acl_filter().process_packet_with_acl(
|
if !self.global_ctx.get_acl_filter().process_packet_with_acl(
|
||||||
@@ -1530,7 +1522,6 @@ impl PeerManager {
|
|||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "PeerManager"))]
|
|
||||||
async fn send_msg_internal(
|
async fn send_msg_internal(
|
||||||
peers: &Arc<PeerMap>,
|
peers: &Arc<PeerMap>,
|
||||||
foreign_network_client: &Arc<ForeignNetworkClient>,
|
foreign_network_client: &Arc<ForeignNetworkClient>,
|
||||||
@@ -2207,7 +2198,7 @@ mod tests {
|
|||||||
use base64::Engine;
|
use base64::Engine;
|
||||||
use std::{collections::HashMap, fmt::Debug, sync::Arc, time::Duration};
|
use std::{collections::HashMap, fmt::Debug, sync::Arc, time::Duration};
|
||||||
|
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
common::{
|
common::{
|
||||||
|
|||||||
@@ -132,7 +132,6 @@ impl PeerMap {
|
|||||||
peer_id == self.my_peer_id || self.peer_map.contains_key(&peer_id)
|
peer_id == self.my_peer_id || self.peer_map.contains_key(&peer_id)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "PeerMap"))]
|
|
||||||
pub async fn send_msg_directly(&self, msg: ZCPacket, dst_peer_id: PeerId) -> Result<(), Error> {
|
pub async fn send_msg_directly(&self, msg: ZCPacket, dst_peer_id: PeerId) -> Result<(), Error> {
|
||||||
if dst_peer_id == self.my_peer_id {
|
if dst_peer_id == self.my_peer_id {
|
||||||
let packet_send = self.packet_send.clone();
|
let packet_send = self.packet_send.clone();
|
||||||
@@ -164,7 +163,6 @@ impl PeerMap {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "PeerMap"))]
|
|
||||||
pub async fn get_gateway_peer_id(
|
pub async fn get_gateway_peer_id(
|
||||||
&self,
|
&self,
|
||||||
dst_peer_id: PeerId,
|
dst_peer_id: PeerId,
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ use arc_swap::ArcSwap;
|
|||||||
use cidr::{IpCidr, Ipv4Cidr, Ipv6Cidr, Ipv6Inet};
|
use cidr::{IpCidr, Ipv4Cidr, Ipv6Cidr, Ipv6Inet};
|
||||||
use crossbeam::atomic::AtomicCell;
|
use crossbeam::atomic::AtomicCell;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use ordered_hash_map::OrderedHashMap;
|
use ordered_hash_map::OrderedHashMap;
|
||||||
use parking_lot::{RwLock, lock_api::RwLockUpgradableReadGuard};
|
use parking_lot::{RwLock, lock_api::RwLockUpgradableReadGuard};
|
||||||
use petgraph::{
|
use petgraph::{
|
||||||
@@ -25,6 +24,7 @@ use petgraph::{
|
|||||||
use prefix_trie::PrefixMap;
|
use prefix_trie::PrefixMap;
|
||||||
use prost::Message;
|
use prost::Message;
|
||||||
use prost_reflect::{DynamicMessage, ReflectMessage};
|
use prost_reflect::{DynamicMessage, ReflectMessage};
|
||||||
|
use quanta::Instant;
|
||||||
use tokio::{
|
use tokio::{
|
||||||
select,
|
select,
|
||||||
sync::Mutex,
|
sync::Mutex,
|
||||||
@@ -1394,7 +1394,6 @@ impl RouteTable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "RouteTable"))]
|
|
||||||
fn get_next_hop(&self, dst_peer_id: PeerId) -> Option<NextHopInfo> {
|
fn get_next_hop(&self, dst_peer_id: PeerId) -> Option<NextHopInfo> {
|
||||||
if self.suppressed_peer_ids.contains_key(&dst_peer_id) {
|
if self.suppressed_peer_ids.contains_key(&dst_peer_id) {
|
||||||
return None;
|
return None;
|
||||||
@@ -1402,7 +1401,6 @@ impl RouteTable {
|
|||||||
self.get_topology_next_hop(dst_peer_id)
|
self.get_topology_next_hop(dst_peer_id)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "RouteTable"))]
|
|
||||||
fn get_topology_next_hop(&self, dst_peer_id: PeerId) -> Option<NextHopInfo> {
|
fn get_topology_next_hop(&self, dst_peer_id: PeerId) -> Option<NextHopInfo> {
|
||||||
let cur_version = self.next_hop_map_version.get();
|
let cur_version = self.next_hop_map_version.get();
|
||||||
self.next_hop_map.get(&dst_peer_id).and_then(|x| {
|
self.next_hop_map.get(&dst_peer_id).and_then(|x| {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use std::time::Duration;
|
|||||||
use anyhow::anyhow;
|
use anyhow::anyhow;
|
||||||
use crossbeam::atomic::AtomicCell;
|
use crossbeam::atomic::AtomicCell;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
|
|
||||||
use super::secure_datagram::{SecureDatagramDirection, SecureDatagramSession};
|
use super::secure_datagram::{SecureDatagramDirection, SecureDatagramSession};
|
||||||
use crate::{
|
use crate::{
|
||||||
@@ -376,7 +376,6 @@ impl PeerSession {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "PeerSession"))]
|
|
||||||
pub fn encrypt_payload(
|
pub fn encrypt_payload(
|
||||||
&self,
|
&self,
|
||||||
sender_peer_id: PeerId,
|
sender_peer_id: PeerId,
|
||||||
@@ -390,7 +389,6 @@ impl PeerSession {
|
|||||||
.encrypt_payload(Self::dir_for_sender(sender_peer_id, receiver_peer_id), pkt)
|
.encrypt_payload(Self::dir_for_sender(sender_peer_id, receiver_peer_id), pkt)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "PeerSession"))]
|
|
||||||
pub fn decrypt_payload(
|
pub fn decrypt_payload(
|
||||||
&self,
|
&self,
|
||||||
sender_peer_id: PeerId,
|
sender_peer_id: PeerId,
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use prost::Message;
|
use prost::Message;
|
||||||
|
use quanta::Instant;
|
||||||
use snow::params::NoiseParams;
|
use snow::params::NoiseParams;
|
||||||
use tokio::sync::{Mutex, OwnedMutexGuard, oneshot};
|
use tokio::sync::{Mutex, OwnedMutexGuard, oneshot};
|
||||||
use tokio::time::{Duration, timeout};
|
use tokio::time::{Duration, timeout};
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use cidr::Ipv6Inet;
|
use cidr::Ipv6Inet;
|
||||||
use cidr::{Ipv4Cidr, Ipv6Cidr};
|
use cidr::{Ipv4Cidr, Ipv6Cidr};
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
use std::{
|
use std::{
|
||||||
collections::BTreeSet,
|
collections::BTreeSet,
|
||||||
net::{Ipv4Addr, Ipv6Addr},
|
net::{Ipv4Addr, Ipv6Addr},
|
||||||
|
|||||||
@@ -701,10 +701,6 @@ impl SecureDatagramSession {
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(
|
|
||||||
feature = "hotpath",
|
|
||||||
hotpath::measure(impl_type = "SecureDatagramSession")
|
|
||||||
)]
|
|
||||||
pub fn encrypt_payload(
|
pub fn encrypt_payload(
|
||||||
&self,
|
&self,
|
||||||
dir: SecureDatagramDirection,
|
dir: SecureDatagramDirection,
|
||||||
@@ -723,10 +719,6 @@ impl SecureDatagramSession {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(
|
|
||||||
feature = "hotpath",
|
|
||||||
hotpath::measure(impl_type = "SecureDatagramSession")
|
|
||||||
)]
|
|
||||||
pub fn decrypt_payload(
|
pub fn decrypt_payload(
|
||||||
&self,
|
&self,
|
||||||
dir: SecureDatagramDirection,
|
dir: SecureDatagramDirection,
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ use std::sync::{Arc, Mutex};
|
|||||||
use bytes::Bytes;
|
use bytes::Bytes;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use guarden::defer;
|
use guarden::defer;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use prost::Message;
|
use prost::Message;
|
||||||
|
use quanta::Instant;
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use tokio::task::JoinSet;
|
use tokio::task::JoinSet;
|
||||||
use tokio::time::timeout;
|
use tokio::time::timeout;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use prost::{Message as _, length_delimiter_len};
|
use prost::{Message as _, length_delimiter_len};
|
||||||
|
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
common::{PeerId, compressor::DefaultCompressor},
|
common::{PeerId, compressor::DefaultCompressor},
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ use std::{
|
|||||||
|
|
||||||
use bytes::Bytes;
|
use bytes::Bytes;
|
||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use hotpath::instant::Instant;
|
|
||||||
use prost::Message;
|
use prost::Message;
|
||||||
|
use quanta::Instant;
|
||||||
use tokio::{task::JoinSet, time::timeout};
|
use tokio::{task::JoinSet, time::timeout};
|
||||||
use tokio_stream::StreamExt;
|
use tokio_stream::StreamExt;
|
||||||
|
|
||||||
|
|||||||
@@ -477,6 +477,12 @@ struct PublicIpv6Lab {
|
|||||||
extra_bridges: [&'static str; 2],
|
extra_bridges: [&'static str; 2],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
enum PublicIpv6LabTopology {
|
||||||
|
DelegatedPrefix,
|
||||||
|
OnLinkPrefix,
|
||||||
|
}
|
||||||
|
|
||||||
impl PublicIpv6Lab {
|
impl PublicIpv6Lab {
|
||||||
const PROVIDER_NS: &'static str = "net_a";
|
const PROVIDER_NS: &'static str = "net_a";
|
||||||
const CLIENT_NS: &'static str = "net_b";
|
const CLIENT_NS: &'static str = "net_b";
|
||||||
@@ -490,11 +496,13 @@ impl PublicIpv6Lab {
|
|||||||
const PROVIDER_DEFAULT_FROM: &'static str = "2001:db8:100::/64";
|
const PROVIDER_DEFAULT_FROM: &'static str = "2001:db8:100::/64";
|
||||||
const PROVIDER_WAN_ADDR: &'static str = "2001:db8:ffff:1::2/64";
|
const PROVIDER_WAN_ADDR: &'static str = "2001:db8:ffff:1::2/64";
|
||||||
const UPSTREAM_WAN_ADDR: &'static str = "2001:db8:ffff:1::1/64";
|
const UPSTREAM_WAN_ADDR: &'static str = "2001:db8:ffff:1::1/64";
|
||||||
|
const ON_LINK_PROVIDER_WAN_ADDR: &'static str = "2001:db8:100::2/64";
|
||||||
|
const ON_LINK_UPSTREAM_WAN_ADDR: &'static str = "2001:db8:100::1/64";
|
||||||
const UPSTREAM_SERVER_ADDR: &'static str = "2001:db8:ffff:2::1/64";
|
const UPSTREAM_SERVER_ADDR: &'static str = "2001:db8:ffff:2::1/64";
|
||||||
const SERVER_ADDR: &'static str = "2001:db8:ffff:2::100/64";
|
const SERVER_ADDR: &'static str = "2001:db8:ffff:2::100/64";
|
||||||
const SERVER_IP: &'static str = "2001:db8:ffff:2::100";
|
const SERVER_IP: &'static str = "2001:db8:ffff:2::100";
|
||||||
|
|
||||||
fn setup() -> Self {
|
fn setup_with_topology(topology: PublicIpv6LabTopology) -> Self {
|
||||||
prepare_linux_namespaces();
|
prepare_linux_namespaces();
|
||||||
|
|
||||||
del_netns(Self::UPSTREAM_NS);
|
del_netns(Self::UPSTREAM_NS);
|
||||||
@@ -544,13 +552,23 @@ impl PublicIpv6Lab {
|
|||||||
Self::SERVER_BRIDGE,
|
Self::SERVER_BRIDGE,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let (provider_wan_addr, upstream_wan_addr) = match topology {
|
||||||
|
PublicIpv6LabTopology::DelegatedPrefix => {
|
||||||
|
(Self::PROVIDER_WAN_ADDR, Self::UPSTREAM_WAN_ADDR)
|
||||||
|
}
|
||||||
|
PublicIpv6LabTopology::OnLinkPrefix => (
|
||||||
|
Self::ON_LINK_PROVIDER_WAN_ADDR,
|
||||||
|
Self::ON_LINK_UPSTREAM_WAN_ADDR,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
|
||||||
run_ip_in_ns(
|
run_ip_in_ns(
|
||||||
Self::PROVIDER_NS,
|
Self::PROVIDER_NS,
|
||||||
&["addr", "add", Self::PROVIDER_WAN_ADDR, "dev", "pubwan0"],
|
&["addr", "add", provider_wan_addr, "dev", "pubwan0"],
|
||||||
);
|
);
|
||||||
run_ip_in_ns(
|
run_ip_in_ns(
|
||||||
Self::UPSTREAM_NS,
|
Self::UPSTREAM_NS,
|
||||||
&["addr", "add", Self::UPSTREAM_WAN_ADDR, "dev", "upwan0"],
|
&["addr", "add", upstream_wan_addr, "dev", "upwan0"],
|
||||||
);
|
);
|
||||||
run_ip_in_ns(
|
run_ip_in_ns(
|
||||||
Self::UPSTREAM_NS,
|
Self::UPSTREAM_NS,
|
||||||
@@ -561,37 +579,56 @@ impl PublicIpv6Lab {
|
|||||||
&["addr", "add", Self::SERVER_ADDR, "dev", "srv0"],
|
&["addr", "add", Self::SERVER_ADDR, "dev", "srv0"],
|
||||||
);
|
);
|
||||||
|
|
||||||
run_ip_in_ns(
|
match topology {
|
||||||
Self::PROVIDER_NS,
|
PublicIpv6LabTopology::DelegatedPrefix => {
|
||||||
&["link", "add", "pubprefix0", "type", "dummy"],
|
run_ip_in_ns(
|
||||||
);
|
Self::PROVIDER_NS,
|
||||||
run_ip_in_ns(Self::PROVIDER_NS, &["link", "set", "pubprefix0", "up"]);
|
&["link", "add", "pubprefix0", "type", "dummy"],
|
||||||
run_ip_in_ns(
|
);
|
||||||
Self::PROVIDER_NS,
|
run_ip_in_ns(Self::PROVIDER_NS, &["link", "set", "pubprefix0", "up"]);
|
||||||
&[
|
run_ip_in_ns(
|
||||||
"-6",
|
Self::PROVIDER_NS,
|
||||||
"route",
|
&[
|
||||||
"add",
|
"-6",
|
||||||
Self::PROVIDER_PREFIX,
|
"route",
|
||||||
"dev",
|
"add",
|
||||||
"pubprefix0",
|
Self::PROVIDER_PREFIX,
|
||||||
],
|
"dev",
|
||||||
);
|
"pubprefix0",
|
||||||
run_ip_in_ns(
|
],
|
||||||
Self::PROVIDER_NS,
|
);
|
||||||
&[
|
run_ip_in_ns(
|
||||||
"-6",
|
Self::PROVIDER_NS,
|
||||||
"route",
|
&[
|
||||||
"add",
|
"-6",
|
||||||
"default",
|
"route",
|
||||||
"from",
|
"add",
|
||||||
Self::PROVIDER_DEFAULT_FROM,
|
"default",
|
||||||
"via",
|
"from",
|
||||||
"2001:db8:ffff:1::1",
|
Self::PROVIDER_DEFAULT_FROM,
|
||||||
"dev",
|
"via",
|
||||||
"pubwan0",
|
"2001:db8:ffff:1::1",
|
||||||
],
|
"dev",
|
||||||
);
|
"pubwan0",
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
PublicIpv6LabTopology::OnLinkPrefix => {
|
||||||
|
run_ip_in_ns(
|
||||||
|
Self::PROVIDER_NS,
|
||||||
|
&[
|
||||||
|
"-6",
|
||||||
|
"route",
|
||||||
|
"add",
|
||||||
|
"default",
|
||||||
|
"via",
|
||||||
|
"2001:db8:100::1",
|
||||||
|
"dev",
|
||||||
|
"pubwan0",
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
run_ip_in_ns(
|
run_ip_in_ns(
|
||||||
Self::SERVER_NS,
|
Self::SERVER_NS,
|
||||||
@@ -606,19 +643,21 @@ impl PublicIpv6Lab {
|
|||||||
"srv0",
|
"srv0",
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
run_ip_in_ns(
|
if matches!(topology, PublicIpv6LabTopology::DelegatedPrefix) {
|
||||||
Self::UPSTREAM_NS,
|
run_ip_in_ns(
|
||||||
&[
|
Self::UPSTREAM_NS,
|
||||||
"-6",
|
&[
|
||||||
"route",
|
"-6",
|
||||||
"add",
|
"route",
|
||||||
Self::PROVIDER_PREFIX,
|
"add",
|
||||||
"via",
|
Self::PROVIDER_PREFIX,
|
||||||
"2001:db8:ffff:1::2",
|
"via",
|
||||||
"dev",
|
"2001:db8:ffff:1::2",
|
||||||
"upwan0",
|
"dev",
|
||||||
],
|
"upwan0",
|
||||||
);
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
run_sysctl_in_ns(Self::PROVIDER_NS, "net.ipv6.conf.all.forwarding=1");
|
run_sysctl_in_ns(Self::PROVIDER_NS, "net.ipv6.conf.all.forwarding=1");
|
||||||
run_sysctl_in_ns(Self::UPSTREAM_NS, "net.ipv6.conf.all.forwarding=1");
|
run_sysctl_in_ns(Self::UPSTREAM_NS, "net.ipv6.conf.all.forwarding=1");
|
||||||
@@ -672,7 +711,15 @@ fn get_public_ipv6_config(
|
|||||||
async fn init_public_ipv6_two_node(
|
async fn init_public_ipv6_two_node(
|
||||||
client_inst_id: uuid::Uuid,
|
client_inst_id: uuid::Uuid,
|
||||||
) -> (PublicIpv6Lab, Instance, Instance) {
|
) -> (PublicIpv6Lab, Instance, Instance) {
|
||||||
let lab = PublicIpv6Lab::setup();
|
init_public_ipv6_two_node_with_topology(client_inst_id, PublicIpv6LabTopology::DelegatedPrefix)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn init_public_ipv6_two_node_with_topology(
|
||||||
|
client_inst_id: uuid::Uuid,
|
||||||
|
topology: PublicIpv6LabTopology,
|
||||||
|
) -> (PublicIpv6Lab, Instance, Instance) {
|
||||||
|
let lab = PublicIpv6Lab::setup_with_topology(topology);
|
||||||
|
|
||||||
let provider_cfg = get_public_ipv6_config(
|
let provider_cfg = get_public_ipv6_config(
|
||||||
"provider_public_ipv6",
|
"provider_public_ipv6",
|
||||||
@@ -756,6 +803,13 @@ fn addr_exists_in_ns(ns: &str, dev: &str, needle: &str) -> bool {
|
|||||||
run_ip_in_ns_output(ns, &["-6", "addr", "show", "dev", dev]).contains(needle)
|
run_ip_in_ns_output(ns, &["-6", "addr", "show", "dev", dev]).contains(needle)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn ndp_proxy_exists_in_ns(ns: &str, dev: &str, addr: std::net::Ipv6Addr) -> bool {
|
||||||
|
let addr = addr.to_string();
|
||||||
|
run_ip_in_ns_output(ns, &["-6", "neigh", "show", "proxy", "dev", dev])
|
||||||
|
.lines()
|
||||||
|
.any(|line| line.split_whitespace().next() == Some(addr.as_str()))
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
#[serial_test::serial]
|
#[serial_test::serial]
|
||||||
pub async fn public_ipv6_auto_addr_end_to_end() {
|
pub async fn public_ipv6_auto_addr_end_to_end() {
|
||||||
@@ -878,6 +932,67 @@ pub async fn public_ipv6_auto_addr_end_to_end() {
|
|||||||
drop_insts(vec![provider, client]).await;
|
drop_insts(vec![provider, client]).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
#[serial_test::serial]
|
||||||
|
pub async fn public_ipv6_auto_addr_on_link_ndp_proxy_end_to_end() {
|
||||||
|
let client_id = uuid::Uuid::parse_str("44444444-4444-4444-4444-444444444444").unwrap();
|
||||||
|
let (_lab, provider, client) =
|
||||||
|
init_public_ipv6_two_node_with_topology(client_id, PublicIpv6LabTopology::OnLinkPrefix)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
wait_for_condition(
|
||||||
|
|| async {
|
||||||
|
provider
|
||||||
|
.get_global_ctx()
|
||||||
|
.get_advertised_ipv6_public_addr_prefix()
|
||||||
|
== Some(PublicIpv6Lab::PROVIDER_PREFIX.parse().unwrap())
|
||||||
|
},
|
||||||
|
Duration::from_secs(10),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let leased = wait_for_public_ipv6_addr(&client).await;
|
||||||
|
wait_for_public_ipv6_route(&provider, leased).await;
|
||||||
|
|
||||||
|
wait_for_condition(
|
||||||
|
|| async {
|
||||||
|
addr_exists_in_ns(
|
||||||
|
PublicIpv6Lab::CLIENT_NS,
|
||||||
|
PublicIpv6Lab::CLIENT_TUN,
|
||||||
|
&leased.to_string(),
|
||||||
|
) && route_exists_in_ns(
|
||||||
|
PublicIpv6Lab::PROVIDER_NS,
|
||||||
|
&format!("{} dev {}", leased.address(), PublicIpv6Lab::PROVIDER_TUN),
|
||||||
|
)
|
||||||
|
},
|
||||||
|
Duration::from_secs(10),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
wait_for_condition(
|
||||||
|
|| async {
|
||||||
|
ndp_proxy_exists_in_ns(PublicIpv6Lab::PROVIDER_NS, "pubwan0", leased.address())
|
||||||
|
},
|
||||||
|
Duration::from_secs(20),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
wait_for_condition(
|
||||||
|
|| async {
|
||||||
|
ping6_test(
|
||||||
|
PublicIpv6Lab::SERVER_NS,
|
||||||
|
leased.address().to_string().as_str(),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
},
|
||||||
|
Duration::from_secs(20),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
drop_insts(vec![provider, client]).await;
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
#[serial_test::serial]
|
#[serial_test::serial]
|
||||||
pub async fn public_ipv6_auto_addr_reconnect_reuses_same_address() {
|
pub async fn public_ipv6_auto_addr_reconnect_reuses_same_address() {
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ impl Socket {
|
|||||||
ack: Option<u32>,
|
ack: Option<u32>,
|
||||||
state: State,
|
state: State,
|
||||||
) -> (Socket, flume::Sender<Bytes>) {
|
) -> (Socket, flume::Sender<Bytes>) {
|
||||||
let (incoming_tx, incoming_rx) = hotpath::channel!(flume::bounded(MPMC_BUFFER_LEN));
|
let (incoming_tx, incoming_rx) = flume::bounded(MPMC_BUFFER_LEN);
|
||||||
|
|
||||||
(
|
(
|
||||||
Socket {
|
Socket {
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ pub struct MpscTunnel<T> {
|
|||||||
|
|
||||||
impl<T: Tunnel> MpscTunnel<T> {
|
impl<T: Tunnel> MpscTunnel<T> {
|
||||||
pub fn new(tunnel: T, send_timeout: Option<Duration>) -> Self {
|
pub fn new(tunnel: T, send_timeout: Option<Duration>) -> Self {
|
||||||
let (tx, mut rx) = hotpath::channel!(channel(32));
|
let (tx, mut rx) = channel(32);
|
||||||
let (stream, mut sink) = tunnel.split();
|
let (stream, mut sink) = tunnel.split();
|
||||||
|
|
||||||
let task = tokio::spawn(async move {
|
let task = tokio::spawn(async move {
|
||||||
@@ -66,7 +66,6 @@ impl<T: Tunnel> MpscTunnel<T> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "MpscTunnel"))]
|
|
||||||
async fn forward_one_round(
|
async fn forward_one_round(
|
||||||
rx: &mut Receiver<ZCPacket>,
|
rx: &mut Receiver<ZCPacket>,
|
||||||
sink: &mut Pin<Box<dyn ZCPacketSink>>,
|
sink: &mut Pin<Box<dyn ZCPacketSink>>,
|
||||||
@@ -80,7 +79,6 @@ impl<T: Tunnel> MpscTunnel<T> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "MpscTunnel"))]
|
|
||||||
async fn forward_one_round_no_timeout(
|
async fn forward_one_round_no_timeout(
|
||||||
rx: &mut Receiver<ZCPacket>,
|
rx: &mut Receiver<ZCPacket>,
|
||||||
sink: &mut Pin<Box<dyn ZCPacketSink>>,
|
sink: &mut Pin<Box<dyn ZCPacketSink>>,
|
||||||
@@ -98,7 +96,6 @@ impl<T: Tunnel> MpscTunnel<T> {
|
|||||||
sink.flush().await
|
sink.flush().await
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature = "hotpath", hotpath::measure(impl_type = "MpscTunnel"))]
|
|
||||||
async fn forward_one_round_with_timeout(
|
async fn forward_one_round_with_timeout(
|
||||||
rx: &mut Receiver<ZCPacket>,
|
rx: &mut Receiver<ZCPacket>,
|
||||||
sink: &mut Pin<Box<dyn ZCPacketSink>>,
|
sink: &mut Pin<Box<dyn ZCPacketSink>>,
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
use bytes::Buf;
|
||||||
use bytes::Bytes;
|
use bytes::Bytes;
|
||||||
use bytes::BytesMut;
|
use bytes::BytesMut;
|
||||||
use zerocopy::AsBytes;
|
use zerocopy::AsBytes;
|
||||||
@@ -486,7 +487,7 @@ impl ZCPacket {
|
|||||||
let total_len = payload_off + payload.len();
|
let total_len = payload_off + payload.len();
|
||||||
ret.inner.reserve(total_len);
|
ret.inner.reserve(total_len);
|
||||||
unsafe { ret.inner.set_len(total_len) };
|
unsafe { ret.inner.set_len(total_len) };
|
||||||
ret.mut_payload()[..payload.len()].copy_from_slice(payload);
|
ret.mut_payload().copy_from_slice(payload);
|
||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -587,7 +588,8 @@ impl ZCPacket {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn payload_bytes(mut self) -> BytesMut {
|
pub fn payload_bytes(mut self) -> BytesMut {
|
||||||
self.inner.split_off(self.payload_offset())
|
self.inner.advance(self.payload_offset());
|
||||||
|
self.inner
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn peer_manager_header(&self) -> Option<&PeerManagerHeader> {
|
pub fn peer_manager_header(&self) -> Option<&PeerManagerHeader> {
|
||||||
@@ -652,11 +654,12 @@ impl ZCPacket {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn tunnel_payload_bytes(mut self) -> BytesMut {
|
pub fn tunnel_payload_bytes(mut self) -> BytesMut {
|
||||||
self.inner.split_off(
|
self.inner.advance(
|
||||||
self.packet_type
|
self.packet_type
|
||||||
.get_packet_offsets()
|
.get_packet_offsets()
|
||||||
.peer_manager_header_offset,
|
.peer_manager_header_offset,
|
||||||
)
|
);
|
||||||
|
self.inner
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn convert_type(mut self, target_packet_type: ZCPacketType) -> Self {
|
pub fn convert_type(mut self, target_packet_type: ZCPacketType) -> Self {
|
||||||
@@ -702,7 +705,8 @@ impl ZCPacket {
|
|||||||
return Self::new_from_buf(buf, target_packet_type);
|
return Self::new_from_buf(buf, target_packet_type);
|
||||||
}
|
}
|
||||||
|
|
||||||
Self::new_from_buf(self.inner.split_off(new_offset), target_packet_type)
|
self.inner.advance(new_offset);
|
||||||
|
Self::new_from_buf(self.inner, target_packet_type)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn into_bytes(self) -> Bytes {
|
pub fn into_bytes(self) -> Bytes {
|
||||||
@@ -748,8 +752,10 @@ impl ZCPacket {
|
|||||||
let foreign_hdr_len = hdr.get_header_len();
|
let foreign_hdr_len = hdr.get_header_len();
|
||||||
|
|
||||||
Self::new_from_buf(
|
Self::new_from_buf(
|
||||||
self.inner
|
{
|
||||||
.split_off(foreign_hdr_len + self.payload_offset()),
|
self.inner.advance(foreign_hdr_len + self.payload_offset());
|
||||||
|
self.inner
|
||||||
|
},
|
||||||
ZCPacketType::DummyTunnel,
|
ZCPacketType::DummyTunnel,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ use async_trait::async_trait;
|
|||||||
use futures::{Sink, SinkExt, Stream, StreamExt};
|
use futures::{Sink, SinkExt, Stream, StreamExt};
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
|
|
||||||
use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
|
use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel};
|
||||||
|
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
@@ -196,8 +196,7 @@ pub struct RingTunnelListener {
|
|||||||
|
|
||||||
impl RingTunnelListener {
|
impl RingTunnelListener {
|
||||||
pub fn new(key: url::Url) -> Self {
|
pub fn new(key: url::Url) -> Self {
|
||||||
let (conn_sender, conn_receiver) =
|
let (conn_sender, conn_receiver) = unbounded_channel();
|
||||||
hotpath::channel!(tokio::sync::mpsc::unbounded_channel());
|
|
||||||
RingTunnelListener {
|
RingTunnelListener {
|
||||||
listener_addr: key,
|
listener_addr: key,
|
||||||
conn_sender,
|
conn_sender,
|
||||||
|
|||||||
@@ -15,7 +15,9 @@ use zerocopy::{AsBytes, FromBytes};
|
|||||||
|
|
||||||
use tokio::{
|
use tokio::{
|
||||||
net::UdpSocket,
|
net::UdpSocket,
|
||||||
sync::mpsc::{Receiver, Sender, UnboundedReceiver, UnboundedSender},
|
sync::mpsc::{
|
||||||
|
Receiver, Sender, UnboundedReceiver, UnboundedSender, channel, unbounded_channel,
|
||||||
|
},
|
||||||
task::JoinSet,
|
task::JoinSet,
|
||||||
};
|
};
|
||||||
use tokio_util::task::AbortOnDropHandle;
|
use tokio_util::task::AbortOnDropHandle;
|
||||||
@@ -673,9 +675,8 @@ pub struct UdpTunnelListener {
|
|||||||
|
|
||||||
impl UdpTunnelListener {
|
impl UdpTunnelListener {
|
||||||
pub fn new(addr: url::Url) -> Self {
|
pub fn new(addr: url::Url) -> Self {
|
||||||
let (close_event_send, close_event_recv) =
|
let (close_event_send, close_event_recv) = unbounded_channel();
|
||||||
hotpath::channel!(tokio::sync::mpsc::unbounded_channel());
|
let (conn_send, conn_recv) = channel(100);
|
||||||
let (conn_send, conn_recv) = hotpath::channel!(tokio::sync::mpsc::channel(100));
|
|
||||||
Self {
|
Self {
|
||||||
addr: addr.clone(),
|
addr: addr.clone(),
|
||||||
socket: None,
|
socket: None,
|
||||||
@@ -915,8 +916,7 @@ impl UdpTunnelConnector {
|
|||||||
"udp build tunnel for connector"
|
"udp build tunnel for connector"
|
||||||
);
|
);
|
||||||
|
|
||||||
let (close_event_sender, mut close_event_recv) =
|
let (close_event_sender, mut close_event_recv) = unbounded_channel();
|
||||||
hotpath::channel!(tokio::sync::mpsc::unbounded_channel());
|
|
||||||
|
|
||||||
let ring_recv = RingStream::new(ring_for_send_udp.clone());
|
let ring_recv = RingStream::new(ring_for_send_udp.clone());
|
||||||
let ring_sender = RingSink::new(ring_for_recv_udp.clone());
|
let ring_sender = RingSink::new(ring_for_recv_udp.clone());
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use std::{
|
|||||||
time::Duration,
|
time::Duration,
|
||||||
};
|
};
|
||||||
|
|
||||||
use hotpath::instant::Instant;
|
use quanta::Instant;
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
FromUrl, IpVersion, Tunnel, TunnelError, TunnelInfo, TunnelListener, TunnelUrl, ZCPacketSink,
|
FromUrl, IpVersion, Tunnel, TunnelError, TunnelInfo, TunnelListener, TunnelUrl, ZCPacketSink,
|
||||||
@@ -37,7 +37,11 @@ use crossbeam::atomic::AtomicCell;
|
|||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use futures::{SinkExt, StreamExt, stream::FuturesUnordered};
|
use futures::{SinkExt, StreamExt, stream::FuturesUnordered};
|
||||||
use rand::RngCore;
|
use rand::RngCore;
|
||||||
use tokio::{net::UdpSocket, sync::Mutex, task::JoinSet};
|
use tokio::{
|
||||||
|
net::UdpSocket,
|
||||||
|
sync::{Mutex, mpsc::unbounded_channel},
|
||||||
|
task::JoinSet,
|
||||||
|
};
|
||||||
|
|
||||||
const MAX_PACKET: usize = 2048;
|
const MAX_PACKET: usize = 2048;
|
||||||
|
|
||||||
@@ -470,7 +474,7 @@ pub struct WgTunnelListener {
|
|||||||
|
|
||||||
impl WgTunnelListener {
|
impl WgTunnelListener {
|
||||||
pub fn new(addr: url::Url, config: WgConfig) -> Self {
|
pub fn new(addr: url::Url, config: WgConfig) -> Self {
|
||||||
let (conn_send, conn_recv) = hotpath::channel!(tokio::sync::mpsc::unbounded_channel());
|
let (conn_send, conn_recv) = unbounded_channel();
|
||||||
WgTunnelListener {
|
WgTunnelListener {
|
||||||
addr,
|
addr,
|
||||||
config,
|
config,
|
||||||
|
|||||||
Reference in New Issue
Block a user