net_consomme: Add support for ipv6

Cargo.lock

@@ -806,6 +806,7 @@ dependencies = [
  "inspect_counters",
  "libc",
  "mesh_channel_core",
+ "open_enum",
  "pal",
  "pal_async",
  "parking_lot",
@@ -818,6 +819,7 @@ dependencies = [
  "tracing",
  "winapi",
  "windows-sys 0.61.0",
+ "zerocopy 0.8.27",
 ]
 
 [[package]]

vm/devices/net/net_consomme/consomme/Cargo.toml

@@ -8,18 +8,21 @@ rust-version.workspace = true
 
 [dependencies]
 mesh_channel_core.workspace = true
-inspect.workspace = true
-inspect_counters.workspace = true
-pal_async.workspace = true
 futures.workspace = true
 getrandom.workspace = true
 heapless.workspace = true
 parking_lot.workspace = true
-smoltcp = { workspace = true, features = [ "proto-ipv4", "proto-dns", "medium-ethernet", "socket-raw", "std", "proto-dhcpv4" ] }
+smoltcp = { workspace = true, features = [ "proto-ipv4", "proto-ipv6", "proto-dns", "medium-ethernet", "socket-raw", "std", "proto-dhcpv4" ] }
 socket2.workspace = true
 thiserror.workspace = true
-tracelimit.workspace = true
 tracing.workspace = true
+zerocopy.workspace = true
+
+inspect.workspace = true
+inspect_counters.workspace = true
+open_enum.workspace = true
+pal_async.workspace = true
+tracelimit.workspace = true
 
 [target.'cfg(unix)'.dependencies]
 blocking.workspace = true

vm/devices/net/net_consomme/consomme/src/dhcp.rs

@@ -6,6 +6,7 @@ use super::Client;
 use super::DropReason;
 use crate::ChecksumState;
 use crate::MIN_MTU;
+use heapless::Vec as HeaplessVec;
 use smoltcp::phy::ChecksumCapabilities;
 use smoltcp::wire::DHCP_MAX_DNS_SERVER_COUNT;
 use smoltcp::wire::DhcpMessageType;
@@ -47,22 +48,20 @@ impl<T: Client> Access<'_, T> {
             ty => return Err(DropReason::UnsupportedDhcp(ty)),
         }
 
-        let dns_servers = if self.inner.state.params.nameservers.is_empty() {
-            None
-        } else {
-            let mut dns_servers = heapless::Vec::new();
-            for &s in self
-                .inner
+        let mut dns_servers: HeaplessVec<Ipv4Address, DHCP_MAX_DNS_SERVER_COUNT> =
+            HeaplessVec::new();
+        dns_servers.extend(
+            self.inner
                 .state
                 .params
                 .nameservers
                 .iter()
-                .take(DHCP_MAX_DNS_SERVER_COUNT)
-            {
-                let _ = dns_servers.push(s);
-            }
-            Some(dns_servers)
-        };
+                .filter_map(|ip| match ip {
+                    IpAddress::Ipv4(addr) => Some(*addr),
+                    _ => None,
+                })
+                .take(DHCP_MAX_DNS_SERVER_COUNT),
+        );
 
         let resp_dhcp = if let Some(your_ip) = your_ip {
             DhcpRepr {
@@ -81,7 +80,7 @@ impl<T: Client> Access<'_, T> {
                 client_identifier: None,
                 server_identifier: Some(self.inner.state.params.gateway_ip),
                 parameter_request_list: None,
-                dns_servers,
+                dns_servers: Some(dns_servers),
                 max_size: None,
                 lease_duration: Some(86400),
                 renew_duration: None,