renet
/
renet
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Emit dns servers in DHCPv4 repr. Fixes #504

v0.7.x^2
Anton Romanov 2021-06-23 18:19:54 +00:00
parent 450c5d8f87
commit d0a7921cf6
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/wire/dhcpv4.rs
View File

@ -700,6 +700,11 @@ impl<'a> Repr<'a> {
if self.router.is_some() { len += 6; }
if self.subnet_mask.is_some() { len += 6; }
if self.lease_duration.is_some() { len += 6; }
if let Some(dns_servers) = self.dns_servers {
len += 2;
len += dns_servers.iter()
.filter(|d| d.is_some()).map(|_| 4).sum::<usize>();
}
if let Some(list) = self.parameter_request_list { len += list.len() + 2; }
len
@ -842,6 +847,14 @@ impl<'a> Repr<'a> {
if let Some(duration) = self.lease_duration {
let tmp = options; options = DhcpOption::IpLeaseTime(duration).emit(tmp);
}
if let Some(dns_servers) = self.dns_servers {
let data = dns_servers.iter().filter(|o| o.is_some())
.map(|ip| ip.unwrap().as_bytes().to_owned())
.flatten()
.collect::<Vec<_>>();
let option = DhcpOption::Other{ kind: field::OPT_DOMAIN_NAME_SERVER, data: &data[..] };
let tmp = options; options = option.emit(tmp);
}
if let Some(list) = self.parameter_request_list {
let option = DhcpOption::Other{ kind: field::OPT_PARAMETER_REQUEST_LIST, data: list };
let tmp = options; options = option.emit(tmp);
@ -1088,6 +1101,29 @@ mod test {
repr.emit(&mut packet).unwrap();
}
#[test]
fn test_emit_offer_dns() {
let repr = {
let mut repr = offer_repr();
repr.dns_servers = Some([
Some(Ipv4Address([163, 1, 74, 6])),
Some(Ipv4Address([163, 1, 74, 7])),
Some(Ipv4Address([163, 1, 74, 3]))]);
repr
};
let mut bytes = vec![0xa5; repr.buffer_len()];
let mut packet = Packet::new_unchecked(&mut bytes);
repr.emit(&mut packet).unwrap();
let packet = Packet::new_unchecked(&bytes);
let repr_parsed = Repr::parse(&packet).unwrap();
assert_eq!(repr_parsed.dns_servers, Some([
Some(Ipv4Address([163, 1, 74, 6])),
Some(Ipv4Address([163, 1, 74, 7])),
Some(Ipv4Address([163, 1, 74, 3]))]));
}
#[test]
fn test_emit_dhcp_option() {
static DATA: &[u8] = &[1, 3, 6];