Skip to content

Commit

Permalink
feat: renamed tsig middleware to rfc2136 middleware for logic
Browse files Browse the repository at this point in the history
  • Loading branch information
thibault-cne committed Aug 2, 2024
1 parent 57626e6 commit 275bac3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use domain::net::server::middleware::mandatory::MandatoryMiddlewareSvc;
use domain::net::server::stream::StreamServer;
use tokio::net::{TcpListener, UdpSocket};

use crate::service::middleware::{MetricsMiddlewareSvc, Stats, TsigMiddlewareSvc};
use crate::service::middleware::{MetricsMiddlewareSvc, Rfc2136MiddlewareSvc, Stats};
use crate::service::Watcher;

mod config;
Expand Down Expand Up @@ -76,7 +76,7 @@ async fn main() {
let dnsr = Arc::new(dnsr);
let dnsr_svc = EdnsMiddlewareSvc::new(dnsr.clone());
let dnsr_svc = MandatoryMiddlewareSvc::new(dnsr_svc);
let dnsr_svc = TsigMiddlewareSvc::new(dnsr.clone(), dnsr_svc);
let dnsr_svc = Rfc2136MiddlewareSvc::new(dnsr.clone(), dnsr_svc);
let dnsr_svc = MetricsMiddlewareSvc::new(dnsr_svc, stats.clone());

let addr = "0.0.0.0:53";
Expand Down
4 changes: 2 additions & 2 deletions src/service/middleware/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mod metric;
mod tsig;
mod rfc2136;

pub use metric::{MetricsMiddlewareSvc, Stats};
pub use tsig::TsigMiddlewareSvc;
pub use rfc2136::Rfc2136MiddlewareSvc;
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ use crate::key::{DomainName, KeyStore, Keys};
use crate::service::handler::HandlerResult;

#[derive(Clone, Debug)]
pub struct TsigMiddlewareSvc<Octets, Svc> {
pub struct Rfc2136MiddlewareSvc<Octets, Svc> {
dnsr: Arc<crate::service::Dnsr>,
svc: Svc,
_octets: PhantomData<Octets>,
}

impl<RequestOctets, Svc> TsigMiddlewareSvc<RequestOctets, Svc>
impl<RequestOctets, Svc> Rfc2136MiddlewareSvc<RequestOctets, Svc>
where
RequestOctets: Octets + Send + Sync + Unpin + Clone,
Svc: Service<RequestOctets>,
Expand Down Expand Up @@ -183,7 +183,7 @@ where
}
}

impl<RequestOctets, Svc> Service<RequestOctets> for TsigMiddlewareSvc<RequestOctets, Svc>
impl<RequestOctets, Svc> Service<RequestOctets> for Rfc2136MiddlewareSvc<RequestOctets, Svc>
where
RequestOctets: Octets + Send + Sync + 'static + Unpin + Clone,
Svc: Service<RequestOctets>,
Expand Down

0 comments on commit 275bac3

Please sign in to comment.