aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/error.rs16
-rw-r--r--src/main.rs6
2 files changed, 11 insertions, 11 deletions
diff --git a/src/error.rs b/src/error.rs
index 4fc7ca5..551c94e 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -4,20 +4,20 @@ use std::io;
#[derive(Debug, Error)]
pub enum Error {
- #[error("bytes sent not equal to pkt size")]
- PartialSend,
+ #[error("failed to send whole packet (expected {0}, got {1})")]
+ PartialSend(usize, usize),
- #[error("io: {0}")]
+ #[error("io error: {0}")]
Io(#[from] io::Error),
- #[error("dns_message_parser decode: {0}")]
+ #[error("dns_message_parser decode error: {0}")]
DnsDecode(#[from] dns_message_parser::DecodeError),
- #[error("dns_message_parser encode: {0}")]
+ #[error("dns_message_parser encode error: {0}")]
DnsEncode(#[from] dns_message_parser::EncodeError),
- #[error("serde_json: {0}")]
+ #[error("serde_json error: {0}")]
SerdeJson(#[from] serde_json::Error),
- #[error("trust_dns_proto: {0}")]
- TrustDnsProto(#[from] trust_dns_proto::error::ProtoError),
+ #[error("hickory_proto error: {0}")]
+ HickoryProto(#[from] hickory_proto::error::ProtoError),
}
pub type Result<T> = std::result::Result<T, Error>;
diff --git a/src/main.rs b/src/main.rs
index b9344d0..b9b1076 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,10 +13,10 @@ use bytes::Bytes;
use dns_message_parser::question::{QType, Question};
use dns_message_parser::rr::{Class, A, PTR, RR};
use dns_message_parser::{Dns, DomainName, Flags, Opcode, RCode};
+use hickory_proto::rr::Name;
use ipnet::IpNet;
use rsdsl_dhcp4d::lease::Lease;
use signal_hook::{consts::SIGUSR1, iterator::Signals};
-use trust_dns_proto::rr::Name;
const UPSTREAM: &str = "[2620:fe::fe]:53";
@@ -245,7 +245,7 @@ fn handle_query(
let n = uplink.send(&bytes)?;
if n != bytes.len() {
- return Err(Error::PartialSend);
+ return Err(Error::PartialSend(bytes.len(), n));
}
let mut buf = [0; 1024];
@@ -291,7 +291,7 @@ fn handle_query(
let n = sock.send_to(&bytes, raddr)?;
if n != bytes.len() {
- return Err(Error::PartialSend);
+ return Err(Error::PartialSend(bytes.len(), n));
}
Ok(())