From f8f55b2becdcde2379395ac94698dd275d4fb4c0 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Fri, 6 Dec 2024 19:47:10 -0500 Subject: [PATCH] [ci skip] checkpoint (doesn't compile) --- Cargo.lock | 623 ++++++++---------- veilid-tools/Cargo.toml | 2 + veilid-tools/src/network_interfaces/mod.rs | 4 +- .../virtual_network/router_server/config.rs | 124 +++- .../router_server/default_config.yml | 14 +- .../router_server/machine_registry.rs | 189 ------ .../machine_registry/address_pool.rs | 101 +++ .../machine_registry_inner.rs | 417 ++++++++++++ .../router_server/machine_registry/mod.rs | 67 ++ .../machine_registry/state/blueprint_state.rs | 7 + .../machine_registry/state/machine_state.rs | 154 +++++ .../machine_registry/state/mod.rs | 15 + .../machine_registry/state/network_state.rs | 306 +++++++++ .../machine_registry/state/profile_state.rs | 4 + .../machine_registry/state/resolves_to.rs | 72 ++ .../machine_registry/state/template_state.rs | 33 + .../src/virtual_network/router_server/mod.rs | 2 + .../router_server/predefined_config.yml | 2 +- .../router_server/stable_rng.rs | 85 +++ 19 files changed, 1660 insertions(+), 561 deletions(-) delete mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/address_pool.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/machine_registry_inner.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/mod.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/state/blueprint_state.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/state/machine_state.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/state/mod.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/state/network_state.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/state/profile_state.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/state/resolves_to.rs create mode 100644 veilid-tools/src/virtual_network/router_server/machine_registry/state/template_state.rs create mode 100644 veilid-tools/src/virtual_network/router_server/stable_rng.rs diff --git a/Cargo.lock b/Cargo.lock index 063873c2..ecb60428 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "android-tzdata" @@ -202,9 +202,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arboard" @@ -292,8 +292,8 @@ checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.1", - "futures-lite 2.4.0", + "fastrand 2.2.0", + "futures-lite 2.5.0", "slab", ] @@ -305,10 +305,10 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ "async-channel 2.3.1", "async-executor", - "async-io 2.3.4", + "async-io 2.4.0", "async-lock 3.4.0", "blocking", - "futures-lite 2.4.0", + "futures-lite 2.5.0", "once_cell", ] @@ -334,18 +334,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock 3.4.0", "cfg-if 1.0.0", "concurrent-queue", "futures-io", - "futures-lite 2.4.0", + "futures-lite 2.5.0", "parking", - "polling 3.7.3", - "rustix 0.38.39", + "polling 3.7.4", + "rustix 0.38.41", "slab", "tracing", "windows-sys 0.59.0", @@ -378,15 +378,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel 2.3.1", - "async-io 2.3.4", + "async-io 2.4.0", "async-lock 3.4.0", "async-signal", "async-task", "blocking", "cfg-if 1.0.0", "event-listener 5.3.1", - "futures-lite 2.4.0", - "rustix 0.38.39", + "futures-lite 2.5.0", + "rustix 0.38.41", "tracing", ] @@ -396,13 +396,13 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.4", + "async-io 2.4.0", "async-lock 3.4.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.39", + "rustix 0.38.41", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -417,14 +417,14 @@ dependencies = [ "async-attributes", "async-channel 1.9.0", "async-global-executor", - "async-io 2.3.4", + "async-io 2.4.0", "async-lock 3.4.0", "async-process", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite 2.4.0", + "futures-lite 2.5.0", "gloo-timers 0.3.0", "kv-log-macro", "log", @@ -448,7 +448,7 @@ dependencies = [ "futures-util", "hickory-resolver", "pin-utils", - "socket2 0.5.7", + "socket2 0.5.8", ] [[package]] @@ -470,7 +470,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -500,7 +500,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -630,7 +630,7 @@ dependencies = [ "async-trait", "axum-core", "bitflags 1.3.2", - "bytes 1.8.0", + "bytes 1.9.0", "futures-util", "http 0.2.12", "http-body", @@ -656,7 +656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.8.0", + "bytes 1.9.0", "futures-util", "http 0.2.12", "http-body", @@ -739,9 +739,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -758,7 +758,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -813,7 +813,7 @@ dependencies = [ "async-channel 2.3.1", "async-task", "futures-io", - "futures-lite 2.4.0", + "futures-lite 2.5.0", "piper", ] @@ -846,9 +846,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "capnp" @@ -870,9 +870,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.34" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "shlex", ] @@ -996,9 +996,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -1006,9 +1006,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -1026,14 +1026,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "clipboard-win" @@ -1046,9 +1046,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" dependencies = [ "cc", ] @@ -1084,7 +1084,7 @@ version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "memchr", ] @@ -1215,9 +1215,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1277,9 +1277,9 @@ dependencies = [ "bitflags 2.6.0", "crossterm_winapi", "futures-core", - "mio 1.0.2", + "mio 1.0.3", "parking_lot 0.12.3", - "rustix 0.38.39", + "rustix 0.38.41", "signal-hook", "signal-hook-mio", "winapi", @@ -1317,12 +1317,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1435,7 +1435,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1492,7 +1492,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1514,7 +1514,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1615,7 +1615,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1692,7 +1692,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1712,7 +1712,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1755,7 +1755,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1789,12 +1789,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1865,9 +1865,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "ffi-support" @@ -1897,17 +1897,11 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -1927,7 +1921,7 @@ dependencies = [ "log", "regex", "rustversion", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -1985,7 +1979,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.39", + "rustix 0.38.41", "windows-sys 0.48.0", ] @@ -2054,11 +2048,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ - "fastrand 2.1.1", + "fastrand 2.2.0", "futures-core", "futures-io", "parking", @@ -2073,7 +2067,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2266,7 +2260,7 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "fnv", "futures-core", "futures-sink", @@ -2330,9 +2324,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "hashlink" @@ -2430,7 +2424,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tokio", "tracing", @@ -2453,7 +2447,7 @@ dependencies = [ "rand", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -2515,7 +2509,7 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "fnv", "itoa", ] @@ -2526,7 +2520,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "fnv", "itoa", ] @@ -2537,7 +2531,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "http 0.2.12", "pin-project-lite", ] @@ -2566,7 +2560,7 @@ version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "futures-channel", "futures-core", "futures-util", @@ -2577,7 +2571,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.5.8", "tokio", "tower-service", "tracing", @@ -2602,7 +2596,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "hyper", "native-tls", "tokio", @@ -2747,7 +2741,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2826,7 +2820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", ] [[package]] @@ -2864,7 +2858,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.7", + "socket2 0.5.8", "widestring", "windows-sys 0.48.0", "winreg", @@ -2914,9 +2908,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jni" @@ -2929,7 +2923,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] @@ -2942,9 +2936,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "fb15147158e79fd8b8afd0252522769c4f48725460b37338544d8379d94fc8f9" dependencies = [ "wasm-bindgen", ] @@ -3055,9 +3049,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libc-print" @@ -3070,9 +3064,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if 1.0.0", "windows-targets 0.52.6", @@ -3132,9 +3126,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -3287,23 +3281,16 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "log", "wasi", "windows-sys 0.52.0", ] -[[package]] -name = "multimap" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" - [[package]] name = "nanorand" version = "0.7.0" @@ -3351,7 +3338,7 @@ dependencies = [ "ndk-sys 0.4.1+23.1.7779620", "num_enum", "raw-window-handle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3442,7 +3429,7 @@ dependencies = [ "anyhow", "byteorder", "paste", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3451,12 +3438,12 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "futures", "log", "netlink-packet-core", "netlink-sys", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -3467,7 +3454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "async-io 1.13.0", - "bytes 1.8.0", + "bytes 1.9.0", "futures", "libc", "log", @@ -3802,7 +3789,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3844,7 +3831,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3863,7 +3850,7 @@ dependencies = [ "opentelemetry_sdk 0.20.0", "prost 0.11.9", "protobuf", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic 0.9.2", ] @@ -3881,7 +3868,7 @@ dependencies = [ "opentelemetry-proto 0.6.0", "opentelemetry_sdk 0.23.0", "prost 0.12.6", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic 0.11.0", ] @@ -3940,7 +3927,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", "urlencoding", ] @@ -3963,7 +3950,7 @@ dependencies = [ "rand", "regex", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -3986,7 +3973,7 @@ dependencies = [ "ordered-float 4.5.0", "percent-encoding", "rand", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -4134,9 +4121,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "peeking_take_while" @@ -4150,16 +4137,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap 2.6.0", -] - [[package]] name = "pharos" version = "0.5.3" @@ -4207,7 +4184,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4229,7 +4206,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.1", + "fastrand 2.2.0", "futures-io", ] @@ -4267,15 +4244,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.3" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.39", + "rustix 0.38.41", "tracing", "windows-sys 0.59.0", ] @@ -4293,24 +4270,24 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "portable-atomic-util" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a7d5beecc52a491b54d6dd05c7a45ba1801666a5baad9fdbfc6fef8d2d206c" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" dependencies = [ "portable-atomic", ] [[package]] name = "postcard" -version = "1.0.10" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" +checksum = "f63d01def49fc815900a83e7a4a5083d2abc81b7ddd569a3fa0477778ae9b3ec" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -4334,16 +4311,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "prettyplease" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" -dependencies = [ - "proc-macro2", - "syn 2.0.87", -] - [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -4382,14 +4349,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -4400,7 +4367,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "prost-derive 0.11.9", ] @@ -4410,31 +4377,10 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "prost-derive 0.12.6", ] -[[package]] -name = "prost-build" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" -dependencies = [ - "bytes 1.8.0", - "heck", - "itertools 0.12.1", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost 0.12.6", - "prost-types", - "regex", - "syn 2.0.87", - "tempfile", -] - [[package]] name = "prost-derive" version = "0.11.9" @@ -4458,7 +4404,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4476,15 +4422,6 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" -[[package]] -name = "protobuf-src" -version = "2.1.0+27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7edafa3bcc668fa93efafcbdf58d7821bbda0f4b458ac7fae3d57ec0fec8167" -dependencies = [ - "cmake", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -4574,7 +4511,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4585,7 +4522,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -4600,9 +4537,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -4628,7 +4565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64", - "bytes 1.8.0", + "bytes 1.9.0", "encoding_rs", "futures-core", "futures-util", @@ -4712,7 +4649,7 @@ dependencies = [ "netlink-proto", "netlink-sys", "nix 0.26.4", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -4777,9 +4714,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.39" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -4827,18 +4764,18 @@ checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rustyline-async" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9396d834c31f9fddd716e7c279e7cb70207092a1e59767918610f5c560c6eb" +checksum = "1b8a29112291cda41f18306ed8919c49360e5273328162445ca250aae37c8f89" dependencies = [ "crossterm 0.28.1", "futures-channel", "futures-util", "pin-project 1.1.7", "thingbuf", - "thiserror", + "thiserror 2.0.3", "unicode-segmentation", - "unicode-width 0.1.14", + "unicode-width 0.2.0", ] [[package]] @@ -4868,18 +4805,18 @@ dependencies = [ [[package]] name = "scc" -version = "2.2.4" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d25269dd3a12467afe2e510f69fb0b46b698e5afb296b59f2145259deaf8e8" +checksum = "66b202022bb57c049555430e11fc22fea12909276a80a4c3d368da36ac1d88ed" dependencies = [ "sdd", ] [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -4905,7 +4842,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.29.1", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4971,9 +4908,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -5002,9 +4939,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -5061,13 +4998,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5078,7 +5015,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5089,14 +5026,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -5112,7 +5049,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5178,16 +5115,16 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" dependencies = [ "futures", "log", "once_cell", "parking_lot 0.12.3", "scc", - "serial_test_derive 3.1.1", + "serial_test_derive 3.2.0", ] [[package]] @@ -5198,18 +5135,18 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "serial_test_derive" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5298,7 +5235,7 @@ checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", "mio 0.8.11", - "mio 1.0.2", + "mio 1.0.3", "signal-hook", ] @@ -5352,7 +5289,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec62a949bda7f15800481a711909f946e1204f2460f89210eaf7f57730f88f86" dependencies = [ - "thiserror", + "thiserror 1.0.69", "unicode_categories", ] @@ -5368,9 +5305,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5456,9 +5393,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -5479,7 +5416,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5519,14 +5456,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.1.1", + "fastrand 2.2.0", "once_cell", - "rustix 0.38.39", + "rustix 0.38.41", "windows-sys 0.59.0", ] @@ -5545,7 +5482,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" dependencies = [ - "rustix 0.38.39", + "rustix 0.38.41", "windows-sys 0.59.0", ] @@ -5570,22 +5507,42 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", ] [[package]] name = "thiserror-impl" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -5668,18 +5625,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", - "bytes 1.8.0", + "bytes 1.9.0", "libc", - "mio 1.0.2", + "mio 1.0.3", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2 0.5.8", "tokio-macros", "tracing", "windows-sys 0.52.0", @@ -5703,7 +5660,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5733,7 +5690,7 @@ version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ - "bytes 1.8.0", + "bytes 1.9.0", "futures-core", "futures-io", "futures-sink", @@ -5804,7 +5761,7 @@ dependencies = [ "async-trait", "axum", "base64", - "bytes 1.8.0", + "bytes 1.9.0", "futures-core", "futures-util", "h2", @@ -5833,7 +5790,7 @@ dependencies = [ "async-trait", "axum", "base64", - "bytes 1.8.0", + "bytes 1.9.0", "h2", "http 0.2.12", "http-body", @@ -5884,9 +5841,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -5901,27 +5858,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.69", "time", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -5929,9 +5886,9 @@ dependencies = [ [[package]] name = "tracing-error" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" dependencies = [ "tracing", "tracing-subscriber", @@ -5950,9 +5907,9 @@ dependencies = [ [[package]] name = "tracing-journald" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" +checksum = "fc0b4143302cf1022dac868d521e36e8b27691f72c84b3311750d5188ebba657" dependencies = [ "libc", "tracing-core", @@ -6033,16 +5990,14 @@ dependencies = [ [[package]] name = "tracing-perfetto" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c70bb5e88ac1d7f90334d3d84989b9862dfc2c907f339a1d494ee643246029c" +checksum = "e2be16ec38f047b3a21652de3f393f9d39858e86ee7def469820828489f53c00" dependencies = [ "anyhow", - "bytes 1.8.0", + "bytes 1.9.0", "chrono", "prost 0.12.6", - "prost-build", - "protobuf-src", "rand", "thread-id", "tracing", @@ -6051,9 +6006,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -6118,7 +6073,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6128,14 +6083,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", - "bytes 1.8.0", + "bytes 1.9.0", "data-encoding", "http 0.2.12", "httparse", "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", ] @@ -6147,14 +6102,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", - "bytes 1.8.0", + "bytes 1.9.0", "data-encoding", "http 1.1.0", "httparse", "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.69", "utf-8", ] @@ -6165,14 +6120,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" dependencies = [ "byteorder", - "bytes 1.8.0", + "bytes 1.9.0", "data-encoding", "http 1.1.0", "httparse", "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.69", "utf-8", ] @@ -6190,9 +6145,9 @@ checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -6251,9 +6206,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna 1.0.3", @@ -6317,7 +6272,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6362,7 +6317,7 @@ dependencies = [ "async-tungstenite 0.23.0", "cfg-if 1.0.0", "chrono", - "clap 4.5.20", + "clap 4.5.21", "config 0.14.1", "console", "crossbeam-channel", @@ -6386,7 +6341,7 @@ dependencies = [ "serde_derive", "serial_test 2.0.0", "stop-token", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "unicode-width 0.1.14", @@ -6468,7 +6423,7 @@ dependencies = [ "static_assertions", "stop-token", "sysinfo", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -6566,7 +6521,7 @@ dependencies = [ "backtrace", "cfg-if 1.0.0", "chrono", - "clap 4.5.20", + "clap 4.5.21", "color-eyre", "config 0.14.1", "console-subscriber", @@ -6588,7 +6543,7 @@ dependencies = [ "serde", "serde_derive", "serde_yaml_ng", - "serial_test 3.1.1", + "serial_test 3.2.0", "signal-hook", "signal-hook-async-std", "stop-token", @@ -6624,7 +6579,7 @@ dependencies = [ "backtrace", "cfg-if 1.0.0", "chrono", - "clap 4.5.20", + "clap 4.5.21", "config 0.14.1", "console_error_panic_hook", "ctrlc", @@ -6653,6 +6608,7 @@ dependencies = [ "parking_lot 0.12.3", "postcard", "rand", + "rand_chacha", "rand_core", "range-set-blaze", "rtnetlink", @@ -6661,10 +6617,10 @@ dependencies = [ "serde_yaml_ng", "serial_test 2.0.0", "simplelog", - "socket2 0.5.7", + "socket2 0.5.8", "static_assertions", "stop-token", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util", @@ -6750,9 +6706,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "21d3b25c3ea1126a2ad5f4f9068483c2af1e64168f847abe863a526b8dbfe00b" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -6763,36 +6719,37 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "52857d4c32e496dc6537646b5b117081e71fd2ff06de792e3577a150627db283" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "951fe82312ed48443ac78b66fa43eded9999f738f6022e67aead7b708659e49a" dependencies = [ "cfg-if 1.0.0", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "920b0ffe069571ebbfc9ddc0b36ba305ef65577c94b06262ed793716a1afd981" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6800,32 +6757,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "bf59002391099644be3524e23b781fa43d2be0c5aa0719a18c0731b9d195cab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "e5047c5392700766601942795a436d7d2599af60dcc3cc1248c9120bfb0827b0" [[package]] name = "wasm-bindgen-test" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426" +checksum = "53e4ded22f94ec93aa6631610a90cce2aafd9d956888daedd125d3689b01fc95" dependencies = [ - "console_error_panic_hook", "js-sys", "minicov", + "once_cell", "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", @@ -6834,13 +6791,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" +checksum = "f0af837599d83550fe7b46eae33b5400705103cfed84f0e0e7ca68615de09767" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6862,9 +6819,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "476364ff87d0ae6bfb661053a9104ab312542658c3d8f963b7ace80b6f9b26b9" dependencies = [ "js-sys", "wasm-bindgen", @@ -6939,7 +6896,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.39", + "rustix 0.38.41", ] [[package]] @@ -7324,7 +7281,7 @@ dependencies = [ "pharos", "rustc_version", "send_wrapper 0.6.0", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -7337,7 +7294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "gethostname", - "rustix 0.38.39", + "rustix 0.38.41", "x11rb-protocol", ] @@ -7367,9 +7324,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" +checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f" [[package]] name = "xmltree" @@ -7402,9 +7359,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -7414,13 +7371,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -7477,27 +7434,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure", ] @@ -7518,7 +7475,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -7540,7 +7497,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index 050e3d35..7f56910d 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -52,6 +52,7 @@ virtual-network-server = [ "dep:serde_yaml", "dep:validator", "dep:ws_stream_tungstenite", + "dep:rand_chacha", ] [dependencies] @@ -113,6 +114,7 @@ config = { version = "^0", default-features = false, features = [ ipnet = { version = "2", features = ["serde"], optional = true } serde_yaml = { package = "serde_yaml_ng", version = "^0.10.0", optional = true } validator = { version = "0.19.0", features = ["derive"], optional = true } +rand_chacha = { version = "0.3.1", optional = true } # Dependencies for WASM builds only [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies] diff --git a/veilid-tools/src/network_interfaces/mod.rs b/veilid-tools/src/network_interfaces/mod.rs index e6d27f0c..8046006b 100644 --- a/veilid-tools/src/network_interfaces/mod.rs +++ b/veilid-tools/src/network_interfaces/mod.rs @@ -101,8 +101,8 @@ pub struct AddressFlags { #[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)] pub struct InterfaceAddress { - if_addr: IfAddr, - flags: AddressFlags, + pub if_addr: IfAddr, + pub flags: AddressFlags, } use core::cmp::Ordering; diff --git a/veilid-tools/src/virtual_network/router_server/config.rs b/veilid-tools/src/virtual_network/router_server/config.rs index 2ca3fed9..3f4d76b0 100644 --- a/veilid-tools/src/virtual_network/router_server/config.rs +++ b/veilid-tools/src/virtual_network/router_server/config.rs @@ -76,6 +76,33 @@ impl WeightedList { .try_for_each(f), } } + + pub fn filter(&self, mut filter: F) -> Option> + where + F: FnMut(&T) -> bool, + { + match self { + WeightedList::Single(v) => { + if filter(v) { + return Some(self.clone()); + } + return None; + } + WeightedList::List(vec) => { + let mut out = Vec::>::with_capacity(vec.len()); + for v in vec { + if filter(v.item()) { + out.push(v.clone()); + } + } + if out.is_empty() { + None + } else { + Some(WeightedList::List(out)) + } + } + } + } } pub type Probability = f32; @@ -147,12 +174,8 @@ pub enum Instance { )] pub struct Machine { #[serde(flatten)] - #[validate(custom(function = "validate_location_exists", use_context))] - pub location: Location, - #[serde(default)] - pub address4: Option, - #[serde(default)] - pub address6: Option, + #[validate(custom(function = "validate_machine_location_exists", use_context))] + pub location: MachineLocation, #[serde(default)] pub disable_capabilities: Vec, #[serde(default)] @@ -178,8 +201,8 @@ fn validate_machine(machine: &Machine, _context: &ValidateContext) -> Result<(), )] pub struct Template { #[serde(flatten)] - #[validate(custom(function = "validate_location_exists", use_context))] - pub location: Location, + #[validate(custom(function = "validate_template_location_exists", use_context))] + pub location: TemplateLocation, #[serde(flatten)] #[validate(nested)] pub limits: Limits, @@ -219,7 +242,25 @@ fn validate_limits(limits: &Limits) -> Result<(), ValidationError> { #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(untagged)] -pub enum Location { +pub enum MachineLocation { + Specific { + network: String, + #[serde(default)] + address4: Option, + #[serde(default)] + address6: Option, + }, + Network { + network: WeightedList, + }, + Blueprint { + blueprint: WeightedList, + }, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(untagged)] +pub enum TemplateLocation { Network { network: WeightedList }, Blueprint { blueprint: WeightedList }, } @@ -313,7 +354,7 @@ fn validate_network_gateway( pub struct Blueprint { #[serde(default)] #[validate(custom(function = "validate_models_exist", use_context))] - pub model: WeightedList, + pub model: Option>, #[serde(default)] #[validate(custom(function = "validate_blueprint_ipv4", use_context))] pub ipv4: Option, @@ -337,7 +378,7 @@ fn validate_blueprint( pub struct BlueprintIpv4 { #[serde(default)] pub allocation: Option, - pub prefix: u8, + pub additional_prefix: u8, #[serde(default)] pub gateway: Option, } @@ -350,10 +391,9 @@ fn validate_blueprint_ipv4( validate_allocation_exists(allocation, context)?; } - if blueprint_ipv4.prefix > 32 { - return Err( - ValidationError::new("badprefix").with_message("ipv4 blueprint prefix too long".into()) - ); + if blueprint_ipv4.additional_prefix > 32 { + return Err(ValidationError::new("badprefix") + .with_message("ipv4 blueprint additional prefix too long".into())); } if let Some(gateway) = &blueprint_ipv4.gateway { @@ -366,7 +406,7 @@ fn validate_blueprint_ipv4( pub struct BlueprintIpv6 { #[serde(default)] pub allocation: Option, - pub prefix: u8, + pub additional_prefix: u8, #[serde(default)] pub gateway: Option, } @@ -379,10 +419,9 @@ fn validate_blueprint_ipv6( validate_allocation_exists(allocation, context)?; } - if blueprint_ipv6.prefix > 128 { - return Err( - ValidationError::new("badprefix").with_message("ipv6 blueprint prefix too long".into()) - ); + if blueprint_ipv6.additional_prefix > 128 { + return Err(ValidationError::new("badprefix") + .with_message("ipv6 blueprint additional prefix too long".into())); } if let Some(gateway) = &blueprint_ipv6.gateway { @@ -414,13 +453,13 @@ fn validate_blueprint_gateway( #[validate(schema(function = "validate_subnets"))] pub struct Subnets { #[serde(default)] - pub subnet4: Vec, + pub subnet4: Option>, #[serde(default)] - pub subnet6: Vec, + pub subnet6: Option>, } fn validate_subnets(subnets: &Subnets) -> Result<(), ValidationError> { - if subnets.subnet4.is_empty() && subnets.subnet6.is_empty() { + if subnets.subnet4.is_none() && subnets.subnet6.is_none() { return Err(ValidationError::new("badsub") .with_message("subnets must support at least one address type".into())); } @@ -472,7 +511,7 @@ fn validate_distribution(distribution: &Distribution) -> Result<(), ValidationEr Ok(()) } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Copy, Clone, Serialize, Deserialize)] #[serde(rename_all = "snake_case")] pub enum Translation { None, @@ -515,7 +554,7 @@ struct ValidateContext<'a> { #[derive(Debug, Clone, Serialize, Deserialize, Validate)] #[validate(context = "ValidateContext<'v_a>")] pub struct Config { - pub seed: Option, + pub seed: Option, #[validate( length(min = 1), custom(function = "validate_network_exists", use_context) @@ -596,15 +635,42 @@ fn validate_instances_exist( Ok(()) } -fn validate_location_exists( - value: &Location, +fn validate_machine_location_exists( + value: &MachineLocation, context: &ValidateContext, ) -> Result<(), ValidationError> { match value { - Location::Network { network } => { + MachineLocation::Specific { + network, + address4, + address6, + } => { + if address4.is_none() && address6.is_none() { + return Err(ValidationError::new("badaddr") + .with_message("machine must have at least one address".into())); + } + validate_network_exists(network, context)?; + } + MachineLocation::Network { network } => { + network.try_for_each(|n| validate_network_exists(n, context))?; + } + MachineLocation::Blueprint { blueprint } => { + blueprint.try_for_each(|b| validate_blueprint_exists(b, context))?; + } + } + + Ok(()) +} + +fn validate_template_location_exists( + value: &TemplateLocation, + context: &ValidateContext, +) -> Result<(), ValidationError> { + match value { + TemplateLocation::Network { network } => { network.try_for_each(|m| validate_network_exists(m, context))?; } - Location::Blueprint { blueprint } => { + TemplateLocation::Blueprint { blueprint } => { blueprint.try_for_each(|t| validate_blueprint_exists(t, context))?; } } diff --git a/veilid-tools/src/virtual_network/router_server/default_config.yml b/veilid-tools/src/virtual_network/router_server/default_config.yml index b39d9d1a..ef5e394f 100644 --- a/veilid-tools/src/virtual_network/router_server/default_config.yml +++ b/veilid-tools/src/virtual_network/router_server/default_config.yml @@ -125,22 +125,22 @@ blueprints: # with both ipv4 and ipv6 networking direct: ipv4: - prefix: 24 + additional_prefix: 24 ipv6: - prefix: 64 + additional_prefix: 64 # An ipv4-only subnet of the internet directly attached with no translation direct_ipv4_no_ipv6: ipv4: - prefix: 24 + additional_prefix: 24 # An ipv6-only subnet of the internet directly attached with no translation direct_ipv6_no_ipv4: ipv6: - prefix: 64 + additional_prefix: 64 # An ipv4-only subnet of the internet attached via NAT nat_ipv4_no_ipv6: ipv4: allocation: "$private" - prefix: 0 + additional_prefix: 0 gateway: translation: "port_restricted" upnp: 0.25 @@ -149,12 +149,12 @@ blueprints: nat_ipv4_direct_ipv6: ipv4: allocation: "$private" - prefix: 0 + additional_prefix: 0 gateway: translation: "port_restricted" upnp: 0.25 ipv6: - prefix: 56 + additional_prefix: 56 ################################################################# # Allocations diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry.rs b/veilid-tools/src/virtual_network/router_server/machine_registry.rs deleted file mode 100644 index 700350a3..00000000 --- a/veilid-tools/src/virtual_network/router_server/machine_registry.rs +++ /dev/null @@ -1,189 +0,0 @@ -use super::*; -use rand::Rng; - -#[derive(Debug)] -struct Machine {} - -#[derive(Debug)] -struct MachineRegistryUnlockedInner { - config: config::Config, -} - -#[derive(Debug, Default)] -struct ProfileState { - next_instance_index: usize, -} - -#[derive(Debug)] -struct MachineRegistryInner { - machines_by_id: HashMap, - current_profile_state: HashMap, -} - -#[derive(Debug, Clone)] -pub enum MachineRegistryError { - InvalidMachineId, - ProfileNotFound, - ProfileComplete, -} - -pub type MachineRegistryResult = Result; - -#[derive(Debug, Clone)] -pub struct MachineRegistry { - unlocked_inner: Arc, - inner: Arc>, -} - -impl MachineRegistry { - /////////////////////////////////////////////////////////// - /// Public Interface - pub fn new(config: config::Config) -> Self { - Self { - unlocked_inner: Arc::new(MachineRegistryUnlockedInner { config }), - inner: Arc::new(Mutex::new(MachineRegistryInner { - machines_by_id: HashMap::new(), - current_profile_state: HashMap::new(), - })), - } - } - - pub async fn allocate(&self, profile: String) -> MachineRegistryResult { - // Get profile definition - let Some(profile_def) = self.unlocked_inner.config.profiles.get(&profile) else { - return Err(MachineRegistryError::ProfileNotFound); - }; - - // Get current profile state, creating one if we have not yet started executing the profile - let mut inner = self.inner.lock(); - let current_profile_state = inner - .current_profile_state - .entry(profile) - .or_insert_with(|| ProfileState::default()); - - // Get the next instance from the definition - let Some(instance_def) = profile_def - .instances - .get(current_profile_state.next_instance_index) - else { - // - return Err(MachineRegistryError::ProfileComplete); - }; - - match instance_def { - config::Instance::Machine { machine } => { - let machine = self.weighted_choice(machine); - let machine_def = self - .unlocked_inner - .config - .machines - .get(machine) - .expect("config validation is broken"); - self.create_machine(machine_def).await - } - config::Instance::Template { template } => { - let template = self.weighted_choice(template); - let template_def = self - .unlocked_inner - .config - .templates - .get(template) - .expect("config validation is broken"); - self.create_machine_from_template(template_def).await - } - } - } - - pub async fn release(&self, machine_id: MachineId) -> MachineRegistryResult<()> {} - - /////////////////////////////////////////////////////////// - /// Private Implementation - - async fn create_machine( - &self, - machine_def: &config::Machine, - ) -> MachineRegistryResult { - // Get network from location - - Ok(0) - } - - async fn create_machine_from_template( - &self, - template_def: &config::Template, - ) -> MachineRegistryResult { - Ok(0) - } - - async fn get_or_create_network_from_location( - &self, - location_def: &config::Location, - ) -> MachineRegistryResult { - match location_def { - config::Location::Network { network } => { - let network = self.weighted_choice(network); - let network_def = self - .unlocked_inner - .config - .networks - .get(network) - .expect("config validation is broken"); - self.get_or_create_network(network, network_def).await - } - config::Location::Blueprint { blueprint } => { - let blueprint = self.weighted_choice(blueprint); - let blueprint_def = self - .unlocked_inner - .config - .blueprints - .get(blueprint) - .expect("config validation is broken"); - self.get_or_create_network_from_blueprint(blueprint, blueprint_def) - .await - } - } - } - - async fn get_or_create_network( - &self, - network: &String, - network_def: &config::Network, - ) -> MachineRegistryResult { - Ok(0) - } - - async fn get_or_create_network_from_blueprint( - &self, - blueprint: &String, - blueprint_def: &config::Blueprint, - ) -> MachineRegistryResult { - Ok(0) - } - - fn weighted_choice<'a, T: fmt::Debug + Clone>( - &self, - weighted_list: &'a config::WeightedList, - ) -> &'a T { - match weighted_list { - config::WeightedList::Single(x) => x, - config::WeightedList::List(vec) => { - let total_weight = vec - .iter() - .map(|x| x.weight()) - .reduce(|acc, x| acc + x) - .expect("config validation broken"); - - let r = rand::thread_rng().gen_range(0.0..=total_weight); - let mut current_weight = 0.0f32; - for x in vec { - current_weight += x.weight(); - if r < current_weight { - return x.item(); - } - } - // Catch f32 imprecision - vec.last().expect("config validation broken").item() - } - } - } -} diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/address_pool.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/address_pool.rs new file mode 100644 index 00000000..f4ed8b0e --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/address_pool.rs @@ -0,0 +1,101 @@ +use super::*; +use ipnet::*; + +#[derive(Debug)] +pub struct AddressPool { + srng: StableRng, + allocated_v4: Vec, + allocated_v6: Vec, +} + +impl AddressPool { + pub fn new(srng: StableRng) -> Self { + Self { + srng, + allocated_v4: Vec::new(), + allocated_v6: Vec::new(), + } + } + + pub fn contains_v4(&self, allocation: &Ipv4Net) -> bool { + for x in &self.allocated_v4 { + if x.contains(allocation) { + return true; + } + } + false + } + + pub fn contains_v6(&self, allocation: &Ipv6Net) -> bool { + for x in &self.allocated_v6 { + if x.contains(allocation) { + return true; + } + } + false + } + + pub fn add_v4(&mut self, allocation: Ipv4Net) { + self.allocated_v4.push(allocation); + self.allocated_v4 = Ipv4Net::aggregate(&self.allocated_v4); + } + + pub fn add_v6(&mut self, allocation: Ipv6Net) { + self.allocated_v6.push(allocation); + self.allocated_v6 = Ipv6Net::aggregate(&self.allocated_v6); + } + + pub fn add_random_subnet_v4( + &mut self, + allocation: &Ipv4Net, + additional_prefix: u8, + ) -> Option { + // Apply the additional prefix + let prefix = u8::max( + allocation.prefix_len() + additional_prefix, + allocation.max_prefix_len(), + ); + + // Get the subnets with this prefix + let mut subnets = allocation.subnets(prefix).ok()?.collect::>(); + + // Randomize the subnets + self.srng.shuffle_vec(&mut subnets); + + // Pick the first available subnet + for subnet in subnets { + if !self.contains_v4(&subnet) { + self.add_v4(subnet); + return Some(subnet); + } + } + None + } + + pub fn add_random_subnet_v6( + &mut self, + allocation: &Ipv6Net, + additional_prefix: u8, + ) -> Option { + // Apply the additional prefix + let prefix = u8::max( + allocation.prefix_len() + additional_prefix, + allocation.max_prefix_len(), + ); + + // Get the subnets with this prefix + let mut subnets = allocation.subnets(prefix).ok()?.collect::>(); + + // Randomize the subnets + self.srng.shuffle_vec(&mut subnets); + + // Pick the first available subnet + for subnet in subnets { + if !self.contains_v6(&subnet) { + self.add_v6(subnet); + return Some(subnet); + } + } + None + } +} diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/machine_registry_inner.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/machine_registry_inner.rs new file mode 100644 index 00000000..f6834e11 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/machine_registry_inner.rs @@ -0,0 +1,417 @@ +use super::*; + +#[derive(Debug)] +pub(super) struct MachineRegistryInner { + pub unlocked_inner: Arc, + pub resolve_to_manager_machine: ResolveToManager, + pub resolve_to_manager_network: ResolveToManager, + // + profile_state_by_name: HashMap, + machine_state_by_id: HashMap, + network_state_by_id: HashMap, + template_state_by_name: HashMap, + blueprint_state_by_name: HashMap, + next_machine_id: u64, + free_machine_ids: Vec, + next_network_id: u64, + free_network_ids: Vec, + address_pool: AddressPool, +} + +impl MachineRegistryInner { + /////////////////////////////////////////////////////////// + /// Public Interface + + pub fn new(unlocked_inner: Arc) -> Self { + let srng = unlocked_inner.srng.clone(); + MachineRegistryInner { + unlocked_inner, + machine_state_by_id: HashMap::new(), + profile_state_by_name: HashMap::new(), + network_state_by_id: HashMap::new(), + template_state_by_name: HashMap::new(), + blueprint_state_by_name: HashMap::new(), + next_machine_id: 0, + free_machine_ids: Vec::new(), + next_network_id: 0, + free_network_ids: Vec::new(), + resolve_to_manager_machine: ResolveToManager::new(), + resolve_to_manager_network: ResolveToManager::new(), + address_pool: AddressPool::new(srng), + } + } + + pub fn allocate(&mut self, profile: String) -> MachineRegistryResult { + // Get profile definition + let Some(profile_def) = self.unlocked_inner.config.profiles.get(&profile) else { + return Err(MachineRegistryError::ProfileNotFound); + }; + + // Get current profile state, creating one if we have not yet started executing the profile + let profile_state = self + .profile_state_by_name + .entry(profile) + .or_insert_with(|| ProfileState::default()); + + // Get the next instance from the definition + let Some(instance_def) = profile_def + .instances + .get(profile_state.next_instance_index) + else { + // + return Err(MachineRegistryError::ProfileComplete); + }; + + match instance_def { + config::Instance::Machine { machine } => { + let machine = self.unlocked_inner.srng.weighted_choice(machine); + let unlocked_inner = self.unlocked_inner.clone(); + let machine_def = unlocked_inner + .config + .machines + .get(machine).cloned() + .expect("config validation is broken"); + self.get_or_create_machine_state_id(machine.clone(), machine_def) + } + config::Instance::Template { template } => { + let template = self.unlocked_inner.srng.weighted_choice(template); + let unlocked_inner = self.unlocked_inner.clone(); + let template_def = unlocked_inner + .config + .templates + .get(template).cloned() + .expect("config validation is broken"); + self.create_machine_state_from_template(template.clone(), template_def) + } + } + } + + pub fn release(&self, machine_id: MachineId) -> MachineRegistryResult<()> { + // xxx + Ok(()) + } + + + /////////////////////////////////////////////////////////// + /// Private Implementation + + pub(super) fn get_or_create_machine_state_id( + &mut self, + name: String, + machine_def: config::Machine, + ) -> MachineRegistryResult { + + // Ensure we don't already have this machine created (name must be unique) + if let Some(machine_id) = self.resolve_to_manager_machine.add(name.clone()).get() { + return Ok(machine_id); + } + + // Allocate a machine id + let machine_id = self.free_machine_ids.pop().unwrap_or_else(|| { + let x = self.next_machine_id; + self.next_machine_id += 1; + x + }); + + // Create a new machine state + let machine_state = match MachineState::try_new(self, + MachineStateName::Machine(name.clone()), + machine_def.clone(), + machine_id, + ) { + Ok(v) => v, + Err(e) => { + // Release the machine id + self.free_machine_ids.push(machine_id); + return Err(e); + } + }; + + // Store the machine state with its unique id + self.machine_state_by_id.insert(machine_id, machine_state); + + // Bind the name to the id + self.resolve_to_manager_machine.resolve(&name, machine_id).expect("must resolve"); + + // Return the unique id + Ok(machine_id) + } + + pub(super) fn get_machine_state_by_id( + &mut self, + machine_id: MachineId, + ) -> MachineRegistryResult<&mut MachineState> { + self + .machine_state_by_id + .get_mut(&machine_id).ok_or_else(|| MachineRegistryError::MachineNotFound) + } + + pub(super) fn get_or_create_network_state_id( + &mut self, + name: String, + network_def: config::Network, + ) -> MachineRegistryResult { + + // Ensure we don't already have this network created (name must be unique) + if let Some(network_id) = self.resolve_to_manager_network.add(name.clone()).get() { + return Ok(network_id); + } + + // Allocate a network id + let network_id = self.free_network_ids.pop().unwrap_or_else(|| { + let x = self.next_network_id; + self.next_network_id += 1; + x + }); + + // Create a new network state + let network_state = match NetworkState::try_new(self, + NetworkStateName::Network(name.clone()), + network_def.clone(), + network_id, + ){ + Ok(v) => v, + Err(e) => { + // Release the network id + self.free_network_ids.push(network_id); + return Err(e); + } + }; + + // Store the network state with its unique id + self.network_state_by_id.insert(network_id, network_state); + + // Bind the name to the id + self.resolve_to_manager_network.resolve(&name, network_id).expect("must resolve"); + + // Return the unique id + Ok(network_id) + } + + pub(super) fn get_network_state_by_id ( + &mut self, + network_id: NetworkId, + ) -> MachineRegistryResult<&mut NetworkState> { + self + .network_state_by_id + .get_mut(&network_id).ok_or_else(|| MachineRegistryError::NetworkNotFound) + } + + pub(super) fn get_or_create_template_state( + &mut self, + name: &String, + template_def: config::Template, + ) -> MachineRegistryResult<&mut TemplateState> { + + // Ensure we don't already have this template created (name must be unique) + if self.template_state_by_name.contains_key(name) { + return Ok(self.template_state_by_name.get_mut(name).expect("must exist")); + } + + // Create a new template state + let template_state = match TemplateState::try_new(self, + name.clone(), + template_def.clone(), + ) { + Ok(v) => v, + Err(e) => { + return Err(e); + } + }; + + // Store the template state with its name + self.template_state_by_name.insert(name.clone(), template_state); + Ok(self.template_state_by_name.get_mut(name).expect("must exist")) + } + + pub(super) fn create_machine_state_from_template( + &mut self, + name: String, + template_def: config::Template, + ) -> MachineRegistryResult { + + // Get the active template state + let template_state = self.get_or_create_template_state(&name, template_def)?; + if !template_state.is_active() { + return Err(MachineRegistryError::TemplateComplete); + } + + // Make machine def from current template state + let machine_def = config::Machine { + location: template_state.template_def.location.clone(), + address4: template_state.template_def. + address6: todo!(), + disable_capabilities: todo!(), + bootstrap: todo!(), + }; + + } + pub(super) fn get_template_state( + &mut self, + name: &String, + ) -> MachineRegistryResult<&mut TemplateState> { + self + .template_state_by_name + .get_mut(name).ok_or_else(|| MachineRegistryError::TemplateNotFound) + } + + pub(super) fn get_or_create_network_state_from_location( + &mut self, + location_def: &config::Location, + ) -> MachineRegistryResult { + match location_def { + config::Location::Network { network } => { + let name = self.unlocked_inner.srng.weighted_choice(network); + let network_def = self + .unlocked_inner + .config + .networks + .get(name).cloned() + .expect("config validation is broken"); + self.get_or_create_network_state( + name.clone(), + network_def, + ) + } + config::Location::Blueprint { blueprint } => { + let name = self.unlocked_inner.srng.weighted_choice(blueprint); + let blueprint_def = self + .unlocked_inner + .config + .blueprints + .get(name).cloned() + .expect("config validation is broken"); + self.get_or_create_network_state_from_blueprint( + name.clone(), + blueprint_def) + } + } + } + + + pub(super) fn get_blueprint_state( + &mut self, + name: &String, + ) -> MachineRegistryResult<&mut BlueprintState> { + self + .blueprint_state_by_name + .get_mut(name).ok_or_else(|| MachineRegistryError::BlueprintNotFound) + } + + pub(super) fn choose_allocation_v4( + &mut self, + allocation: config::Allocation, + additional_prefix: u8, + ) -> MachineRegistryResult { + // Get allocation subnet candidates + let mut subnet4 = allocation + .subnets + .subnet4 + .clone() + .ok_or(MachineRegistryError::NoAllocation)?; + + loop { + // Pick a compatible subnet from the allocation + let subnet = self.unlocked_inner.srng.weighted_choice(&subnet4); + + // Allocate within the subnet + match self + .address_pool + .add_random_subnet_v4(subnet, additional_prefix) + { + Some(a) => { + // Got a sub-allocation + return Ok(a); + } + None => { + // No sub-allocation left in this subnet, + // remove the subnet so we can choose again + let Some(next_subnet4) = subnet4.filter(|x| x == subnet) else { + // No subnets left + break; + }; + subnet4 = next_subnet4; + } + } + } + + // No available allocations left + Err(MachineRegistryError::NoAllocation) + } + + pub(super) fn choose_allocation_v6( + &mut self, + allocation: config::Allocation, + additional_prefix: u8, + ) -> MachineRegistryResult { + // Get allocation subnet candidates + let mut subnet6 = allocation + .subnets + .subnet6 + .clone() + .ok_or(MachineRegistryError::NoAllocation)?; + + loop { + // Pick a compatible subnet from the allocation + let subnet = self.unlocked_inner.srng.weighted_choice(&subnet6); + + // Allocate within the subnet + match self + .address_pool + .add_random_subnet_v6(subnet, additional_prefix) + { + Some(a) => { + // Got a sub-allocation + return Ok(a); + } + None => { + // No sub-allocation left in this subnet, + // remove the subnet so we can choose again + let Some(next_subnet6) = subnet6.filter(|x| x == subnet) else { + // No subnets left + break; + }; + subnet6 = next_subnet6; + } + } + } + + // No available allocations left + Err(MachineRegistryError::NoAllocation) + } + pub(super) fn get_or_create_network_state_from_blueprint( + &mut self, + name: String, + blueprint_def: config::Blueprint, + ) -> MachineRegistryResult { + + xxx + + self.with_blueprint_state( + name, + blueprint_def, + |blueprint_state| { + // Make network def from current blueprint state + let network_def = config::Network { + model: blueprint_state + .blueprint_def + .model + .as_ref() + .map(|model| self.unlocked_inner.srng.weighted_choice(model).clone()), + ipv4: blueprint_state + .blueprint_def + .ipv4 + .as_ref() + .map(|bpv4| self.unlocked_inner.srng.weighted_choice(bpv4).clone()), + ipv6: blueprint_def + .ipv6 + .as_ref() + .map(|bpv6| self.unlocked_inner.srng.weighted_choice(bpv6).clone()), + }; + + //xxx self. + }, + ) + } + +} diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/mod.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/mod.rs new file mode 100644 index 00000000..4711a5a6 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/mod.rs @@ -0,0 +1,67 @@ +mod address_pool; +mod machine_registry_inner; +mod state; + +use super::*; +use ipnet::*; + +use address_pool::*; +use machine_registry_inner::*; +use state::*; + +#[derive(Debug)] +struct Machine {} + +#[derive(Debug)] +struct MachineRegistryUnlockedInner { + config: config::Config, + srng: StableRng, +} + +#[derive(Debug, Clone)] +pub enum MachineRegistryError { + InvalidMachineId, + InvalidAllocationName, + ProfileNotFound, + ProfileComplete, + TemplateComplete, + BlueprintComplete, + MachineNotFound, + NetworkNotFound, + TemplateNotFound, + BlueprintNotFound, + NoAllocation, +} + +pub type MachineRegistryResult = Result; + +#[derive(Debug, Clone)] +pub struct MachineRegistry { + inner: Arc>, + unlocked_inner: Arc, +} + +impl MachineRegistry { + /////////////////////////////////////////////////////////// + /// Public Interface + pub fn new(config: config::Config) -> Self { + let srng = StableRng::new(config.seed.unwrap_or_default()); + let unlocked_inner = Arc::new(MachineRegistryUnlockedInner { srng, config }); + Self { + inner: Arc::new(Mutex::new(MachineRegistryInner::new( + unlocked_inner.clone(), + ))), + unlocked_inner, + } + } + + pub fn allocate(&self, profile: String) -> MachineRegistryResult { + let mut inner = self.inner.lock(); + inner.allocate(profile) + } + + pub fn release(&self, machine_id: MachineId) -> MachineRegistryResult<()> { + let mut inner = self.inner.lock(); + inner.release(machine_id) + } +} diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/state/blueprint_state.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/state/blueprint_state.rs new file mode 100644 index 00000000..f205b9a0 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/state/blueprint_state.rs @@ -0,0 +1,7 @@ +use super::*; + +#[derive(Debug)] +pub struct BlueprintState { + pub name: String, + pub blueprint_def: config::Blueprint, +} diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/state/machine_state.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/state/machine_state.rs new file mode 100644 index 00000000..118895c5 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/state/machine_state.rs @@ -0,0 +1,154 @@ +use super::*; + +#[derive(Debug)] +pub enum MachineStateName { + Machine(String), + Template(String), +} + +#[derive(Debug)] +pub struct MachineState { + /// The name of this machine state if it was made directly + /// or the name of the template used to create it + pub name: MachineStateName, + /// The definition this machine was created with + pub machine_def: config::Machine, + /// The current network interfaces definition + pub interfaces: Vec, +} + +#[derive(Debug)] +pub struct MachineStateInterface { + /// The network id + pub network_id: NetworkId, + /// The veilid NetworkInterface state + pub network_interface: NetworkInterface, +} + +impl MachineState { + pub fn try_new( + machine_registry_inner: &mut MachineRegistryInner, + name: MachineStateName, + machine_def: config::Machine, + machine_id: MachineId, + ) -> MachineRegistryResult { + // Build list of machinestate interfaces + let mut interfaces = Vec::::new(); + + // Make default route interface + { + // Find existing network or create a new one from network or blueprint definition + let network_id = machine_registry_inner + .get_or_create_network_state_from_location(&machine_def.location)?; + let srng = machine_registry_inner.unlocked_inner.srng.clone(); + let network_state = machine_registry_inner + .get_network_state_by_id(network_id) + .expect("must exist"); + + // Build list of default route interface addresses + let mut addrs = Vec::::new(); + + // Make the default route interface + let machine_location = machine_def.location; + let (allocate_v4, opt_address4, allocate_v6, opt_address6) = match machine_location { + config::MachineLocation::Specific { + network: _, + address4, + address6, + } => ( + network_state.ipv4.is_some() && address4.is_some(), + address4, + network_state.ipv6.is_some() && address6.is_some(), + address6, + ), + config::MachineLocation::Network { network: _ } + | config::MachineLocation::Blueprint { blueprint: _ } => ( + network_state.ipv4.is_some(), + None, + network_state.ipv6.is_some(), + None, + ), + }; + + if allocate_v4 { + let if_addr4 = + match network_state.allocate_address_v4(srng.clone(), machine_id, opt_address4) + { + Ok(v) => v, + Err(e) => { + network_state + .release_all_addresses(addrs.iter().map(|x| x.if_addr.ip())) + .expect("must succeed"); + return Err(e); + } + }; + addrs.push(InterfaceAddress { + if_addr: IfAddr::V4(if_addr4), + flags: AddressFlags { + is_dynamic: false, + is_temporary: false, + is_preferred: true, + }, + }); + } + if allocate_v6 { + let if_addr6 = + match network_state.allocate_address_v6(srng.clone(), machine_id, opt_address6) + { + Ok(v) => v, + Err(e) => { + network_state + .release_all_addresses(addrs.iter().map(|x| x.if_addr.ip())) + .expect("must succeed"); + return Err(e); + } + }; + addrs.push(InterfaceAddress { + if_addr: IfAddr::V6(if_addr6), + flags: AddressFlags { + is_dynamic: false, + is_temporary: false, + is_preferred: true, + }, + }); + } + + // Allocate an address on the network and make an veilid-style interface record for it + let network_interface = NetworkInterface { + name: "vin0".to_owned(), + flags: InterfaceFlags { + is_loopback: false, + is_running: true, + is_point_to_point: false, + has_default_route: true, + }, + addrs, + }; + + interfaces.push(MachineStateInterface { + network_id, + network_interface, + }); + } + + // Create a localhost interface for this machine + Ok(Self { + name, + machine_def, + interfaces, + }) + } + + pub fn release(self, machine_registry_inner: &mut MachineRegistryInner) { + for intf in self.interfaces { + let network_state = machine_registry_inner + .get_network_state_by_id(intf.network_id) + .expect("must exist"); + let addrs = &intf.network_interface.addrs; + + network_state + .release_all_addresses(addrs.iter().map(|x| x.if_addr.ip())) + .expect("must succeed"); + } + } +} diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/state/mod.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/state/mod.rs new file mode 100644 index 00000000..fd25b7a7 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/state/mod.rs @@ -0,0 +1,15 @@ +mod blueprint_state; +mod machine_state; +mod network_state; +mod profile_state; +mod resolves_to; +mod template_state; + +use super::*; + +pub use blueprint_state::*; +pub use machine_state::*; +pub use network_state::*; +pub use profile_state::*; +pub use resolves_to::*; +pub use template_state::*; diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/state/network_state.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/state/network_state.rs new file mode 100644 index 00000000..1c4b2783 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/state/network_state.rs @@ -0,0 +1,306 @@ +use super::*; +use ipnet::*; + +#[derive(Debug)] +pub enum NetworkStateName { + Network(String), + Blueprint(String), +} + +#[derive(Debug)] +pub struct NetworkState { + /// The name of this network state if it was made directly + /// or the name of the blueprint used to create it + pub name: NetworkStateName, + pub network_def: config::Network, + pub model: String, + pub ipv4: Option, + pub ipv6: Option, +} + +#[derive(Debug)] +pub struct NetworkStateIpv4 { + pub allocation: Ipv4Net, + pub gateway: Option, + pub machine_addresses: HashMap, +} + +#[derive(Debug)] +pub struct NetworkStateIpv6 { + pub allocation: Ipv6Net, + pub gateway: Option, + pub machine_addresses: HashMap, +} + +#[derive(Debug)] +pub struct NetworkGatewayState { + pub translation: config::Translation, // xxx replace with translation state + pub upnp: bool, + pub network: Option>, +} + +pub type NetworkId = u64; + +impl NetworkState { + pub fn try_new( + machine_registry_inner: &mut MachineRegistryInner, + name: NetworkStateName, + network_def: config::Network, + network_id: NetworkId, + ) -> MachineRegistryResult { + let model = network_def.model.clone().unwrap_or_else(|| { + machine_registry_inner + .unlocked_inner + .config + .default_model + .clone() + }); + let ipv4 = match network_def.ipv4.as_ref() { + Some(ipv4) => Some(NetworkStateIpv4 { + allocation: machine_registry_inner.choose_allocation_v4( + machine_registry_inner + .unlocked_inner + .config + .allocations + .get(&ipv4.allocation) + .cloned() + .ok_or(MachineRegistryError::InvalidAllocationName)?, + 0, + )?, + gateway: match ipv4.gateway.as_ref() { + Some(v4gw) => Some(NetworkGatewayState { + translation: v4gw.translation, + upnp: v4gw.upnp, + network: v4gw.network.clone().map(|gwname| { + machine_registry_inner + .resolve_to_manager_network + .add(gwname) + }), + }), + None => None, + }, + machine_addresses: HashMap::new(), + }), + None => None, + }; + + let ipv6 = match network_def.ipv6.as_ref() { + Some(ipv6) => Some(NetworkStateIpv6 { + allocation: machine_registry_inner.choose_allocation_v6( + machine_registry_inner + .unlocked_inner + .config + .allocations + .get(&ipv6.allocation) + .cloned() + .ok_or(MachineRegistryError::InvalidAllocationName)?, + 0, + )?, + gateway: match ipv6.gateway.as_ref() { + Some(v6gw) => Some(NetworkGatewayState { + translation: v6gw.translation, + upnp: v6gw.upnp, + network: v6gw.network.clone().map(|gwname| { + machine_registry_inner + .resolve_to_manager_network + .add(gwname) + }), + }), + None => None, + }, + machine_addresses: HashMap::new(), + }), + None => None, + }; + + Ok(Self { + name, + network_def, + model, + ipv4, + ipv6, + }) + } + + pub(super) fn allocate_address_v4( + &mut self, + srng: StableRng, + machine_id: MachineId, + opt_address: Option, + ) -> MachineRegistryResult { + let Some(network_state_ipv4) = &mut self.ipv4 else { + return Err(MachineRegistryError::NoAllocation); + }; + + // for now we just pick randomly and then increment until we find a free allocation + // not enough addresses in any address space are allocated to warrant a more efficient algorithm + + let hosts_range = network_state_ipv4.allocation.hosts(); + let Some(first_host) = std::iter::Iterator::min(hosts_range) else { + return Err(MachineRegistryError::NoAllocation); + }; + let Some(last_host) = std::iter::Iterator::max(hosts_range) else { + return Err(MachineRegistryError::NoAllocation); + }; + let first_host_bits = first_host.to_bits(); + let last_host_bits = last_host.to_bits(); + + // Check if a specific address is required + let ip = if let Some(ip_addr) = opt_address { + // Specific address required + let addr_bits = ip_addr.to_bits(); + if addr_bits < first_host_bits || addr_bits > last_host_bits { + return Err(MachineRegistryError::NoAllocation); + } + if network_state_ipv4.machine_addresses.contains_key(&ip_addr) { + return Err(MachineRegistryError::NoAllocation); + } + ip_addr + } else { + // Any address will do + let addr_end = srng.next_u32(first_host_bits, last_host_bits); + + // Find a free address starting from here + let mut addr = addr_end; + loop { + let ip_addr = Ipv4Addr::from(addr); + if network_state_ipv4.machine_addresses.contains_key(&ip_addr) { + addr += 1; + if addr > last_host_bits { + addr = first_host_bits; + } + if addr == addr_end { + return Err(MachineRegistryError::NoAllocation); + } + } else { + break ip_addr; + } + } + }; + + // Store the address + network_state_ipv4.machine_addresses.insert(ip, machine_id); + + // Make interface address + let ifaddr = Ifv4Addr { + ip, + netmask: network_state_ipv4.allocation.netmask(), + broadcast: Some(network_state_ipv4.allocation.broadcast()), + }; + + Ok(ifaddr) + } + + pub(super) fn release_address_v4(&mut self, addr: Ipv4Addr) -> MachineRegistryResult<()> { + if let Some(ipv4) = self.ipv4.as_mut() { + if ipv4.machine_addresses.remove(&addr).is_some() { + return Ok(()); + } + } + Err(MachineRegistryError::NoAllocation) + } + + pub(super) fn release_address_v6(&mut self, addr: Ipv6Addr) -> MachineRegistryResult<()> { + if let Some(ipv6) = self.ipv6.as_mut() { + if ipv6.machine_addresses.remove(&addr).is_some() { + return Ok(()); + } + } + Err(MachineRegistryError::NoAllocation) + } + + pub(super) fn release_all_addresses>( + &mut self, + addrs: I, + ) -> MachineRegistryResult<()> { + let mut ok = true; + for addr in addrs { + match addr { + IpAddr::V4(ipv4_addr) => { + if self.release_address_v4(ipv4_addr).is_err() { + ok = false; + } + } + IpAddr::V6(ipv6_addr) => { + if self.release_address_v6(ipv6_addr).is_err() { + ok = false; + } + } + } + } + if ok { + Ok(()) + } else { + Err(MachineRegistryError::NoAllocation) + } + } + + pub(super) fn allocate_address_v6( + &mut self, + srng: StableRng, + machine_id: MachineId, + opt_address: Option, + ) -> MachineRegistryResult { + let Some(network_state_ipv6) = &mut self.ipv6 else { + return Err(MachineRegistryError::NoAllocation); + }; + + // for now we just pick randomly and then increment until we find a free allocation + // not enough addresses in any address space are allocated to warrant a more efficient algorithm + + let hosts_range = network_state_ipv6.allocation.hosts(); + let Some(first_host) = std::iter::Iterator::min(hosts_range) else { + return Err(MachineRegistryError::NoAllocation); + }; + let Some(last_host) = std::iter::Iterator::max(hosts_range) else { + return Err(MachineRegistryError::NoAllocation); + }; + let first_host_bits = first_host.to_bits(); + let last_host_bits = last_host.to_bits(); + + // Check if a specific address is required + let ip = if let Some(ip_addr) = opt_address { + // Specific address required + let addr_bits = ip_addr.to_bits(); + if addr_bits < first_host_bits || addr_bits > last_host_bits { + return Err(MachineRegistryError::NoAllocation); + } + if network_state_ipv6.machine_addresses.contains_key(&ip_addr) { + return Err(MachineRegistryError::NoAllocation); + } + ip_addr + } else { + // Any address will do + let addr_end = srng.next_u128(first_host_bits, last_host_bits); + + // Find a free address starting from here + let mut addr = addr_end; + loop { + let ip_addr = Ipv6Addr::from(addr); + if network_state_ipv6.machine_addresses.contains_key(&ip_addr) { + addr += 1; + if addr > last_host_bits { + addr = first_host_bits; + } + if addr == addr_end { + return Err(MachineRegistryError::NoAllocation); + } + } else { + break ip_addr; + } + } + }; + + // Store the address + network_state_ipv6.machine_addresses.insert(ip, machine_id); + + // Make interface address + let ifaddr = Ifv6Addr { + ip, + netmask: network_state_ipv6.allocation.netmask(), + broadcast: Some(network_state_ipv6.allocation.broadcast()), + }; + + Ok(ifaddr) + } +} diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/state/profile_state.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/state/profile_state.rs new file mode 100644 index 00000000..67fedd20 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/state/profile_state.rs @@ -0,0 +1,4 @@ +#[derive(Debug, Default)] +pub struct ProfileState { + pub next_instance_index: usize, +} diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/state/resolves_to.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/state/resolves_to.rs new file mode 100644 index 00000000..334363e9 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/state/resolves_to.rs @@ -0,0 +1,72 @@ +use super::*; + +#[derive(Debug)] +pub enum ResolveToError { + MissingSymbol, + AlreadyResolved, +} + +pub type ResolveToResult = Result; + +#[derive(Clone, Debug)] +pub struct ResolvesTo +where + I: Clone + fmt::Debug, +{ + value: Arc>>, +} + +impl ResolvesTo +where + I: Clone + fmt::Debug, +{ + pub fn get(&self) -> Option { + self.value.lock().clone() + } +} + +#[derive(Debug)] +pub struct ResolveToManager +where + T: PartialEq + Eq + PartialOrd + Ord + fmt::Debug, + I: Clone + fmt::Debug, +{ + symbols: BTreeMap, Arc>>>, +} + +impl ResolveToManager +where + T: PartialEq + Eq + PartialOrd + Ord + fmt::Debug, + I: Clone + fmt::Debug, +{ + pub fn new() -> Self { + Self { + symbols: BTreeMap::new(), + } + } + + pub fn add(&mut self, symbol: T) -> ResolvesTo { + let symbol = Arc::new(symbol); + let value = self + .symbols + .entry(symbol.clone()) + .or_insert_with(|| Arc::new(Mutex::new(None))) + .clone(); + + ResolvesTo { value } + } + + pub fn resolve(&mut self, symbol: &T, value: I) -> ResolveToResult<()> { + match self.symbols.get_mut(symbol) { + Some(s) => { + let mut inner = s.lock(); + if inner.is_some() { + return Err(ResolveToError::AlreadyResolved); + } + *inner = Some(value); + Ok(()) + } + None => Err(ResolveToError::MissingSymbol), + } + } +} diff --git a/veilid-tools/src/virtual_network/router_server/machine_registry/state/template_state.rs b/veilid-tools/src/virtual_network/router_server/machine_registry/state/template_state.rs new file mode 100644 index 00000000..d875e693 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/machine_registry/state/template_state.rs @@ -0,0 +1,33 @@ +use super::*; + +#[derive(Debug)] +pub struct TemplateState { + pub name: String, + pub template_def: config::Template, + pub limit_machine_count: u32, + pub machines: HashSet, +} + +impl TemplateState { + pub fn try_new( + machine_registry_inner: &mut MachineRegistryInner, + name: String, + template_def: config::Template, + ) -> MachineRegistryResult { + let limit_machine_count = *machine_registry_inner + .unlocked_inner + .srng + .weighted_choice(&template_def.limits.machine_count); + + Ok(Self { + name, + template_def, + limit_machine_count, + machines: HashSet::new(), + }) + } + + pub fn is_active(&self) -> bool { + self.machines.len() < self.limit_machine_count as usize + } +} diff --git a/veilid-tools/src/virtual_network/router_server/mod.rs b/veilid-tools/src/virtual_network/router_server/mod.rs index 2916ba35..2b4a26ad 100644 --- a/veilid-tools/src/virtual_network/router_server/mod.rs +++ b/veilid-tools/src/virtual_network/router_server/mod.rs @@ -1,11 +1,13 @@ pub mod config; mod machine_registry; mod server_processor; +mod stable_rng; use super::*; use machine_registry::*; use server_processor::*; +use stable_rng::*; use async_tungstenite::accept_async; use futures_codec::{Bytes, BytesCodec, FramedRead, FramedWrite}; diff --git a/veilid-tools/src/virtual_network/router_server/predefined_config.yml b/veilid-tools/src/virtual_network/router_server/predefined_config.yml index 3deb0b9c..4230ae03 100644 --- a/veilid-tools/src/virtual_network/router_server/predefined_config.yml +++ b/veilid-tools/src/virtual_network/router_server/predefined_config.yml @@ -11,7 +11,7 @@ seed: 0 default_network: "$internet" # The name of the predefined performance model to use by default (typically -# this is '$') +# this is '$lan') default_model: "$lan" ################################################################# diff --git a/veilid-tools/src/virtual_network/router_server/stable_rng.rs b/veilid-tools/src/virtual_network/router_server/stable_rng.rs new file mode 100644 index 00000000..a05f37e7 --- /dev/null +++ b/veilid-tools/src/virtual_network/router_server/stable_rng.rs @@ -0,0 +1,85 @@ +use super::*; + +use rand::{seq::SliceRandom, Rng, SeedableRng}; +use rand_chacha::ChaCha20Rng; + +struct StableRngInner { + srng: ChaCha20Rng, + count: usize, +} + +impl fmt::Debug for StableRngInner { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("StableRngInner") + .field("count", &self.count) + .finish() + } +} + +#[derive(Clone, Debug)] +pub struct StableRng { + inner: Arc>, +} + +impl StableRng { + //////////////////////////////////////////////////////// + // Public Interface + + pub fn new(seed: u64) -> Self { + Self { + inner: Arc::new(Mutex::new(StableRngInner { + srng: ChaCha20Rng::seed_from_u64(seed), + count: 0, + })), + } + } + pub fn weighted_choice<'a, T: fmt::Debug + Clone>( + &self, + weighted_list: &'a config::WeightedList, + ) -> &'a T { + match weighted_list { + config::WeightedList::Single(x) => x, + config::WeightedList::List(vec) => { + let total_weight = vec + .iter() + .map(|x| x.weight()) + .reduce(|acc, x| acc + x) + .expect("config validation broken"); + + let r = self.next_f32(0.0, total_weight); + let mut current_weight = 0.0f32; + for x in vec { + current_weight += x.weight(); + if r < current_weight { + return x.item(); + } + } + // Catch f32 imprecision + vec.last().expect("config validation broken").item() + } + } + } + pub fn shuffle_vec(&self, v: &mut Vec) { + let mut inner = self.inner.lock(); + inner.count += 1; + v.shuffle(&mut inner.srng); + } + + pub fn next_u32(&self, min: u32, max: u32) -> u32 { + let mut inner = self.inner.lock(); + inner.count += 1; + inner.srng.gen_range(min..=max) + } + + pub fn next_u128(&self, min: u128, max: u128) -> u128 { + let mut inner = self.inner.lock(); + inner.count += 1; + inner.srng.gen_range(min..=max) + } + + pub fn next_f32(&self, min: f32, max: f32) -> f32 { + let mut inner = self.inner.lock(); + inner.count += 1; + inner.srng.gen_range(min..=max) + } +}