Revert "Always open tunnels with ifidx zero"

This reverts commit 46caffb.
althea-net · Aug 2, 2023 · ff3e6f8 · ff3e6f8
1 parent 59313dd
commit ff3e6f8
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/rita_common/src/tunnel_manager/mod.rs b/rita_common/src/tunnel_manager/mod.rs
@@ -521,8 +521,12 @@ impl TunnelManager {
             peer.ifidx,
         );
 
-        let (new_key, tunnel) =
-            create_new_tunnel(peer.contact_socket.ip(), our_port, their_localid)?;
+        let (new_key, tunnel) = create_new_tunnel(
+            peer.contact_socket.ip(),
+            our_port,
+            peer.ifidx,
+            their_localid,
+        )?;
 
         self.tunnels
             .entry(new_key)
@@ -535,10 +539,11 @@ impl TunnelManager {
 fn create_new_tunnel(
     peer_ip: IpAddr,
     our_port: u16,
+    ifidx: u32,
     their_localid: LocalIdentity,
 ) -> Result<(Identity, Tunnel), RitaCommonError> {
     // Create new tunnel
-    let tunnel = Tunnel::new(peer_ip, our_port, 0, their_localid);
+    let tunnel = Tunnel::new(peer_ip, our_port, ifidx, their_localid);
     let tunnel = match tunnel {
         Ok(tunnel) => {
             trace!("Tunnel {:?} is open", tunnel);