liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

network fixes, still a lot more to do for tcp

Browse Source
This commit is contained in:
John Smith 2022-01-01 13:38:39 -05:00
parent 0e0209a54b
commit c2c5e3c299
10 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/run_2.sh
View File

@ -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 $@

2
scripts/run_20.sh
View File

@ -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 $@

2
scripts/run_4.sh
View File

@ -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 $@

2
scripts/run_8.sh
View File

@ -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 $@

10
veilid-core/src/intf/native/network/protocol/mod.rs
View File

@ -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)
}

13
veilid-core/src/intf/native/network/protocol/tcp.rs
View File

@ -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))
}
}

2
veilid-core/src/intf/native/network/protocol/ws.rs
View File

@ -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);

6
veilid-core/src/network_manager.rs
View File

@ -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
}
}

7
veilid-core/src/rpc_processor/mod.rs
View File

@ -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(())
}

4
veilid-core/src/xx/bump_port.rs
View File

@ -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,