std: sys: net: uefi: tcp: Initial TcpListener support #145339

Ayush1325 · 2025-08-13T07:50:52Z

Add support for binding and accepting TCP4 connections.

While testing, the following network options were used with QEMU + OVMF: -nic user,hostfwd=tcp::12345-:12345

The default localhost address on qemu seems to be 10.0.2.15.

UEFI spec does not seem to state that the TCP Handle returned by the Accept method has a ServiceBinding Protocol. So have made the ServiceBinding Protocol optional.

cc @nicholasbishop

rustbot · 2025-08-13T07:50:57Z

r? @ibraheemdev

rustbot has assigned @ibraheemdev.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

ibraheemdev · 2025-08-19T03:52:35Z

Passing this along to someone else, who hopefully has more context. r? libs

Ayush1325 · 2025-08-29T17:00:55Z

@rustbot label +O-UEFI

tgross35 · 2025-09-03T00:19:37Z

Thom is off the review rotation
r? libs

Also gentle ping @nicholasbishop for a review since we usually defer UEFI to you

tgross35 · 2025-09-05T03:09:58Z

library/std/src/sys/net/connection/uefi/tcp.rs

+                temp.configure(false, None, Some(x))?;
+                Ok(Tcp::V4(temp))
+            }
+            SocketAddr::V6(_) => todo!(),


Rather than todo!(), maybe add an IPV6_UNSUPPORTED error to

rust/library/std/src/io/error.rs

Line 78 in b3cfb8f

impl Error {

and return that

I think it would be better to return normal unsupported instead of adding a new error variant. Since IPv6 is just not implemented by std right now. It is supported by UEFI. And I am planning to implement it once IPv4 is complete.

tgross35 · 2025-09-05T03:15:35Z

library/std/src/sys/net/connection/uefi/tcp4.rs

+        } else {
+            (DEFAULT_ADDR, 0)
+        };
+        let subnet_mask = helpers::ipv4_to_r_efi(crate::net::Ipv4Addr::new(255, 255, 255, 0));


Is this a breaking change? If the mask was previously 0.0.0.0 (all addresses), it seems like this may surprise some users

Worth a comment in any case

No, this is not a breaking change. That is because the docs state the following: Not used when UseDefaultAddress is TRUE.

And previously, UseDefaultAddress was always true.

tgross35 · 2025-09-05T03:17:00Z

library/std/src/sys/net/connection/uefi/tcp4.rs

+            // The spec does not seem to state if we need to call ServiceBinding->DestroyChild for
+            // this handle


Is there a reference implementation that does or doesn't do this? Or a way to check whether or not the handle is valid after this call?

tgross35 · 2025-09-05T03:17:35Z

library/std/src/sys/net/connection/uefi/tcp4.rs

@@ -15,7 +15,7 @@ pub(crate) struct Tcp4 {
    protocol: NonNull<tcp4::Protocol>,
    flag: AtomicBool,
    #[expect(dead_code)]


Does this lint still fire?

Yes, just tested

bors · 2025-09-11T01:49:09Z

☔ The latest upstream changes (presumably #146418) made this pull request unmergeable. Please resolve the merge conflicts.

phip1611

Generally LGTM but left a few remarks

View changes since this review

phip1611 · 2025-09-11T06:14:07Z

library/std/src/sys/net/connection/uefi/mod.rs

+        }
+    }
+
+    pub fn connect(addr: io::Result<&SocketAddr>) -> io::Result<TcpStream> {


Why are you passing in a result here if you to addr? in a next step? I never saw this in Rust, seems to be an antipattern?

PS: Still not familiar with the development model and best practices within Rust std itself.

Well, that was the internal API till now due to SGX target. It has been changed now in the following PR: #145327 so I have updated things accordingly.

phip1611 · 2025-09-11T06:14:54Z

library/std/src/sys/net/connection/uefi/tcp4.rs

-        let use_default_address = efi::Boolean::TRUE;
-        let (station_address, station_port) = (DEFAULT_ADDR, 0);
-        let subnet_mask = helpers::ipv4_to_r_efi(crate::net::Ipv4Addr::new(0, 0, 0, 0));
+        let use_default_address = station_address.is_none().into();


This makes .into() code easier to read if one is not using an IDE

Suggested change

let use_default_address = station_address.is_none().into();

let use_default_address: bool = station_address.is_none().into();

I have added the annotation, but it is not actually bool, but rather r_efi::efi::Boolean.

phip1611 · 2025-09-11T06:15:49Z

library/std/src/sys/net/connection/uefi/tcp4.rs

+        } else {
+            (DEFAULT_ADDR, 0)
+        };
+        let subnet_mask = helpers::ipv4_to_r_efi(crate::net::Ipv4Addr::new(255, 255, 255, 0));


This is more readable

Suggested change

let subnet_mask = helpers::ipv4_to_r_efi(crate::net::Ipv4Addr::new(255, 255, 255, 0));

let subnet_mask = crate::net::Ipv4Addr::new(255, 255, 255, 0);

let subnet_mask = helpers::ipv4_to_r_efi(subnet_mask);

Add support for binding and accepting TCP4 connections. While testing, the following network options were used with QEMU + OVMF: -nic user,hostfwd=tcp::12345-:12345 The default localhost address on qemu seems to be 10.0.2.15. UEFI spec does not seem to state that the TCP Handle returned by the Accept method has a ServiceBinding Protocol. So have made the ServiceBinding Protocol optional. Signed-off-by: Ayush Singh <[email protected]>

rustbot · 2025-09-11T07:09:20Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

rustbot assigned ibraheemdev Aug 13, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Aug 13, 2025

Ayush1325 mentioned this pull request Aug 13, 2025

Tracking Issue for uefi-std #100499

Open

rustbot assigned thomcc and unassigned ibraheemdev Aug 19, 2025

rustbot added the O-UEFI UEFI label Aug 29, 2025

rustbot assigned tgross35 and unassigned thomcc Sep 3, 2025

tgross35 requested changes Sep 5, 2025

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 5, 2025

Ayush1325 force-pushed the uefi-tcp4-accept branch from 54d3d51 to 5459fc4 Compare September 5, 2025 06:25

phip1611 suggested changes Sep 11, 2025

View reviewed changes

Ayush1325 force-pushed the uefi-tcp4-accept branch from 5459fc4 to 9f020a9 Compare September 11, 2025 07:09

		// The spec does not seem to state if we need to call ServiceBinding->DestroyChild for
		// this handle

	let use_default_address = station_address.is_none().into();
	let use_default_address: bool = station_address.is_none().into();

	let subnet_mask = helpers::ipv4_to_r_efi(crate::net::Ipv4Addr::new(255, 255, 255, 0));
	let subnet_mask = crate::net::Ipv4Addr::new(255, 255, 255, 0);
	let subnet_mask = helpers::ipv4_to_r_efi(subnet_mask);

std: sys: net: uefi: tcp: Initial TcpListener support #145339

Are you sure you want to change the base?

std: sys: net: uefi: tcp: Initial TcpListener support #145339

Uh oh!

Conversation

Ayush1325 commented Aug 13, 2025

Uh oh!

rustbot commented Aug 13, 2025

Uh oh!

ibraheemdev commented Aug 19, 2025

Uh oh!

Ayush1325 commented Aug 29, 2025

Uh oh!

tgross35 commented Sep 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Ayush1325 Sep 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bors commented Sep 11, 2025

Uh oh!

phip1611 left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rustbot commented Sep 11, 2025

Uh oh!

Uh oh!

Ayush1325 Sep 5, 2025 •

edited

Loading

phip1611 left a comment •

edited by rustbot

Loading