Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ futures-core = "0.3.31"
futures-util = "0.3.31"
tower = { version = "0.5.2", features = ["util"] }
hyper-util = "0.1.16"
hex = "0.4.3"
dhcproto = "0.12.0"

[build-dependencies]
chrono = { version = "0.4.41", default-features = false, features = ["clock"] }
Expand Down
20 changes: 16 additions & 4 deletions src/commands/dhcp_proxy.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#![cfg_attr(not(unix), allow(unused_imports))]

use crate::dhcp_proxy::cache::{Clear, LeaseCache};
use crate::dhcp_proxy::dhcp_service::{process_client_stream, DhcpV4Service};
use crate::dhcp_proxy::dhcp_service::{
process_client_stream, DhcpService, DhcpV4Service, DhcpV6Service,
};
use crate::dhcp_proxy::ip;
use crate::dhcp_proxy::lib::g_rpc::netavark_proxy_server::{NetavarkProxy, NetavarkProxyServer};
use crate::dhcp_proxy::lib::g_rpc::{
Expand All @@ -14,6 +16,7 @@ use crate::error::{NetavarkError, NetavarkResult};
use crate::network::core_utils;
use clap::Parser;
use log::{debug, error, warn};
use mozim::DhcpV6IaType;
use tokio::task::AbortHandle;

use std::collections::HashMap;
Expand Down Expand Up @@ -422,16 +425,25 @@ async fn process_setup<W: Write + Clear>(
let mut service = DhcpV4Service::new(network_config, timeout)?;

let lease = service.get_lease().await?;
let task = tokio::spawn(process_client_stream(service));
let task = tokio::spawn(process_client_stream(DhcpService::V4(service)));
tasks
.lock()
.expect("lock tasks")
.insert(mac.to_string(), task.abort_handle());
lease
}
//V6 TODO implement DHCPv6
1 => {
return Err(Status::new(InvalidArgument, "ipv6 not yet supported"));
// ia_type for conatainers is generally NonTemporaryAddresses
let mut service =
DhcpV6Service::new(network_config, timeout, DhcpV6IaType::NonTemporaryAddresses)?;
let lease = service.get_lease().await?;
// service in the generic DhcpService enum.
let task = tokio::spawn(process_client_stream(DhcpService::V6(service)));
tasks
.lock()
.expect("lock tasks")
.insert(mac.to_string(), task.abort_handle());
lease
}
_ => {
return Err(Status::new(InvalidArgument, "invalid protocol version"));
Expand Down
Loading