remove AnyIP; fix IPv6 virtual addresses

aramperes · Dec 24, 2023 · 488a0e0 · 488a0e0
1 parent 38fc217
commit 488a0e0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/virtual_iface/tcp.rs b/src/virtual_iface/tcp.rs
@@ -10,7 +10,7 @@ use smoltcp::{
     iface::{Config, Interface, SocketHandle, SocketSet},
     socket::tcp,
     time::Instant,
-    wire::{HardwareAddress, IpAddress, IpCidr},
+    wire::{HardwareAddress, IpAddress, IpCidr, IpVersion},
 };
 use std::{
     collections::{HashMap, HashSet, VecDeque},
@@ -78,7 +78,7 @@ impl<'a> TcpVirtualInterface<'a> {
         }
         addresses
             .into_iter()
-            .map(|addr| IpCidr::new(addr, 32))
+            .map(|addr| IpCidr::new(addr, addr_length(&addr)))
             .collect()
     }
 }
@@ -249,3 +249,10 @@ impl VirtualInterfacePoll for TcpVirtualInterface<'_> {
         }
     }
 }
+
+const fn addr_length(addr: &IpAddress) -> u8 {
+    match addr.version() {
+        IpVersion::Ipv4 => 32,
+        IpVersion::Ipv6 => 128,
+    }
+}
diff --git a/src/virtual_iface/udp.rs b/src/virtual_iface/udp.rs
@@ -10,7 +10,7 @@ use smoltcp::{
     iface::{Config, Interface, SocketHandle, SocketSet},
     socket::udp::{self, UdpMetadata},
     time::Instant,
-    wire::{HardwareAddress, IpAddress, IpCidr},
+    wire::{HardwareAddress, IpAddress, IpCidr, IpVersion},
 };
 use std::{
     collections::{HashMap, HashSet, VecDeque},
@@ -90,7 +90,7 @@ impl<'a> UdpVirtualInterface<'a> {
         }
         addresses
             .into_iter()
-            .map(|addr| IpCidr::new(addr, 32))
+            .map(|addr| IpCidr::new(addr, addr_length(&addr)))
             .collect()
     }
 }
@@ -219,3 +219,10 @@ impl<'a> VirtualInterfacePoll for UdpVirtualInterface<'a> {
         }
     }
 }
+
+const fn addr_length(addr: &IpAddress) -> u8 {
+    match addr.version() {
+        IpVersion::Ipv4 => 32,
+        IpVersion::Ipv6 => 128,
+    }
+}