Skip to content

Use the same TcpSocket in WASIp{2,3} #11386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcrichton merged 4 commits into from
Aug 7, 2025
Merged

Use the same TcpSocket in WASIp{2,3} #11386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8994e4c
Use the same `TcpSocket` in WASIp{2,3}
alexcrichton Aug 1, 2025
4aff7e8
Fix CI issues
alexcrichton Aug 6, 2025
78e8be1
Review comments
alexcrichton Aug 7, 2025
0a5e840
Trim "TCP allowed?" checks
alexcrichton Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 7 additions & 23 deletions crates/test-programs/src/bin/cli_no_tcp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,12 @@
//! This test assumes that it will be run without tcp support enabled
use test_programs::wasi::sockets::{
network::IpAddress,
tcp::{ErrorCode, IpAddressFamily, IpSocketAddress, Network, TcpSocket},
};

fn main() {
let net = Network::default();
let family = IpAddressFamily::Ipv4;
let remote1 = IpSocketAddress::new(IpAddress::new_loopback(family), 4321);
let sock = TcpSocket::new(family).unwrap();

let bind = sock.blocking_bind(&net, remote1);
eprintln!("Result of binding: {bind:?}");
assert!(matches!(bind, Err(ErrorCode::AccessDenied)));
#![deny(warnings)]

let listen = sock.blocking_listen();
eprintln!("Result of listen: {listen:?}");
assert!(matches!(listen, Err(ErrorCode::AccessDenied)));
use test_programs::wasi::sockets::tcp::{ErrorCode, IpAddressFamily, TcpSocket};

let connect = sock.blocking_connect(&net, remote1);
eprintln!("Result of connect: {connect:?}");
assert!(matches!(connect, Err(ErrorCode::AccessDenied)));

let accept = sock.blocking_accept();
eprintln!("Result of accept: {accept:?}");
assert!(matches!(accept, Err(ErrorCode::AccessDenied)));
fn main() {
assert!(matches!(
TcpSocket::new(IpAddressFamily::Ipv4),
Err(ErrorCode::AccessDenied)
));
}
2 changes: 1 addition & 1 deletion crates/wasi/src/p2/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ mod async_io {
// Configure all other resources to be concrete types defined in
// this crate
"wasi:sockets/network/network": crate::p2::network::Network,
"wasi:sockets/tcp/tcp-socket": crate::p2::tcp::TcpSocket,
"wasi:sockets/tcp/tcp-socket": crate::sockets::TcpSocket,
"wasi:sockets/udp/udp-socket": crate::sockets::UdpSocket,
"wasi:sockets/udp/incoming-datagram-stream": crate::p2::udp::IncomingDatagramStream,
"wasi:sockets/udp/outgoing-datagram-stream": crate::p2::udp::OutgoingDatagramStream,
Expand Down
Loading