YwxApp/RustyDHCP
4
0
Fork 0
mirror of https://github.com/pj1234678/RustyDHCP.git synced 2026-10-16 17:23:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Run cargo fmt

Browse Source
This commit is contained in:
junderw
2023-10-30 20:13:40 -07:00
parent e8d62af6c3
commit 4a85f1dcbb
5 changed files with 112 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.rs
+1 -1
View File
@@ -364,4 +364,4 @@ impl MessageType {
_ => Err(format!("Invalid DHCP Message Type: {:?}", val)),
}
}
}
}
src/packet.rs
+52 -55
View File
@@ -19,8 +19,6 @@ pub enum ErrorKind {
type IResult<I, O> = Result<(I, O), CustomErr<I>>;
/// DHCP Packet Structure
#[derive(Debug)]
pub struct Packet {
@@ -75,7 +73,7 @@ where
remaining = input;
}
Err(CustomErr::NomError(_)) => return Ok((remaining, acc)),
Err(e) => return Err(e),
Err(e) => return Err(e),
}
}
}
@@ -85,12 +83,14 @@ pub fn decode_option(input: &[u8]) -> IResult<&[u8], DhcpOption> {
assert!(code != END);
let (input, len) = custom_be_u8(input)?;
let (input, data) = custom_take(len.into())(input)?;
let (input, data) = custom_take(len.into())(input)?;
let option = match code {
DHCP_MESSAGE_TYPE => DhcpOption::DhcpMessageType(match MessageType::from(custom_be_u8(data)?.1) {
Ok(x) => x,
Err(_) => return Err(CustomErr::UnrecognizedMessageType),
}),
DHCP_MESSAGE_TYPE => {
DhcpOption::DhcpMessageType(match MessageType::from(custom_be_u8(data)?.1) {
Ok(x) => x,
Err(_) => return Err(CustomErr::UnrecognizedMessageType),
})
}
SERVER_IDENTIFIER => DhcpOption::ServerIdentifier(decode_ipv4(data)?.1),
PARAMETER_REQUEST_LIST => DhcpOption::ParameterRequestList(data.to_vec()),
REQUESTED_IP_ADDRESS => DhcpOption::RequestedIpAddress(decode_ipv4(data)?.1),
@@ -174,7 +174,6 @@ fn decode(input: &[u8]) -> IResult<&[u8], Packet> {
let (input, giaddr) = decode_ipv4(input)?;
if hlen != 6 {
return Err(CustomErr::InvalidHlen);
}
let (_, chaddr) = custom_take(6usize)(input)?;
@@ -182,7 +181,6 @@ fn decode(input: &[u8]) -> IResult<&[u8], Packet> {
let input = options_input;
let (input, _) = custom_tag(&COOKIE)(input)?;
let mut options = Vec::new();
let mut rest = input;
@@ -223,7 +221,6 @@ fn decode(input: &[u8]) -> IResult<&[u8], Packet> {
impl Packet {
pub fn from(input: &[u8]) -> Result<Packet, CustomErr<&[u8]>> {
Ok(decode(input)?.1)
}
@@ -248,58 +245,58 @@ impl Packet {
None => Err("Packet does not have MessageType option".to_string()),
}
}
pub fn encode<'a>(&'a self, p: &'a mut [u8]) -> &[u8] {
let broadcast_flag = if self.broadcast { 128 } else { 0 };
let mut length = 240;
pub fn encode<'a>(&'a self, p: &'a mut [u8]) -> &[u8] {
let broadcast_flag = if self.broadcast { 128 } else { 0 };
let mut length = 240;
p[..12].copy_from_slice(&[
if self.reply { BOOT_REPLY } else { BOOT_REQUEST },
1,
6,
self.hops,
((self.xid >> 24) & 0xFF) as u8,
((self.xid >> 16) & 0xFF) as u8,
((self.xid >> 8) & 0xFF) as u8,
(self.xid & 0xFF) as u8,
(self.secs >> 8) as u8,
(self.secs & 255) as u8,
broadcast_flag,
0,
]);
p[..12].copy_from_slice(&[
if self.reply { BOOT_REPLY } else { BOOT_REQUEST },
1,
6,
self.hops,
((self.xid >> 24) & 0xFF) as u8,
((self.xid >> 16) & 0xFF) as u8,
((self.xid >> 8) & 0xFF) as u8,
(self.xid & 0xFF) as u8,
(self.secs >> 8) as u8,
(self.secs & 255) as u8,
broadcast_flag,
0,
]);
p[12..16].copy_from_slice(&self.ciaddr.octets());
p[16..20].copy_from_slice(&self.yiaddr.octets());
p[20..24].copy_from_slice(&self.siaddr.octets());
p[24..28].copy_from_slice(&self.giaddr.octets());
p[28..34].copy_from_slice(&self.chaddr);
p[34..236].fill(0);
p[236..240].copy_from_slice(&COOKIE);
p[12..16].copy_from_slice(&self.ciaddr.octets());
p[16..20].copy_from_slice(&self.yiaddr.octets());
p[20..24].copy_from_slice(&self.siaddr.octets());
p[24..28].copy_from_slice(&self.giaddr.octets());
p[28..34].copy_from_slice(&self.chaddr);
p[34..236].fill(0);
p[236..240].copy_from_slice(&COOKIE);
for option in &self.options {
let option = option.to_raw();
let option_len = option.data.len();
if length + 2 + option_len >= 272 {
break;
for option in &self.options {
let option = option.to_raw();
let option_len = option.data.len();
if length + 2 + option_len >= 272 {
break;
}
if let Some(dest) = p.get_mut(length..length + 2 + option_len) {
dest[0] = option.code;
dest[1] = option_len as u8;
dest[2..].copy_from_slice(&option.data);
}
length += 2 + option_len;
}
if let Some(dest) = p.get_mut(length..length + 2 + option_len) {
dest[0] = option.code;
dest[1] = option_len as u8;
dest[2..].copy_from_slice(&option.data);
if let Some(end_segment) = p.get_mut(length..length + 1) {
end_segment[0] = END;
}
length += 2 + option_len;
}
length += 1;
if let Some(end_segment) = p.get_mut(length..length + 1) {
end_segment[0] = END;
}
length += 1;
if let Some(pad_segment) = p.get_mut(length..272) {
pad_segment.fill(PAD);
}
if let Some(pad_segment) = p.get_mut(length..272) {
pad_segment.fill(PAD);
&p[..length]
}
&p[..length]
}
}
const COOKIE: [u8; 4] = [99, 130, 83, 99];
src/server.rs
+13 -16
View File
@@ -74,7 +74,7 @@ impl Server {
pub fn serve<H: Handler>(
udp_soc: UdpSocket,
server_ip: Ipv4Addr,
broadcast_ip: Ipv4Addr,
broadcast_ip: Ipv4Addr,
mut handler: H,
) -> std::io::Error {
let mut in_buf: [u8; 1500] = [0; 1500];
@@ -82,9 +82,8 @@ impl Server {
out_buf: Cell::new([0; 1500]),
socket: udp_soc,
server_ip,
broadcast_ip,
broadcast_ip,
src: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 0),
};
loop {
match s.socket.recv_from(&mut in_buf) {
@@ -92,7 +91,7 @@ impl Server {
Ok((l, src)) => {
if let Ok(p) = Packet::from(&in_buf[..l]) {
s.src = src;
handler.handle_request(&s, p);
}
}
@@ -154,21 +153,19 @@ impl Server {
/// Checks the packet see if it was intended for this DHCP server (as opposed to some other also on the network).
pub fn for_this_server(&self, packet: &Packet) -> bool {
match packet.option(options::SERVER_IDENTIFIER) {
Some(DhcpOption::ServerIdentifier(x)) => {
x == &self.server_ip
},
Some(DhcpOption::ServerIdentifier(x)) => x == &self.server_ip,
_ => false,
}
}
/// Encodes and sends a DHCP packet back to the client.
pub fn send(&self, p: Packet) -> std::io::Result<usize> {
let mut addr = self.src;
if p.broadcast || addr.ip() == IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)) {
addr.set_ip(std::net::IpAddr::V4(self.broadcast_ip));
}
println!("Sending Response to: {:?}", addr); // Print the address
/// Encodes and sends a DHCP packet back to the client.
pub fn send(&self, p: Packet) -> std::io::Result<usize> {
let mut addr = self.src;
if p.broadcast || addr.ip() == IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)) {
addr.set_ip(std::net::IpAddr::V4(self.broadcast_ip));
}
println!("Sending Response to: {:?}", addr); // Print the address
self.socket.send_to(p.encode(&mut self.out_buf.get()), addr)
}
self.socket.send_to(p.encode(&mut self.out_buf.get()), addr)
}
}