Skip to content

Commit

Permalink
GH-524: DNS disabled in ServerInitializerReal poll(); two integration…
Browse files Browse the repository at this point in the history
… tests put in ignore
  • Loading branch information
Bert authored and Bert committed Sep 27, 2024
1 parent 50f007e commit 718d2ff
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
12 changes: 7 additions & 5 deletions node/src/server_initializer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ use time::OffsetDateTime;
use tokio::prelude::{Async, Future};

pub struct ServerInitializerReal {
#[allow(dead_code)]
dns_socket_server: Box<dyn ConfiguredByPrivilege<Item = (), Error = ()>>,
bootstrapper: Box<dyn ConfiguredByPrivilege<Item = (), Error = ()>>,
privilege_dropper: Box<dyn PrivilegeDropper>,
Expand Down Expand Up @@ -80,11 +81,12 @@ impl Future for ServerInitializerReal {
type Error = ();

fn poll(&mut self) -> Result<Async<<Self as Future>::Item>, <Self as Future>::Error> {
try_ready!(self
.dns_socket_server
.as_mut()
.join(self.bootstrapper.as_mut())
.poll());
// try_ready!(self
// .dns_socket_server
// .as_mut()
// .join(self.bootstrapper.as_mut())
// .poll());
try_ready!(self.bootstrapper.as_mut().poll());
Ok(Async::Ready(()))
}
}
Expand Down
4 changes: 4 additions & 0 deletions node/tests/dns_round_trip_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ use trust_dns::op::{OpCode, ResponseCode};
use trust_dns::rr::{DNSClass, RecordType};

#[test]
// TODO This ignore should be lifted by GH-525
#[ignore]
#[serial(port53)]
fn handles_two_consecutive_ipv4_dns_requests_integration() {
let _node = utils::MASQNode::start_standard(
Expand All @@ -25,6 +27,8 @@ fn handles_two_consecutive_ipv4_dns_requests_integration() {
}

#[test]
// TODO This ignore should be lifted by GH-525
#[ignore]
#[serial(port53)]
fn handles_consecutive_heterogeneous_dns_requests_integration() {
let _node = utils::MASQNode::start_standard(
Expand Down

0 comments on commit 718d2ff

Please sign in to comment.