rustics/dns
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases Wiki Activity

DNSMessageType tests added (#21)

Browse Source 
Co-authored-by: Tobias Ottenweller <tobi@ottenweller.net>
Reviewed-on: #21
Co-authored-by: mice_on_drugs <tobi@ottenweller.net>
Co-committed-by: mice_on_drugs <tobi@ottenweller.net>
This commit is contained in:
mice_on_drugs 2022-05-08 16:15:02 +02:00 committed by ddidderr
parent 97e786905e
commit 6a60951487
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/proto.rs
View File

@ -110,20 +110,17 @@ impl TryFrom<u8> for DNSRCode {
} }
} }
#[derive(Debug)] #[derive(Debug, PartialEq)]
pub enum DNSMessageType { pub enum DNSMessageType {
Query, Query,
Response, Response,
} }
impl TryFrom<u8> for DNSMessageType { impl From<bool> for DNSMessageType {
type Error = DNSParseError; fn from(value: bool) -> DNSMessageType {
fn try_from(value: u8) -> Result<Self, Self::Error> {
match value { match value {
0 => Ok(Self::Query), false => Self::Query,
1 => Ok(Self::Response), true => Self::Response,
_ => Err(DNSParseError::DNSRCodeInvalid),
} }
} }
} }
@ -187,15 +184,15 @@ impl DNSHeader {
let id = u16::from_be_bytes((&datagram[..2]).try_into().unwrap()); let id = u16::from_be_bytes((&datagram[..2]).try_into().unwrap());
let message_type = DNSMessageType::try_from(datagram[2] & Self::QR_MASK)?; let message_type = DNSMessageType::from(datagram[2] & Self::QR_MASK != 0);
let opcode = DNSOpCode::try_from((datagram[2] & Self::OPCODE_MASK) >> Self::OPCODE_OFFSET)?; let opcode = DNSOpCode::try_from((datagram[2] & Self::OPCODE_MASK) >> Self::OPCODE_OFFSET)?;
let authorative_answer = (datagram[2] & Self::AA_MASK) != 0; let authorative_answer = (datagram[2] & Self::AA_MASK) != 0;
let truncated = (datagram[2] & Self::TC_MASK) != 0; let truncated = (datagram[2] & Self::TC_MASK) != 0;
let recursion_desired = (datagram[2] & Self::RD_MASK) != 0; let recursion_desired = (datagram[2] & Self::RD_MASK) != 0;
let recursion_available = (datagram[3] & Self::RA_MASK) != 0; let recursion_available = (datagram[2] & Self::RA_MASK) != 0;
let authentic_data = (datagram[3] & Self::AD_MASK) != 0; let authentic_data = (datagram[2] & Self::AD_MASK) != 0;
let checking_disabled = (datagram[3] & Self::CD_MASK) != 0; let checking_disabled = (datagram[2] & Self::CD_MASK) != 0;
let response_code = DNSRCode::try_from(datagram[3] & Self::RCODE_MASK)?; let response_code = DNSRCode::try_from(datagram[3] & Self::RCODE_MASK)?;
let query_count = u16::from_be_bytes((datagram[4..6]).try_into().unwrap()); let query_count = u16::from_be_bytes((datagram[4..6]).try_into().unwrap());
@ -287,4 +284,24 @@ mod tests {
} }
Ok(()) Ok(())
} }
#[test]
fn parse_dns_header_message_type_query() -> Result<(), DNSParseError> {
let dns_query = [
0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
];
let parse_result = DNSHeader::from_udp_datagram(&dns_query);
assert_eq!(parse_result?.message_type, DNSMessageType::Query);
Ok(())
}
#[test]
fn parse_dns_header_message_type_response() -> Result<(), DNSParseError> {
let dns_query = [
0xff, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
];
let parse_result = DNSHeader::from_udp_datagram(&dns_query);
assert_eq!(parse_result?.message_type, DNSMessageType::Response);
Ok(())
}
} }

6
udp_sender.py
View File

@ -3,11 +3,11 @@ import socket
import sys import sys
UDP_SIZE = int(sys.argv[1]) # UDP_SIZE = int(sys.argv[1])
UDP_IP = "127.0.0.1" UDP_IP = "127.0.0.1"
UDP_PORT = 13337 UDP_PORT = 13337
MESSAGE = "A" MESSAGE = b"\xff\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00"
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
sock.sendto(bytes(MESSAGE*UDP_SIZE, "utf-8"), (UDP_IP, UDP_PORT)) sock.sendto(MESSAGE, (UDP_IP, UDP_PORT))