Skip to content

Commit

Permalink
clean up some style issues
Browse files Browse the repository at this point in the history
  • Loading branch information
bluejekyll committed Aug 24, 2022
1 parent 0b4cddb commit 7a087eb
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions crates/recursor/src/recursor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use std::{net::SocketAddr, time::Instant};

use async_recursion::async_recursion;
use futures_util::{future::select_all, FutureExt};

use lru_cache::LruCache;
use parking_lot::Mutex;
use tracing::{debug, info, warn};
Expand Down Expand Up @@ -234,19 +233,18 @@ impl Recursor {
}

// not in cache, let's look for an ns record for lookup
let zone = if query.query_type() == RecordType::NS {
query.name().base_name()
} else {
let zone = match query.query_type() {
RecordType::NS => query.name().base_name(),
// look for the NS records "inside" the zone
query.name().clone()
_ => query.name().clone(),
};

let mut zone = zone;
let mut ns = None;

// max number of forwarding processes
'max_forward: for _ in 0..20 {
match self.get_ns_pool_for_zone(zone.clone(), request_time).await {
match self.ns_pool_for_zone(zone.clone(), request_time).await {
Ok(found) => {
// found the nameserver
ns = Some(found);
Expand Down Expand Up @@ -312,7 +310,7 @@ impl Recursor {
}

#[async_recursion]
async fn get_ns_pool_for_zone(
async fn ns_pool_for_zone(
&self,
zone: Name,
request_time: Instant,
Expand All @@ -328,7 +326,7 @@ impl Recursor {
debug!("using roots for {} nameservers", zone);
self.roots.clone()
} else {
self.get_ns_pool_for_zone(parent_zone, request_time).await?
self.ns_pool_for_zone(parent_zone, request_time).await?
};

// TODO: check for cached ns pool for this zone
Expand Down

0 comments on commit 7a087eb

Please sign in to comment.