From c2c5e3c299d1f3f9a2074636d51fd3ebbdb1a453 Mon Sep 17 00:00:00 2001
From: John Smith <jsmith@example.com>
Date: Sat, 1 Jan 2022 13:38:39 -0500
Subject: [PATCH] network fixes, still a lot more to do for tcp

---
 scripts/run_2.sh                                    |  2 +-
 scripts/run_20.sh                                   |  2 +-
 scripts/run_4.sh                                    |  2 +-
 scripts/run_8.sh                                    |  2 +-
 veilid-core/src/intf/native/network/protocol/mod.rs | 10 ++++++----
 veilid-core/src/intf/native/network/protocol/tcp.rs | 13 +++++++++----
 veilid-core/src/intf/native/network/protocol/ws.rs  |  2 +-
 veilid-core/src/network_manager.rs                  |  6 +++---
 veilid-core/src/rpc_processor/mod.rs                |  7 +++++--
 veilid-core/src/xx/bump_port.rs                     |  4 ++--
 10 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/scripts/run_2.sh b/scripts/run_2.sh
index 7000b345..1f786376 100755
--- a/scripts/run_2.sh
+++ b/scripts/run_2.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-exec ./run_local_test.py 2 --config-file ./local-test.yml $1
+exec ./run_local_test.py 2 --config-file ./local-test.yml $@
 
 
diff --git a/scripts/run_20.sh b/scripts/run_20.sh
index 195d9cfb..21022a7d 100755
--- a/scripts/run_20.sh
+++ b/scripts/run_20.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-exec ./run_local_test.py 20 --config-file ./local-test.yml $1
+exec ./run_local_test.py 20 --config-file ./local-test.yml $@
 
 
diff --git a/scripts/run_4.sh b/scripts/run_4.sh
index dc008976..d29e7a0f 100755
--- a/scripts/run_4.sh
+++ b/scripts/run_4.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-exec ./run_local_test.py 4 --config-file ./local-test.yml $1
+exec ./run_local_test.py 4 --config-file ./local-test.yml $@
 
 
diff --git a/scripts/run_8.sh b/scripts/run_8.sh
index 411472ef..863f97f2 100755
--- a/scripts/run_8.sh
+++ b/scripts/run_8.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-exec ./run_local_test.py 8 --config-file ./local-test.yml $1
+exec ./run_local_test.py 8 --config-file ./local-test.yml $@
 
 
diff --git a/veilid-core/src/intf/native/network/protocol/mod.rs b/veilid-core/src/intf/native/network/protocol/mod.rs
index 6cc18d1c..538e1b5f 100644
--- a/veilid-core/src/intf/native/network/protocol/mod.rs
+++ b/veilid-core/src/intf/native/network/protocol/mod.rs
@@ -81,7 +81,7 @@ pub fn new_shared_tcp_socket(local_address: SocketAddr) -> Result<socket2::Socke
     let domain = Domain::for_address(local_address);
     let socket = Socket::new(domain, Type::STREAM, Some(Protocol::TCP))
         .map_err(map_to_string)
-        .map_err(logthru_net!())?;
+        .map_err(logthru_net!("failed to create TCP socket"))?;
     if let Err(e) = socket.set_linger(None) {
         log_net!(error "Couldn't set TCP linger: {}", e);
     }
@@ -100,9 +100,11 @@ pub fn new_shared_tcp_socket(local_address: SocketAddr) -> Result<socket2::Socke
     }
 
     let socket2_addr = socket2::SockAddr::from(local_address);
-    if let Err(e) = socket.bind(&socket2_addr) {
-        log_net!(error "failed to bind TCP socket: {}", e);
-    }
+    socket
+        .bind(&socket2_addr)
+        .map_err(|e| format!("failed to bind TCP socket: {}", e))?;
+
+    log_net!("created shared tcp socket on {:?}", &local_address);
 
     Ok(socket)
 }
diff --git a/veilid-core/src/intf/native/network/protocol/tcp.rs b/veilid-core/src/intf/native/network/protocol/tcp.rs
index e7774790..f9c27f06 100644
--- a/veilid-core/src/intf/native/network/protocol/tcp.rs
+++ b/veilid-core/src/intf/native/network/protocol/tcp.rs
@@ -134,7 +134,7 @@ impl RawTcpProtocolHandler {
         }
     }
 
-    pub async fn on_accept_async(
+    async fn on_accept_async(
         self,
         stream: AsyncPeekStream,
         socket_addr: SocketAddr,
@@ -181,7 +181,12 @@ impl RawTcpProtocolHandler {
         socket
             .connect(&remote_socket2_addr)
             .map_err(map_to_string)
-            .map_err(logthru_net!(error "addr={}", remote_socket_addr))?;
+            .map_err(logthru_net!(error "local_address={} remote_addr={}", local_address, remote_socket_addr))?;
+        log_net!(
+            "tcp connect successful: local_address={} remote_addr={}",
+            local_address,
+            remote_socket_addr
+        );
         let std_stream: std::net::TcpStream = socket.into();
         let ts = TcpStream::from(std_stream);
 
@@ -189,7 +194,7 @@ impl RawTcpProtocolHandler {
         let local_address = ts
             .local_addr()
             .map_err(map_to_string)
-            .map_err(logthru_net!())?;
+            .map_err(logthru_net!("could not get local address from TCP stream"))?;
         let ps = AsyncPeekStream::new(ts);
         let peer_addr = PeerAddress::new(
             SocketAddress::from_socket_addr(remote_socket_addr),
@@ -225,7 +230,7 @@ impl RawTcpProtocolHandler {
 
         let mut stream = TcpStream::connect(socket_addr)
             .await
-            .map_err(|e| format!("{}", e))?;
+            .map_err(|e| format!("failed to connect TCP for unbound message: {}", e))?;
         stream.write_all(&data).await.map_err(|e| format!("{}", e))
     }
 }
diff --git a/veilid-core/src/intf/native/network/protocol/ws.rs b/veilid-core/src/intf/native/network/protocol/ws.rs
index e055a9f2..2485815b 100644
--- a/veilid-core/src/intf/native/network/protocol/ws.rs
+++ b/veilid-core/src/intf/native/network/protocol/ws.rs
@@ -263,7 +263,7 @@ impl WebsocketProtocolHandler {
         socket
             .connect(&remote_socket2_addr)
             .map_err(map_to_string)
-            .map_err(logthru_net!(error "addr={}", remote_socket_addr))?;
+            .map_err(logthru_net!(error "local_address={} remote_socket_addr={}", local_address, remote_socket_addr))?;
         let std_stream: std::net::TcpStream = socket.into();
         let tcp_stream = TcpStream::from(std_stream);
 
diff --git a/veilid-core/src/network_manager.rs b/veilid-core/src/network_manager.rs
index 1d52e919..6498acb5 100644
--- a/veilid-core/src/network_manager.rs
+++ b/veilid-core/src/network_manager.rs
@@ -542,7 +542,7 @@ impl NetworkManager {
     // Called by the RPC handler when we want to issue an direct receipt
     pub async fn send_direct_receipt<B: AsRef<[u8]>>(
         &self,
-        dial_info: DialInfo,
+        dial_info: &DialInfo,
         rcpt_data: B,
         alternate_port: bool,
     ) -> Result<(), String> {
@@ -553,11 +553,11 @@ impl NetworkManager {
         // Send receipt directly
         if alternate_port {
             self.net()
-                .send_data_unbound_to_dial_info(&dial_info, rcpt_data.as_ref().to_vec())
+                .send_data_unbound_to_dial_info(dial_info, rcpt_data.as_ref().to_vec())
                 .await
         } else {
             self.net()
-                .send_data_to_dial_info(&dial_info, rcpt_data.as_ref().to_vec())
+                .send_data_to_dial_info(dial_info, rcpt_data.as_ref().to_vec())
                 .await
         }
     }
diff --git a/veilid-core/src/rpc_processor/mod.rs b/veilid-core/src/rpc_processor/mod.rs
index 64b9a139..452a4a5c 100644
--- a/veilid-core/src/rpc_processor/mod.rs
+++ b/veilid-core/src/rpc_processor/mod.rs
@@ -945,9 +945,12 @@ impl RPCProcessor {
         // Possibly from an alternate port
         let network_manager = self.network_manager();
         network_manager
-            .send_direct_receipt(dial_info, rcpt_data, alternate_port)
+            .send_direct_receipt(&dial_info, rcpt_data, alternate_port)
             .await
-            .map_err(map_error_string!())?;
+            .map_err(map_error_string!())
+            .map_err(
+                logthru_net!(error "failed to send direct receipt to dial info: {}, alternate_port={}", dial_info, alternate_port),
+            )?;
 
         Ok(())
     }
diff --git a/veilid-core/src/xx/bump_port.rs b/veilid-core/src/xx/bump_port.rs
index c2758bcc..60619928 100644
--- a/veilid-core/src/xx/bump_port.rs
+++ b/veilid-core/src/xx/bump_port.rs
@@ -15,7 +15,7 @@ pub enum BumpPortType {
 pub fn tcp_port_available(addr: &SocketAddr) -> bool {
     cfg_if! {
         if #[cfg(target_arch = "wasm32")] {
-            false
+            true
         } else {
             match TcpListener::bind(addr) {
                 Ok(_) => true,
@@ -28,7 +28,7 @@ pub fn tcp_port_available(addr: &SocketAddr) -> bool {
 pub fn udp_port_available(addr: &SocketAddr) -> bool {
     cfg_if! {
         if #[cfg(target_arch = "wasm32")] {
-            false
+            true
         } else {
             match UdpSocket::bind(addr) {
                 Ok(_) => true,