From 8d66068caf10d5471719203577610704f116577a Mon Sep 17 00:00:00 2001 From: Erik Hollensbe Date: Wed, 30 Mar 2022 11:46:24 -0700 Subject: [PATCH] zeronsd 0.4 Signed-off-by: Erik Hollensbe --- Cargo.lock | 91 ++++++++++++++++++++++++++++++++++-------------------- Cargo.toml | 6 ++-- 2 files changed, 61 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca3db17..6f0e8ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -181,6 +181,19 @@ dependencies = [ "syn", ] +[[package]] +name = "env_logger" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "fastrand" version = "1.7.0" @@ -380,6 +393,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" version = "0.14.18" @@ -430,9 +449,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown", @@ -509,10 +528,11 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] @@ -744,9 +764,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" dependencies = [ "cfg-if", "libc", @@ -875,9 +895,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae183fc1b06c149f0c1793e1eb447c8b04bfe46d48e9e48bfb8d2d7ed64ecf0" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] @@ -1374,28 +1394,30 @@ dependencies = [ [[package]] name = "trust-dns-client" -version = "0.21.1" -source = "git+https://github.com/erikh/trust-dns?branch=tracing#03e763f28010a0ac3b7f2f745f77c4fa8b403cb8" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6d9ba1c6079f6f9b4664e482db1700bd53d2ee77b1c9752c1d7a66c0c8bda99" dependencies = [ "cfg-if", "data-encoding", "futures-channel", "futures-util", "lazy_static", + "log", "openssl", "radix_trie", "rand", "thiserror", "time", "tokio", - "tracing", "trust-dns-proto", ] [[package]] name = "trust-dns-proto" -version = "0.21.1" -source = "git+https://github.com/erikh/trust-dns?branch=tracing#03e763f28010a0ac3b7f2f745f77c4fa8b403cb8" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" dependencies = [ "async-trait", "cfg-if", @@ -1407,6 +1429,7 @@ dependencies = [ "idna", "ipnet", "lazy_static", + "log", "openssl", "rand", "serde", @@ -1415,19 +1438,20 @@ dependencies = [ "tinyvec", "tokio", "tokio-openssl", - "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.1" -source = "git+https://github.com/erikh/trust-dns?branch=tracing#03e763f28010a0ac3b7f2f745f77c4fa8b403cb8" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" dependencies = [ "cfg-if", "futures-util", "ipconfig", "lazy_static", + "log", "lru-cache", "parking_lot", "resolv-conf", @@ -1436,21 +1460,23 @@ dependencies = [ "thiserror", "tokio", "tokio-openssl", - "tracing", "trust-dns-proto", ] [[package]] name = "trust-dns-server" -version = "0.21.1" -source = "git+https://github.com/erikh/trust-dns?branch=tracing#03e763f28010a0ac3b7f2f745f77c4fa8b403cb8" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a395a2e0fd8aac9b4613767a5b4ba4b2040de1b767fa03ace8c9d6f351d60b2d" dependencies = [ "async-trait", "bytes", "cfg-if", "enum-as-inner", + "env_logger", "futures-executor", "futures-util", + "log", "openssl", "serde", "thiserror", @@ -1458,7 +1484,6 @@ dependencies = [ "tokio", "tokio-openssl", "toml", - "tracing", "trust-dns-client", "trust-dns-proto", "trust-dns-resolver", @@ -1668,9 +1693,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" dependencies = [ "windows_aarch64_msvc", "windows_i686_gnu", @@ -1681,33 +1706,33 @@ dependencies = [ [[package]] name = "windows_aarch64_msvc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_i686_gnu" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_msvc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_x86_64_gnu" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_msvc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "winreg" @@ -1738,7 +1763,7 @@ dependencies = [ [[package]] name = "zeronsd" -version = "0.3.1" +version = "0.4.0" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 2f6d95b..f9e7817 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zeronsd" -version = "0.3.1" +version = "0.4.0" authors = ["Erik Hollensbe ", "Adam Ierymenko "] description = "Unicast DNS resolver for ZeroTier networks" homepage = "https://github.com/zerotier/zeronsd" @@ -18,8 +18,8 @@ regex = ">= 0" anyhow = ">= 0" clap = { version = "^3", features = ["derive"] } ipnetwork = ">= 0" -trust-dns-resolver = { version = "^0.21.0", features = ["tokio-runtime", "dns-over-openssl"], git = "https://github.com/erikh/trust-dns", branch = "tracing" } -trust-dns-server = { version = "^0.21.0", features = ["trust-dns-resolver", "dns-over-openssl"], git = "https://github.com/erikh/trust-dns", branch = "tracing" } +trust-dns-resolver = { version = "^0.21.0", features = ["tokio-runtime", "dns-over-openssl"] } +trust-dns-server = { version = "^0.21.0", features = ["trust-dns-resolver", "dns-over-openssl"] } tokio = { version = "1", features = ["full"] } zerotier-central-api = { version = "= 1.0.3" } zerotier-one-api = { version = "= 1.0.5" }