cleanup: SockSet can be owned by static

ref: smoltcp-rs/smoltcp#813
aramperes · Dec 24, 2023 · 10b88cc · 10b88cc
1 parent 83beb48
commit 10b88cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/virtual_iface/tcp.rs b/src/virtual_iface/tcp.rs
@@ -21,14 +21,14 @@ use std::{
 const MAX_PACKET: usize = 65536;
 
 /// A virtual interface for proxying Layer 7 data to Layer 3 packets, and vice-versa.
-pub struct TcpVirtualInterface<'a> {
+pub struct TcpVirtualInterface {
     source_peer_ip: IpAddr,
     port_forwards: Vec<PortForwardConfig>,
     bus: Bus,
-    sockets: SocketSet<'a>,
+    sockets: SocketSet<'static>,
 }
 
-impl<'a> TcpVirtualInterface<'a> {
+impl TcpVirtualInterface {
     /// Initialize the parameters for a new virtual interface.
     /// Use the `poll_loop()` future to start the virtual interface poll loop.
     pub fn new(port_forwards: Vec<PortForwardConfig>, bus: Bus, source_peer_ip: IpAddr) -> Self {
@@ -84,7 +84,7 @@ impl<'a> TcpVirtualInterface<'a> {
 }
 
 #[async_trait]
-impl VirtualInterfacePoll for TcpVirtualInterface<'_> {
+impl VirtualInterfacePoll for TcpVirtualInterface {
     async fn poll_loop(mut self, mut device: VirtualIpDevice) -> anyhow::Result<()> {
         // Create CIDR block for source peer IP + each port forward IP
         let addresses = self.addresses();

diff --git a/src/virtual_iface/udp.rs b/src/virtual_iface/udp.rs
@@ -20,14 +20,14 @@ use std::{
 
 const MAX_PACKET: usize = 65536;
 
-pub struct UdpVirtualInterface<'a> {
+pub struct UdpVirtualInterface {
     source_peer_ip: IpAddr,
     port_forwards: Vec<PortForwardConfig>,
     bus: Bus,
-    sockets: SocketSet<'a>,
+    sockets: SocketSet<'static>,
 }
 
-impl<'a> UdpVirtualInterface<'a> {
+impl UdpVirtualInterface {
     /// Initialize the parameters for a new virtual interface.
     /// Use the `poll_loop()` future to start the virtual interface poll loop.
     pub fn new(port_forwards: Vec<PortForwardConfig>, bus: Bus, source_peer_ip: IpAddr) -> Self {
@@ -96,7 +96,7 @@ impl<'a> UdpVirtualInterface<'a> {
 }
 
 #[async_trait]
-impl<'a> VirtualInterfacePoll for UdpVirtualInterface<'a> {
+impl VirtualInterfacePoll for UdpVirtualInterface {
     async fn poll_loop(mut self, mut device: VirtualIpDevice) -> anyhow::Result<()> {
         // Create CIDR block for source peer IP + each port forward IP
         let addresses = self.addresses();