dearsky/numa
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases 25 Wiki Activity

feat: accept array of upstreams in [[forwarding]] #104

Merged
razvandimescu merged 5 commits from feat/forwarding-array-upstream into main 2026-04-18 04:25:05 +08:00
Conversation 0 Commits 5 Files Changed 6 +5 -6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fef43635d6 - Show all commits

7
src/ctx.rs
View File

@@ -16,9 +16,9 @@ use crate::blocklist::BlocklistStore;
use crate::buffer::BytePacketBuffer; use crate::buffer::BytePacketBuffer;
use crate::cache::{DnsCache, DnssecStatus}; use crate::cache::{DnsCache, DnssecStatus};
use crate::config::{UpstreamMode, ZoneMap}; use crate::config::{UpstreamMode, ZoneMap};
use crate::forward::{forward_with_failover_raw, UpstreamPool};
#[cfg(test)] #[cfg(test)]
use crate::forward::Upstream; use crate::forward::Upstream;
use crate::forward::{forward_with_failover_raw, UpstreamPool};
use crate::header::ResultCode; use crate::header::ResultCode;
use crate::health::HealthMeta; use crate::health::HealthMeta;
use crate::lan::PeerStore; use crate::lan::PeerStore;
@@ -1280,10 +1280,7 @@ mod tests {
let mut ctx = crate::testutil::test_ctx().await; let mut ctx = crate::testutil::test_ctx().await;
ctx.forwarding_rules = vec![ForwardingRule::new( ctx.forwarding_rules = vec![ForwardingRule::new(
"corp".to_string(), "corp".to_string(),
UpstreamPool::new( UpstreamPool::new(vec![Upstream::Udp(dead), Upstream::Udp(live)], vec![]),
vec![Upstream::Udp(dead), Upstream::Udp(live)],
vec![],
),
)]; )];
let ctx = Arc::new(ctx); let ctx = Arc::new(ctx);

4
src/system_dns.rs
View File

@@ -2,7 +2,9 @@ use std::net::SocketAddr;
use log::info; use log::info;
use crate::forward::{Upstream, UpstreamPool}; #[cfg(any(target_os = "macos", target_os = "linux"))]
use crate::forward::Upstream;
use crate::forward::UpstreamPool;
fn print_recursive_hint() { fn print_recursive_hint() {
let is_recursive = crate::config::load_config("numa.toml") let is_recursive = crate::config::load_config("numa.toml")