6 Commits

Author SHA1 Message Date
Slatian
f799927f90 Cargo update 2024-03-17 22:02:20 +01:00
Slatian
8695f0026f lib-humus is now on crates.io 2024-02-11 14:15:13 +01:00
Slatian
3b552dba8a Downgrade clap to 4.4.18 to support "older" rust versions 2024-02-11 12:38:33 +01:00
Slatian
1ce60d8291 to_trust_resolver_config() -> to_hickory_resolver_config() 2024-02-11 11:52:33 +01:00
Slatian
b5097b5a03 cargo update 2024-02-11 11:51:23 +01:00
Slatian
610842abac Remove unused import 2024-02-11 11:51:08 +01:00
5 changed files with 271 additions and 256 deletions

517
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -7,12 +7,12 @@ authors = ["Slatian <baschdel@disroot.org>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
lib-humus = { version="0.2", features=["axum-view+cookie"], git="https://codeberg.org/slatian/lib-humus.git" } lib-humus = { version="0.2", features=["axum-view+cookie"] }
axum = { version = "0.7", features = ["macros"] } axum = { version = "0.7", features = ["macros"] }
axum-extra = { version = "0.9", features = ["cookie", "typed-header"] } axum-extra = { version = "0.9", features = ["cookie", "typed-header"] }
axum-client-ip = "0.5" axum-client-ip = "0.5"
clap = { version = "4", features = ["derive"] } clap = { version = "4.4", features = ["derive"] }
governor = "0.6" governor = "0.6"
idna = "0.4" idna = "0.4"
lazy_static = "1.4.0" lazy_static = "1.4.0"

View File

@@ -86,7 +86,7 @@ impl Into<Protocol> for DnsProtocol {
} }
impl DnsResolverConfig { impl DnsResolverConfig {
pub fn to_trust_resolver_config( pub fn to_hickory_resolver_config(
&self &self
) -> HickoryResolverConfig { ) -> HickoryResolverConfig {
let mut resolver = HickoryResolverConfig::new(); let mut resolver = HickoryResolverConfig::new();

View File

@@ -6,7 +6,7 @@ use std::num::NonZeroU32;
mod dns; mod dns;
pub use crate::config::dns::{DnsConfig, DnsProtocol, DnsResolverConfig}; pub use crate::config::dns::{DnsConfig, DnsResolverConfig};
#[derive(Deserialize, Default, Clone)] #[derive(Deserialize, Default, Clone)]
pub struct EchoIpServiceConfig { pub struct EchoIpServiceConfig {

View File

@@ -227,7 +227,7 @@ async fn main() {
for (key, resolver_config) in &config.dns.resolver { for (key, resolver_config) in &config.dns.resolver {
println!("Initalizing {} resolver ...", key); println!("Initalizing {} resolver ...", key);
let resolver = TokioAsyncResolver::tokio( let resolver = TokioAsyncResolver::tokio(
resolver_config.to_trust_resolver_config(), resolver_config.to_hickory_resolver_config(),
Default::default() Default::default()
); );
dns_resolver_map.insert(key.clone(), resolver); dns_resolver_map.insert(key.clone(), resolver);