aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimbeerserverDE <himbeerserverde@gmail.com>2023-11-22 13:37:44 +0100
committerHimbeerserverDE <himbeerserverde@gmail.com>2023-11-22 13:37:44 +0100
commit0244e0326c6aada551272c5e6d1ba756bc18997a (patch)
tree9608f7339c83c0e59d6d0b58b69aaafaef0496b5
parent80314d87d176bbee63521f487d0dfd032a9cbffd (diff)
reorder request options: move oro above iapd
-rw-r--r--src/main.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/main.rs b/src/main.rs
index 2b761b9..1aae51b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -354,15 +354,15 @@ async fn do_send_dhcp6(dhcp6: &mut Dhcp6, sock: &UdpSocket, packet: Packet) -> R
opts.insert(DhcpOption::ClientId(dhcp6.duid.as_ref().to_vec()));
opts.insert(DhcpOption::RapidCommit);
+ opts.insert(DhcpOption::ORO(ORO {
+ opts: vec![OptionCode::AftrName, OptionCode::DomainNameServers],
+ }));
opts.insert(DhcpOption::IAPD(IAPD {
id: 1,
t1: 0,
t2: 0,
opts: Default::default(),
}));
- opts.insert(DhcpOption::ORO(ORO {
- opts: vec![OptionCode::AftrName, OptionCode::DomainNameServers],
- }));
let mut buf = Vec::new();
solicit.encode(&mut Encoder::new(&mut buf))?;
@@ -377,6 +377,9 @@ async fn do_send_dhcp6(dhcp6: &mut Dhcp6, sock: &UdpSocket, packet: Packet) -> R
opts.insert(DhcpOption::ClientId(dhcp6.duid.as_ref().to_vec()));
opts.insert(DhcpOption::ServerId(dhcp6.server_id.clone()));
+ opts.insert(DhcpOption::ORO(ORO {
+ opts: vec![OptionCode::AftrName, OptionCode::DomainNameServers],
+ }));
opts.insert(DhcpOption::IAPD(IAPD {
id: 1,
t1: 0,
@@ -409,9 +412,6 @@ async fn do_send_dhcp6(dhcp6: &mut Dhcp6, sock: &UdpSocket, packet: Packet) -> R
.into_iter()
.collect(),
}));
- opts.insert(DhcpOption::ORO(ORO {
- opts: vec![OptionCode::AftrName, OptionCode::DomainNameServers],
- }));
let mut buf = Vec::new();
request.encode(&mut Encoder::new(&mut buf))?;
@@ -426,6 +426,9 @@ async fn do_send_dhcp6(dhcp6: &mut Dhcp6, sock: &UdpSocket, packet: Packet) -> R
opts.insert(DhcpOption::ClientId(dhcp6.duid.as_ref().to_vec()));
opts.insert(DhcpOption::ServerId(dhcp6.server_id.clone()));
+ opts.insert(DhcpOption::ORO(ORO {
+ opts: vec![OptionCode::AftrName, OptionCode::DomainNameServers],
+ }));
opts.insert(DhcpOption::IAPD(IAPD {
id: 1,
t1: 0,
@@ -458,9 +461,6 @@ async fn do_send_dhcp6(dhcp6: &mut Dhcp6, sock: &UdpSocket, packet: Packet) -> R
.into_iter()
.collect(),
}));
- opts.insert(DhcpOption::ORO(ORO {
- opts: vec![OptionCode::AftrName, OptionCode::DomainNameServers],
- }));
let mut buf = Vec::new();
renew.encode(&mut Encoder::new(&mut buf))?;
@@ -474,6 +474,9 @@ async fn do_send_dhcp6(dhcp6: &mut Dhcp6, sock: &UdpSocket, packet: Packet) -> R
let opts = rebind.opts_mut();
opts.insert(DhcpOption::ClientId(dhcp6.duid.as_ref().to_vec()));
+ opts.insert(DhcpOption::ORO(ORO {
+ opts: vec![OptionCode::AftrName, OptionCode::DomainNameServers],
+ }));
opts.insert(DhcpOption::IAPD(IAPD {
id: 1,
t1: 0,
@@ -506,9 +509,6 @@ async fn do_send_dhcp6(dhcp6: &mut Dhcp6, sock: &UdpSocket, packet: Packet) -> R
.into_iter()
.collect(),
}));
- opts.insert(DhcpOption::ORO(ORO {
- opts: vec![OptionCode::AftrName, OptionCode::DomainNameServers],
- }));
let mut buf = Vec::new();
rebind.encode(&mut Encoder::new(&mut buf))?;