Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-10-01 01:26:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

testing cleanup

Browse Source
This commit is contained in:
Christien Rioux 2024-03-17 18:48:56 -04:00
parent 479f1f4b18
commit 37dbbc39fd
13 changed files with 198 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

320
Cargo.lock generated
View File

@ -52,9 +52,9 @@ dependencies = [
[[package]] [[package]]
name = "ahash" name = "ahash"
version = "0.8.10" version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"getrandom", "getrandom",
@ -206,9 +206,9 @@ dependencies = [
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.80" version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
[[package]] [[package]]
name = "arboard" name = "arboard"
@ -309,7 +309,7 @@ dependencies = [
"async-task", "async-task",
"concurrent-queue", "concurrent-queue",
"fastrand 2.0.1", "fastrand 2.0.1",
"futures-lite 2.2.0", "futures-lite 2.3.0",
"slab", "slab",
] ]
@ -321,10 +321,10 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
dependencies = [ dependencies = [
"async-channel 2.2.0", "async-channel 2.2.0",
"async-executor", "async-executor",
"async-io 2.3.1", "async-io 2.3.2",
"async-lock 3.3.0", "async-lock 3.3.0",
"blocking", "blocking",
"futures-lite 2.2.0", "futures-lite 2.3.0",
"once_cell", "once_cell",
] ]
@ -350,15 +350,15 @@ dependencies = [
[[package]] [[package]]
name = "async-io" name = "async-io"
version = "2.3.1" version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
dependencies = [ dependencies = [
"async-lock 3.3.0", "async-lock 3.3.0",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"concurrent-queue", "concurrent-queue",
"futures-io", "futures-io",
"futures-lite 2.2.0", "futures-lite 2.3.0",
"parking", "parking",
"polling 3.5.0", "polling 3.5.0",
"rustix 0.38.31", "rustix 0.38.31",
@ -410,7 +410,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
dependencies = [ dependencies = [
"async-io 2.3.1", "async-io 2.3.2",
"async-lock 2.8.0", "async-lock 2.8.0",
"atomic-waker", "atomic-waker",
"cfg-if 1.0.0", "cfg-if 1.0.0",
@ -452,17 +452,17 @@ dependencies = [
[[package]] [[package]]
name = "async-std-resolver" name = "async-std-resolver"
version = "0.23.2" version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0928198152da571a19145031360f34fc7569ef2dc387681565f330c811a5ba9b" checksum = "3c0ed2b6671c13d2c28756c5a64e04759c1e0b5d3d7ac031f521c3561e21fbcb"
dependencies = [ dependencies = [
"async-std", "async-std",
"async-trait", "async-trait",
"futures-io", "futures-io",
"futures-util", "futures-util",
"hickory-resolver",
"pin-utils", "pin-utils",
"socket2 0.5.6", "socket2 0.5.6",
"trust-dns-resolver",
] ]
[[package]] [[package]]
@ -484,7 +484,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -495,13 +495,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.77" version = "0.1.78"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -713,9 +713,9 @@ dependencies = [
[[package]] [[package]]
name = "blake3" name = "blake3"
version = "1.5.0" version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"arrayvec", "arrayvec",
@ -732,7 +732,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -786,7 +786,7 @@ dependencies = [
"async-task", "async-task",
"fastrand 2.0.1", "fastrand 2.0.1",
"futures-io", "futures-io",
"futures-lite 2.2.0", "futures-lite 2.3.0",
"piper", "piper",
"tracing", "tracing",
] ]
@ -802,15 +802,15 @@ dependencies = [
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.15.3" version = "3.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
[[package]] [[package]]
name = "bytemuck" name = "bytemuck"
version = "1.14.3" version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
[[package]] [[package]]
name = "byteorder" name = "byteorder"
@ -844,9 +844,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.88" version = "1.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
[[package]] [[package]]
name = "cesu8" name = "cesu8"
@ -907,9 +907,9 @@ dependencies = [
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.34" version = "0.4.35"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
dependencies = [ dependencies = [
"android-tzdata", "android-tzdata",
"iana-time-zone", "iana-time-zone",
@ -967,9 +967,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.1" version = "4.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@ -977,9 +977,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.1" version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@ -990,14 +990,14 @@ dependencies = [
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "4.5.0" version = "4.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
dependencies = [ dependencies = [
"heck", "heck 0.5.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -1008,9 +1008,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
[[package]] [[package]]
name = "clipboard-win" name = "clipboard-win"
version = "5.2.0" version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee"
dependencies = [ dependencies = [
"error-code", "error-code",
] ]
@ -1026,9 +1026,9 @@ dependencies = [
[[package]] [[package]]
name = "color-eyre" name = "color-eyre"
version = "0.6.2" version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"eyre", "eyre",
@ -1103,7 +1103,7 @@ dependencies = [
"rust-ini 0.19.0", "rust-ini 0.19.0",
"serde", "serde",
"serde_json", "serde_json",
"toml 0.8.10", "toml 0.8.11",
"yaml-rust", "yaml-rust",
] ]
@ -1175,9 +1175,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
[[package]] [[package]]
name = "const-random" name = "const-random"
version = "0.1.17" version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
dependencies = [ dependencies = [
"const-random-macro", "const-random-macro",
] ]
@ -1360,16 +1360,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
name = "ctrlc" name = "ctrlc"
version = "3.4.2" version = "3.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
dependencies = [ dependencies = [
"nix 0.27.1", "nix 0.28.0",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -1378,7 +1378,7 @@ name = "cursive"
version = "0.20.0" version = "0.20.0"
source = "git+https://gitlab.com/veilid/cursive.git#b518d61e61d75a70788b0f7f371cd846f1bef0eb" source = "git+https://gitlab.com/veilid/cursive.git#b518d61e61d75a70788b0f7f371cd846f1bef0eb"
dependencies = [ dependencies = [
"ahash 0.8.10", "ahash 0.8.11",
"async-std", "async-std",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"crossbeam-channel", "crossbeam-channel",
@ -1419,7 +1419,7 @@ name = "cursive_core"
version = "0.3.7" version = "0.3.7"
source = "git+https://gitlab.com/veilid/cursive.git#b518d61e61d75a70788b0f7f371cd846f1bef0eb" source = "git+https://gitlab.com/veilid/cursive.git#b518d61e61d75a70788b0f7f371cd846f1bef0eb"
dependencies = [ dependencies = [
"ahash 0.8.10", "ahash 0.8.11",
"ansi-parser", "ansi-parser",
"async-std", "async-std",
"crossbeam-channel", "crossbeam-channel",
@ -1435,7 +1435,7 @@ dependencies = [
"serde_yaml", "serde_yaml",
"time", "time",
"tokio", "tokio",
"toml 0.8.10", "toml 0.8.11",
"unicode-segmentation", "unicode-segmentation",
"unicode-width", "unicode-width",
"xi-unicode", "xi-unicode",
@ -1474,7 +1474,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -1530,7 +1530,7 @@ dependencies = [
"ident_case", "ident_case",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -1552,7 +1552,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
dependencies = [ dependencies = [
"darling_core 0.20.8", "darling_core 0.20.8",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -1716,10 +1716,10 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
dependencies = [ dependencies = [
"heck", "heck 0.4.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -1739,7 +1739,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -1782,7 +1782,7 @@ dependencies = [
"darling 0.20.8", "darling 0.20.8",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -2033,7 +2033,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -2126,9 +2126,9 @@ dependencies = [
[[package]] [[package]]
name = "futures-lite" name = "futures-lite"
version = "2.2.0" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [ dependencies = [
"fastrand 2.0.1", "fastrand 2.0.1",
"futures-core", "futures-core",
@ -2145,7 +2145,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -2328,9 +2328,9 @@ dependencies = [
[[package]] [[package]]
name = "h2" name = "h2"
version = "0.3.24" version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -2375,7 +2375,7 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
dependencies = [ dependencies = [
"ahash 0.8.10", "ahash 0.8.11",
] ]
[[package]] [[package]]
@ -2384,7 +2384,7 @@ version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
dependencies = [ dependencies = [
"ahash 0.8.10", "ahash 0.8.11",
"allocator-api2", "allocator-api2",
] ]
@ -2428,6 +2428,12 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.1.19" version = "0.1.19"
@ -2536,9 +2542,9 @@ dependencies = [
[[package]] [[package]]
name = "http" name = "http"
version = "0.2.11" version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -2825,9 +2831,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.68" version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
dependencies = [ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
@ -2964,9 +2970,9 @@ dependencies = [
[[package]] [[package]]
name = "libloading" name = "libloading"
version = "0.8.2" version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2caa5afb8bf9f3a2652760ce7d4f62d21c4d5a423e68466fca30df82f2330164" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"windows-targets 0.52.4", "windows-targets 0.52.4",
@ -3848,7 +3854,7 @@ dependencies = [
"pest_meta", "pest_meta",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -3874,22 +3880,22 @@ dependencies = [
[[package]] [[package]]
name = "pin-project" name = "pin-project"
version = "1.1.4" version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
dependencies = [ dependencies = [
"pin-project-internal", "pin-project-internal",
] ]
[[package]] [[package]]
name = "pin-project-internal" name = "pin-project-internal"
version = "1.1.4" version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -4024,9 +4030,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.78" version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -4074,7 +4080,7 @@ dependencies = [
"itertools 0.11.0", "itertools 0.11.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -4139,9 +4145,9 @@ dependencies = [
[[package]] [[package]]
name = "range-set-blaze" name = "range-set-blaze"
version = "0.1.15" version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "551bc88f4bf63828b34bf2b3ab65037d4095aea6aa7e69b32b5f0928a2f18ec6" checksum = "8421b5d459262eabbe49048d362897ff3e3830b44eac6cfe341d6acb2f0f13d2"
dependencies = [ dependencies = [
"gen_ops", "gen_ops",
"itertools 0.12.1", "itertools 0.12.1",
@ -4212,7 +4218,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
"regex-automata 0.4.5", "regex-automata 0.4.6",
"regex-syntax 0.8.2", "regex-syntax 0.8.2",
] ]
@ -4227,9 +4233,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-automata" name = "regex-automata"
version = "0.4.5" version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -4663,7 +4669,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -4685,7 +4691,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -4707,7 +4713,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -4721,9 +4727,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_yaml" name = "serde_yaml"
version = "0.9.32" version = "0.9.33"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9"
dependencies = [ dependencies = [
"indexmap 2.2.5", "indexmap 2.2.5",
"itoa", "itoa",
@ -4754,7 +4760,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -4872,9 +4878,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
[[package]] [[package]]
name = "simplelog" name = "simplelog"
version = "0.12.1" version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
dependencies = [ dependencies = [
"log", "log",
"termcolor", "termcolor",
@ -5006,9 +5012,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.52" version = "2.0.53"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -5023,9 +5029,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
[[package]] [[package]]
name = "sysinfo" name = "sysinfo"
version = "0.30.6" version = "0.30.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6746919caf9f2a85bff759535664c060109f21975c5ac2e8652e60102bd4d196" checksum = "0c385888ef380a852a16209afc8cfad22795dd8873d69c9a14d2e2088f118d18"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"core-foundation-sys", "core-foundation-sys",
@ -5038,9 +5044,9 @@ dependencies = [
[[package]] [[package]]
name = "termcolor" name = "termcolor"
version = "1.1.3" version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
dependencies = [ dependencies = [
"winapi-util", "winapi-util",
] ]
@ -5076,22 +5082,22 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.57" version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.57" version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -5210,14 +5216,14 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
name = "tokio-stream" name = "tokio-stream"
version = "0.1.14" version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"pin-project-lite", "pin-project-lite",
@ -5250,14 +5256,14 @@ dependencies = [
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.8.10" version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e"
dependencies = [ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"toml_edit 0.22.6", "toml_edit 0.22.7",
] ]
[[package]] [[package]]
@ -5282,9 +5288,9 @@ dependencies = [
[[package]] [[package]]
name = "toml_edit" name = "toml_edit"
version = "0.22.6" version = "0.22.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992"
dependencies = [ dependencies = [
"indexmap 2.2.5", "indexmap 2.2.5",
"serde", "serde",
@ -5412,7 +5418,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -5539,50 +5545,6 @@ dependencies = [
"stable_deref_trait", "stable_deref_trait",
] ]
[[package]]
name = "trust-dns-proto"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374"
dependencies = [
"async-trait",
"cfg-if 1.0.0",
"data-encoding",
"enum-as-inner",
"futures-channel",
"futures-io",
"futures-util",
"idna 0.4.0",
"ipnet",
"once_cell",
"rand",
"smallvec",
"thiserror",
"tinyvec",
"tracing",
"url",
]
[[package]]
name = "trust-dns-resolver"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6"
dependencies = [
"cfg-if 1.0.0",
"futures-util",
"ipconfig",
"lru-cache",
"once_cell",
"parking_lot 0.12.1",
"rand",
"resolv-conf",
"smallvec",
"thiserror",
"tracing",
"trust-dns-proto",
]
[[package]] [[package]]
name = "try-lock" name = "try-lock"
version = "0.2.5" version = "0.2.5"
@ -5612,7 +5574,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde_derive_internals 0.28.0", "serde_derive_internals 0.28.0",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -5697,9 +5659,9 @@ dependencies = [
[[package]] [[package]]
name = "unsafe-libyaml" name = "unsafe-libyaml"
version = "0.2.10" version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
@ -5744,9 +5706,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]] [[package]]
name = "value-bag" name = "value-bag"
version = "1.7.0" version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "126e423afe2dd9ac52142e7e9d5ce4135d7e13776c529d27fd6bc49f19e3280b" checksum = "8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d"
[[package]] [[package]]
name = "vcpkg" name = "vcpkg"
@ -5805,7 +5767,7 @@ dependencies = [
"async-tungstenite", "async-tungstenite",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"chrono", "chrono",
"clap 4.5.1", "clap 4.5.3",
"config 0.14.0", "config 0.14.0",
"console", "console",
"crossbeam-channel", "crossbeam-channel",
@ -6005,7 +5967,7 @@ dependencies = [
"async-std", "async-std",
"backtrace", "backtrace",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"clap 4.5.1", "clap 4.5.3",
"color-eyre", "color-eyre",
"config 0.14.0", "config 0.14.0",
"console-subscriber", "console-subscriber",
@ -6193,15 +6155,15 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
[[package]] [[package]]
name = "wasm-bindgen-futures" name = "wasm-bindgen-futures"
version = "0.4.41" version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"js-sys", "js-sys",
@ -6227,7 +6189,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -6240,9 +6202,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
[[package]] [[package]]
name = "wasm-bindgen-test" name = "wasm-bindgen-test"
version = "0.3.41" version = "0.3.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "143ddeb4f833e2ed0d252e618986e18bfc7b0e52f2d28d77d05b2f045dd8eb61" checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
dependencies = [ dependencies = [
"console_error_panic_hook", "console_error_panic_hook",
"js-sys", "js-sys",
@ -6254,13 +6216,13 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-test-macro" name = "wasm-bindgen-test-macro"
version = "0.3.41" version = "0.3.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89" checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -6282,9 +6244,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.68" version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
dependencies = [ dependencies = [
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",
@ -6808,7 +6770,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]
@ -6828,7 +6790,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.52", "syn 2.0.53",
] ]
[[package]] [[package]]

2
veilid-core/Cargo.toml
View File

@ -120,7 +120,7 @@ chacha20 = "0.9.1"
argon2 = "0.5.2" argon2 = "0.5.2"
# Network # Network
async-std-resolver = { version = "0.23.2", optional = true } async-std-resolver = { version = "0.24.0", optional = true }
hickory-resolver = { version = "0.24.0", optional = true } hickory-resolver = { version = "0.24.0", optional = true }
# Serialization # Serialization

2
veilid-core/src/network_manager/native/protocol/sockets.rs
View File

@ -4,7 +4,7 @@ use std::io;
cfg_if! { cfg_if! {
if #[cfg(feature="rt-async-std")] { if #[cfg(feature="rt-async-std")] {
pub use async_std::net::{TcpStream, TcpListener, Shutdown, UdpSocket}; pub use async_std::net::{TcpStream, TcpListener, UdpSocket};
} else if #[cfg(feature="rt-tokio")] { } else if #[cfg(feature="rt-tokio")] {
pub use tokio::net::{TcpStream, TcpListener, UdpSocket}; pub use tokio::net::{TcpStream, TcpListener, UdpSocket};
pub use tokio_util::compat::*; pub use tokio_util::compat::*;

4
veilid-core/src/routing_table/bucket_entry.rs
View File

@ -932,10 +932,10 @@ impl Drop for BucketEntry {
if self.ref_count.load(Ordering::Acquire) != 0 { if self.ref_count.load(Ordering::Acquire) != 0 {
#[cfg(feature = "tracking")] #[cfg(feature = "tracking")]
{ {
println!("NodeRef Tracking"); info!("NodeRef Tracking");
for (id, bt) in &mut self.node_ref_tracks { for (id, bt) in &mut self.node_ref_tracks {
bt.resolve(); bt.resolve();
println!("Id: {}\n----------------\n{:#?}", id, bt); info!("Id: {}\n----------------\n{:#?}", id, bt);
} }
} }

6
veilid-core/src/routing_table/route_spec_store/mod.rs
View File

@ -1001,7 +1001,7 @@ impl RouteSpecStore {
first_hop.set_sequencing(sequencing); first_hop.set_sequencing(sequencing);
// Return the compiled safety route // Return the compiled safety route
//println!("compile_safety_route profile (stub): {} us", (get_timestamp() - profile_start_ts)); //info!("compile_safety_route profile (stub): {} us", (get_timestamp() - profile_start_ts));
return Ok(CompiledRoute { return Ok(CompiledRoute {
safety_route: SafetyRoute::new_stub( safety_route: SafetyRoute::new_stub(
routing_table.node_id(crypto_kind), routing_table.node_id(crypto_kind),
@ -1073,7 +1073,7 @@ impl RouteSpecStore {
first_hop, first_hop,
}; };
// Return compiled route // Return compiled route
//println!("compile_safety_route profile (cached): {} us", (get_timestamp() - profile_start_ts)); //info!("compile_safety_route profile (cached): {} us", (get_timestamp() - profile_start_ts));
return Ok(compiled_route); return Ok(compiled_route);
} }
} }
@ -1192,7 +1192,7 @@ impl RouteSpecStore {
}; };
// Return compiled route // Return compiled route
//println!("compile_safety_route profile (uncached): {} us", (get_timestamp() - profile_start_ts)); //info!("compile_safety_route profile (uncached): {} us", (get_timestamp() - profile_start_ts));
Ok(compiled_route) Ok(compiled_route)
} }

2
veilid-core/src/tests/android/mod.rs
View File

@ -20,7 +20,7 @@ pub extern "system" fn Java_com_veilid_veilid_1core_1android_1tests_MainActivity
pub fn veilid_core_setup_android_tests(env: JNIEnv, ctx: JObject) { pub fn veilid_core_setup_android_tests(env: JNIEnv, ctx: JObject) {
// Set up subscriber and layers // Set up subscriber and layers
let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Trace, None); let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Info, None);
let layer = paranoid_android::layer("veilid-core"); let layer = paranoid_android::layer("veilid-core");
tracing_subscriber::registry() tracing_subscriber::registry()
.with(layer.with_filter(filter)) .with(layer.with_filter(filter))

2
veilid-core/src/tests/common/test_veilid_config.rs
View File

@ -155,7 +155,7 @@ cfg_if! {
} }
fn update_callback(_update: VeilidUpdate) { fn update_callback(_update: VeilidUpdate) {
// println!("update_callback: {:?}", update); // info!("update_callback: {:?}", update);
} }
pub fn setup_veilid_core() -> (UpdateCallback, ConfigCallback) { pub fn setup_veilid_core() -> (UpdateCallback, ConfigCallback) {

2
veilid-core/src/tests/ios/mod.rs
View File

@ -16,7 +16,7 @@ pub extern "C" fn run_veilid_core_tests() {
pub fn veilid_core_setup_ios_tests() { pub fn veilid_core_setup_ios_tests() {
// Set up subscriber and layers // Set up subscriber and layers
let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Trace, None); let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Info, None);
tracing_subscriber::registry() tracing_subscriber::registry()
.with(OsLogger::new("com.veilid.veilidcore-tests", "").with_filter(filter)) .with(OsLogger::new("com.veilid.veilidcore-tests", "").with_filter(filter))
.init(); .init();

4
veilid-core/src/tests/native/mod.rs
View File

@ -96,8 +96,8 @@ cfg_if! {
pub fn setup() { pub fn setup() {
SETUP_ONCE.call_once(|| { SETUP_ONCE.call_once(|| {
use tracing_subscriber::{EnvFilter, filter::LevelFilter, fmt, prelude::*}; use tracing_subscriber::{EnvFilter, fmt, prelude::*};
let mut env_filter = EnvFilter::builder().with_default_directive(LevelFilter::INFO.into()).from_env_lossy(); let mut env_filter = EnvFilter::builder().from_env_lossy();
for ig in DEFAULT_LOG_IGNORE_LIST { for ig in DEFAULT_LOG_IGNORE_LIST {
env_filter = env_filter.add_directive(format!("{}=off", ig).parse().unwrap()); env_filter = env_filter.add_directive(format!("{}=off", ig).parse().unwrap());
} }

4
veilid-tools/Cargo.toml
View File

@ -40,7 +40,9 @@ tracing = { version = "0.1.40", features = [
"log", "log",
"attributes", "attributes",
], optional = true } ], optional = true }
tracing-subscriber = { version = "0.3.18", optional = true } tracing-subscriber = { version = "0.3.18", features = [
"env-filter",
], optional = true }
log = { version = "0.4.20" } log = { version = "0.4.20" }
eyre = "0.6.11" eyre = "0.6.11"
static_assertions = "1.1.0" static_assertions = "1.1.0"

4
veilid-tools/src/network_interfaces/netlink.rs
View File

@ -91,7 +91,7 @@ impl PlatformSupportNetlink {
.execute(); .execute();
while let Some(routev4) = routesv4.try_next().await.unwrap_or_default() { while let Some(routev4) = routesv4.try_next().await.unwrap_or_default() {
if let Some(index) = routev4.output_interface() { if let Some(index) = routev4.output_interface() {
//println!("*** ipv4 route: {:#?}", routev4); //info!("*** ipv4 route: {:#?}", routev4);
if routev4.header.destination_prefix_length == 0 { if routev4.header.destination_prefix_length == 0 {
self.default_route_interfaces.insert(index); self.default_route_interfaces.insert(index);
} }
@ -106,7 +106,7 @@ impl PlatformSupportNetlink {
.execute(); .execute();
while let Some(routev6) = routesv6.try_next().await.unwrap_or_default() { while let Some(routev6) = routesv6.try_next().await.unwrap_or_default() {
if let Some(index) = routev6.output_interface() { if let Some(index) = routev6.output_interface() {
//println!("*** ipv6 route: {:#?}", routev6); //info!("*** ipv6 route: {:#?}", routev6);
if routev6.header.destination_prefix_length == 0 { if routev6.header.destination_prefix_length == 0 {
self.default_route_interfaces.insert(index); self.default_route_interfaces.insert(index);
} }

12
veilid-tools/src/tests/native/mod.rs
View File

@ -53,23 +53,25 @@ cfg_if! {
cfg_if! { cfg_if! {
if #[cfg(feature = "tracing")] { if #[cfg(feature = "tracing")] {
use tracing_subscriber::{filter, fmt, prelude::*}; use tracing_subscriber::{EnvFilter, fmt, prelude::*};
let mut filters = filter::Targets::new().with_default(filter::LevelFilter::TRACE); let mut env_filter = EnvFilter::builder().from_env_lossy();
for ig in DEFAULT_LOG_IGNORE_LIST { for ig in DEFAULT_LOG_IGNORE_LIST {
filters = filters.with_target(ig, filter::LevelFilter::OFF); env_filter = env_filter.add_directive(format!("{}=off", ig).parse().unwrap());
} }
let fmt_layer = fmt::layer(); let fmt_layer = fmt::layer();
tracing_subscriber::registry() tracing_subscriber::registry()
.with(fmt_layer) .with(fmt_layer)
.with(filters) .with(env_filter)
.init(); .init();
} else { } else {
use simplelog::*; use simplelog::*;
if let Ok(level_filter) = LevelFilter::from_str(&std::env::var("RUST_LOG").unwrap_or_default()) {
let mut cb = ConfigBuilder::new(); let mut cb = ConfigBuilder::new();
for ig in DEFAULT_LOG_IGNORE_LIST { for ig in DEFAULT_LOG_IGNORE_LIST {
cb.add_filter_ignore_str(ig); cb.add_filter_ignore_str(ig);
} }
TestLogger::init(LevelFilter::Trace, cb.build()).unwrap(); TestLogger::init(level_filter, cb.build()).unwrap();
}
} }
} }

60
veilid-tools/src/tests/native/test_assembly_buffer.rs
View File

@ -84,7 +84,7 @@ pub async fn test_one_frag_out_in() {
let mut all_sent = HashSet::new(); let mut all_sent = HashSet::new();
// Sending // Sending
println!("sending"); info!("sending");
for _ in 0..10000 { for _ in 0..10000 {
let random_len = (get_random_u32() % 1000) as usize + FRAGMENT_LEN; let random_len = (get_random_u32() % 1000) as usize + FRAGMENT_LEN;
let mut message = vec![1u8; random_len]; let mut message = vec![1u8; random_len];
@ -101,14 +101,14 @@ pub async fn test_one_frag_out_in() {
)); ));
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
println!("fragments sent = {}", net_rx.len()); info!("fragments sent = {}", net_rx.len());
drop(net_tx); drop(net_tx);
// Receiving // Receiving
println!("receiving"); info!("receiving");
while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await { while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
// Send to input // Send to input
@ -122,7 +122,7 @@ pub async fn test_one_frag_out_in() {
assert!(all_sent.remove(&(r_message, r_remote_addr))); assert!(all_sent.remove(&(r_message, r_remote_addr)));
} }
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
// Shoud have dropped no packets // Shoud have dropped no packets
assert_eq!(all_sent.len(), 0); assert_eq!(all_sent.len(), 0);
@ -148,7 +148,7 @@ pub async fn test_many_frags_out_in() {
// Sending // Sending
let mut total_sent_size = 0usize; let mut total_sent_size = 0usize;
println!("sending"); info!("sending");
for _ in 0..1000 { for _ in 0..1000 {
let random_len = (get_random_u32() % 65536) as usize; let random_len = (get_random_u32() % 65536) as usize;
total_sent_size += random_len; total_sent_size += random_len;
@ -166,14 +166,14 @@ pub async fn test_many_frags_out_in() {
)); ));
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
println!("total_sent_size = {}", total_sent_size); info!("total_sent_size = {}", total_sent_size);
println!("fragments sent = {}", net_rx.len()); info!("fragments sent = {}", net_rx.len());
drop(net_tx); drop(net_tx);
// Receiving // Receiving
println!("receiving"); info!("receiving");
while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await { while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
// Send to input // Send to input
@ -187,7 +187,7 @@ pub async fn test_many_frags_out_in() {
assert!(all_sent.remove(&(r_message, r_remote_addr))); assert!(all_sent.remove(&(r_message, r_remote_addr)));
} }
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
// Shoud have dropped no packets // Shoud have dropped no packets
assert_eq!(all_sent.len(), 0); assert_eq!(all_sent.len(), 0);
@ -213,7 +213,7 @@ pub async fn test_many_frags_out_in_single_host() {
// Sending // Sending
let mut total_sent_size = 0usize; let mut total_sent_size = 0usize;
println!("sending"); info!("sending");
for _ in 0..1000 { for _ in 0..1000 {
let random_len = (get_random_u32() % 65536) as usize; let random_len = (get_random_u32() % 65536) as usize;
total_sent_size += random_len; total_sent_size += random_len;
@ -231,14 +231,14 @@ pub async fn test_many_frags_out_in_single_host() {
)); ));
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
println!("total_sent_size = {}", total_sent_size); info!("total_sent_size = {}", total_sent_size);
println!("fragments sent = {}", net_rx.len()); info!("fragments sent = {}", net_rx.len());
drop(net_tx); drop(net_tx);
// Receiving // Receiving
println!("receiving"); info!("receiving");
while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await { while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
// Send to input // Send to input
@ -252,7 +252,7 @@ pub async fn test_many_frags_out_in_single_host() {
assert!(all_sent.remove(&(r_message, r_remote_addr))); assert!(all_sent.remove(&(r_message, r_remote_addr)));
} }
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
// Shoud have dropped no packets // Shoud have dropped no packets
assert_eq!(all_sent.len(), 0); assert_eq!(all_sent.len(), 0);
@ -286,7 +286,7 @@ pub async fn test_many_frags_with_drops() {
// Sending // Sending
let mut total_sent_size = 0usize; let mut total_sent_size = 0usize;
let mut total_fragged = 0usize; let mut total_fragged = 0usize;
println!("sending"); info!("sending");
for _ in 0..1000 { for _ in 0..1000 {
let random_len = (get_random_u32() % 65536) as usize; let random_len = (get_random_u32() % 65536) as usize;
if random_len > FRAGMENT_LEN { if random_len > FRAGMENT_LEN {
@ -309,14 +309,14 @@ pub async fn test_many_frags_with_drops() {
first.store(true, Ordering::Release); first.store(true, Ordering::Release);
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
println!("total_sent_size = {}", total_sent_size); info!("total_sent_size = {}", total_sent_size);
println!("fragments sent = {}", net_rx.len()); info!("fragments sent = {}", net_rx.len());
println!("total_fragged = {}", total_fragged); info!("total_fragged = {}", total_fragged);
drop(net_tx); drop(net_tx);
// Receiving // Receiving
println!("receiving"); info!("receiving");
while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await { while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
// Send to input // Send to input
@ -330,7 +330,7 @@ pub async fn test_many_frags_with_drops() {
assert!(all_sent.remove(&(r_message, r_remote_addr))); assert!(all_sent.remove(&(r_message, r_remote_addr)));
} }
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
// Shoud have dropped all fragged packets // Shoud have dropped all fragged packets
assert_eq!(all_sent.len(), total_fragged); assert_eq!(all_sent.len(), total_fragged);
@ -356,7 +356,7 @@ pub async fn test_many_frags_reordered() {
// Sending // Sending
let mut total_sent_size = 0usize; let mut total_sent_size = 0usize;
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
println!("sending"); info!("sending");
for _ in 0..1000 { for _ in 0..1000 {
let random_len = (get_random_u32() % 65536) as usize; let random_len = (get_random_u32() % 65536) as usize;
total_sent_size += random_len; total_sent_size += random_len;
@ -386,14 +386,14 @@ pub async fn test_many_frags_reordered() {
} }
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
println!("total_sent_size = {}", total_sent_size); info!("total_sent_size = {}", total_sent_size);
println!("fragments sent = {}", net_rx.len()); info!("fragments sent = {}", net_rx.len());
drop(net_tx); drop(net_tx);
// Receiving // Receiving
println!("receiving"); info!("receiving");
while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await { while let Ok((frame, r_remote_addr)) = net_rx.recv_async().await {
// Send to input // Send to input
@ -407,7 +407,7 @@ pub async fn test_many_frags_reordered() {
assert!(all_sent.remove(&(r_message, r_remote_addr))); assert!(all_sent.remove(&(r_message, r_remote_addr)));
} }
} }
println!("all_sent len={}", all_sent.len()); info!("all_sent len={}", all_sent.len());
// Shoud have dropped no packets // Shoud have dropped no packets
assert_eq!(all_sent.len(), 0); assert_eq!(all_sent.len(), 0);