Richfr/ Add windowsAddress support to WslcCreateContainer() API by 1wizkid · Pull Request #40037 · microsoft/WSL

1wizkid · 2026-03-30T16:38:16Z

Summary of the Pull Request

PR Checklist

Closes: Link to issue #xxx
Communication: I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
Tests: Added/updated if needed and all pass
Localization: All end user facing strings can be localized
Dev docs: Added/updated if needed
Documentation updated: If checked, please file a pull request on our docs repo and link it here: #xxx

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Copilot

Pull request overview

This PR updates the WSLC Client SDK’s container port-mapping path to support custom host binding addresses (including IPv6) instead of always binding to 127.0.0.1, and relaxes/updates validation around the windowsAddress field.

Changes:

Convert windowsAddress (IPv4/IPv6) into a string binding address for WSLCPortMapping during container creation.
Add input validation for windowsAddress->ss_family in WslcSetContainerSettingsPortMappings.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 4 comments.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 6 comments.

JohnMcPMS

Almost certainly needs a test update to prevent a negative test from failing when it passes in an address. Not sure if we can expect IPv6 everywhere, but at least passing in 127.0.0.1 (or maybe IPv6 loopback works even if no external IPv6 address is available?).

[Edit: Search suggests that IPv6 loopback is always available if device supports IPv6.]

OneBlue

Added a couple comments, I would also recommend:

Updating the pull request title
Adding test coverage for the binding address wiring (at least for localhost, since that's the only thing that the service supports today)

You'll probably have to update existing tests as well

benhillis · 2026-04-07T02:41:59Z

Hey @1wizkid 👋 — Following up on this PR. Currently the wslc tests are failing in CI, and there are 11 unresolved review threads with feedback from maintainers, including:

Missing test coverage
Dangling pointer concerns (flagged 4 times)
Wildcard port binding security concern
\E_UNEXPECTED\ error code usage
\AF_UNSPEC\ failure risk

Is this change still needed? The review feedback covers some important safety and design issues that should be addressed before this can move forward. Let us know if you need any help!

1wizkid · 2026-04-07T16:12:14Z

Ill focus on this today. Thanks, Richard Sent from my T-Mobile 5G Device Get Outlook for Android<https://aka.ms/AAb9ysg>

…

________________________________

Copilot

Copilot wasn't able to review any files in this pull request.

…ate windowAddress values if present.

Copilot

Pull request overview

Copilot reviewed 2 out of 4 changed files in this pull request and generated 4 comments.

…into richfr/portmapping Need latest changes from origin/richfr/portmapping

Copilot

Pull request overview

Copilot reviewed 2 out of 4 changed files in this pull request and generated 3 comments.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

OneBlue

Let's remove the .etl file before merging

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 6 comments.

Copilot · 2026-04-14T16:13:12Z

+{
+    if (inet_ntop(af, src, dst, dstCount) == nullptr)
+    {
+        return HRESULT_FROM_WIN32(WSAGetLastError());


If inet_ntop() returns null but WSAGetLastError() happens to be 0 (e.g., stale last-error state), HRESULT_FROM_WIN32(0) will incorrectly return S_OK. Consider capturing the error immediately and returning a non-success fallback when the error code is 0 (e.g., E_FAIL), or proactively setting/clearing last error before calling inet_ntop().

Suggested change

return HRESULT_FROM_WIN32(WSAGetLastError());

const auto lastError = WSAGetLastError();

return lastError == 0 ? E_FAIL : HRESULT_FROM_WIN32(lastError);

Copilot · 2026-04-14T16:13:12Z

+            WslcContainerSettings containerSettings1;
+            VERIFY_SUCCEEDED(WslcInitContainerSettings("debian:latest", &containerSettings1));
+            VERIFY_SUCCEEDED(WslcSetContainerSettingsNetworkingMode(&containerSettings1, WSLC_CONTAINER_NETWORKING_MODE_NONE));


The new containerSettings1…containerSettings5 names don’t communicate intent and make the test harder to scan. Consider using descriptive names tied to the scenario (e.g., noneNetworkingSettings, defaultBindSettings, ipv4BindSettings, ipv6BindSettings, badFamilySettings) to improve readability and reduce the chance of mixing settings between blocks.

Copilot · 2026-04-14T16:13:12Z

+            WslcContainerSettings containerSettings2;
+            VERIFY_SUCCEEDED(WslcInitContainerSettings("python:3.12-alpine", &containerSettings2));
+            VERIFY_SUCCEEDED(WslcSetContainerSettingsInitProcess(&containerSettings2, &procSettings));
+            VERIFY_SUCCEEDED(WslcSetContainerSettingsNetworkingMode(&containerSettings2, WSLC_CONTAINER_NETWORKING_MODE_BRIDGED));


The new containerSettings1…containerSettings5 names don’t communicate intent and make the test harder to scan. Consider using descriptive names tied to the scenario (e.g., noneNetworkingSettings, defaultBindSettings, ipv4BindSettings, ipv6BindSettings, badFamilySettings) to improve readability and reduce the chance of mixing settings between blocks.

Copilot · 2026-04-14T16:13:13Z

+            WslcContainerSettings containerSettings3;
+            VERIFY_SUCCEEDED(WslcInitContainerSettings("python:3.12-alpine", &containerSettings3));
+            VERIFY_SUCCEEDED(WslcSetContainerSettingsInitProcess(&containerSettings3, &procSettings));
+            VERIFY_SUCCEEDED(WslcSetContainerSettingsNetworkingMode(&containerSettings3, WSLC_CONTAINER_NETWORKING_MODE_BRIDGED));


The new containerSettings1…containerSettings5 names don’t communicate intent and make the test harder to scan. Consider using descriptive names tied to the scenario (e.g., noneNetworkingSettings, defaultBindSettings, ipv4BindSettings, ipv6BindSettings, badFamilySettings) to improve readability and reduce the chance of mixing settings between blocks.

Copilot · 2026-04-14T16:13:13Z

+            WslcContainerSettings containerSettings4;
+            VERIFY_SUCCEEDED(WslcInitContainerSettings("python:3.12-alpine", &containerSettings4));
+            VERIFY_SUCCEEDED(WslcSetContainerSettingsInitProcess(&containerSettings4, &procSettings));
+            VERIFY_SUCCEEDED(WslcSetContainerSettingsNetworkingMode(&containerSettings4, WSLC_CONTAINER_NETWORKING_MODE_BRIDGED));


The new containerSettings1…containerSettings5 names don’t communicate intent and make the test harder to scan. Consider using descriptive names tied to the scenario (e.g., noneNetworkingSettings, defaultBindSettings, ipv4BindSettings, ipv6BindSettings, badFamilySettings) to improve readability and reduce the chance of mixing settings between blocks.

Copilot · 2026-04-14T16:13:13Z

+            WslcContainerSettings containerSettings5;
+            VERIFY_SUCCEEDED(WslcInitContainerSettings("debian:latest", &containerSettings5));
+            VERIFY_SUCCEEDED(WslcSetContainerSettingsNetworkingMode(&containerSettings5, WSLC_CONTAINER_NETWORKING_MODE_BRIDGED));


The new containerSettings1…containerSettings5 names don’t communicate intent and make the test harder to scan. Consider using descriptive names tied to the scenario (e.g., noneNetworkingSettings, defaultBindSettings, ipv4BindSettings, ipv6BindSettings, badFamilySettings) to improve readability and reduce the chance of mixing settings between blocks.

richfr added 2 commits March 30, 2026 09:21

Portmapping: add windowsAddress support

fe043b9

Portmapping: add windowsAddress support

04a4541

Copilot AI review requested due to automatic review settings March 30, 2026 16:38

Copilot started reviewing on behalf of 1wizkid March 30, 2026 16:39 View session

Copilot AI reviewed Mar 30, 2026

View reviewed changes

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

Comment thread src/windows/WslcSDK/wslcsdk.cpp

Comment thread src/windows/WslcSDK/wslcsdk.cpp

JohnMcPMS reviewed Mar 30, 2026

View reviewed changes

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

richfr added 2 commits April 1, 2026 09:32

Addressing PR feedback: update wslcsdk.cpp

cf34fb8

Addressing clang formatting error

954d1a0

Copilot AI review requested due to automatic review settings April 1, 2026 17:03

Copilot AI reviewed Apr 1, 2026

View reviewed changes

Comment thread src/windows/WslcSDK/wslcsdk.cpp

Comment thread src/windows/WslcSDK/wslcsdk.cpp

Comment thread src/windows/WslcSDK/wslcsdk.cpp

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

Copilot started reviewing on behalf of 1wizkid April 1, 2026 17:21 View session

richfr and others added 2 commits April 1, 2026 10:33

Providing default values for port bindings: wslcsdk.cpp

31e28b4

Merge branch 'feature/wsl-for-apps' into richfr/portmapping

7ca8e51

Copilot AI review requested due to automatic review settings April 1, 2026 17:58

1wizkid marked this pull request as ready for review April 1, 2026 18:00

1wizkid requested a review from a team as a code owner April 1, 2026 18:00

Copilot AI reviewed Apr 1, 2026

View reviewed changes

Copilot started reviewing on behalf of 1wizkid April 1, 2026 18:13 View session

Merge branch 'feature/wsl-for-apps' into richfr/portmapping

7f1eca4

1wizkid enabled auto-merge (squash) April 1, 2026 18:27

JohnMcPMS reviewed Apr 1, 2026

View reviewed changes

OneBlue requested changes Apr 1, 2026

View reviewed changes

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

Copilot AI review requested due to automatic review settings April 7, 2026 16:54

1wizkid closed this Apr 7, 2026

auto-merge was automatically disabled April 7, 2026 16:54
Pull request was closed

1wizkid force-pushed the richfr/portmapping branch from 7f1eca4 to 715ce52 Compare April 7, 2026 16:54

Copilot AI reviewed Apr 7, 2026

View reviewed changes

Fixed merge conflicts. Set default BindingAddress to 127.0.0.1. Valid…

eff50d2

…ate windowAddress values if present.

Copilot AI reviewed Apr 13, 2026

View reviewed changes

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

Comment thread src/windows/WslcSDK/wslcsdk.cpp

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

Comment thread test/windows/WslcSdkTests.cpp Outdated

Copilot started reviewing on behalf of 1wizkid April 13, 2026 20:02 View session

richfr added 3 commits April 13, 2026 13:19

Respond to misc copilot feedback

573786f

Merge branch 'richfr/portmapping' of https://github.com/microsoft/WSL …

5a8a0ae

…into richfr/portmapping Need latest changes from origin/richfr/portmapping

Resolving merge after syncing with origin

7f2e047

OneBlue reviewed Apr 13, 2026

View reviewed changes

Comment thread test/windows/WslcSdkTests.cpp

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

Adjusted error messages

6b5ffdd

Copilot AI review requested due to automatic review settings April 13, 2026 21:42

Removed 2 unnecessary lines of code

dd50413

Copilot started reviewing on behalf of 1wizkid April 13, 2026 21:48 View session

Copilot AI reviewed Apr 13, 2026

View reviewed changes

Comment thread src/windows/WslcSDK/wslcsdk.cpp

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

Comment thread src/windows/WslcSDK/wslcsdk.cpp Outdated

richfr and others added 2 commits April 13, 2026 15:14

Mark internal function as static to avoid external linkage

86eb5b7

Merge branch 'feature/wsl-for-apps' into richfr/portmapping

15c2e67

Copilot AI review requested due to automatic review settings April 13, 2026 22:15

Copilot started reviewing on behalf of 1wizkid April 13, 2026 22:17 View session

Copilot AI reviewed Apr 13, 2026

View reviewed changes

OneBlue approved these changes Apr 13, 2026

View reviewed changes

JohnMcPMS reviewed Apr 13, 2026

View reviewed changes

Comment thread diagnostics/trace01.etl Outdated

OneBlue requested changes Apr 13, 2026

View reviewed changes

Merge branch 'feature/wsl-for-apps' into richfr/portmapping

b9a3176

1wizkid enabled auto-merge (squash) April 14, 2026 14:06

Delete diagnostics/trace01.etl

9618aad

Copilot AI review requested due to automatic review settings April 14, 2026 16:06

Delete diagnostics/trace02.etl

759f2f7

Copilot AI reviewed Apr 14, 2026

View reviewed changes

Remove ETL files and Add Ignore rule to .gitignore

3e6f691

JohnMcPMS approved these changes Apr 14, 2026

View reviewed changes

Copilot started reviewing on behalf of 1wizkid April 14, 2026 17:21 View session

OneBlue approved these changes Apr 14, 2026

View reviewed changes

1wizkid merged commit 630929d into feature/wsl-for-apps Apr 14, 2026
7 checks passed

	return HRESULT_FROM_WIN32(WSAGetLastError());
	const auto lastError = WSAGetLastError();
	return lastError == 0 ? E_FAIL : HRESULT_FROM_WIN32(lastError);

Conversation

1wizkid commented Mar 30, 2026

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JohnMcPMS left a comment • 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!

OneBlue left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

benhillis commented Apr 7, 2026

Uh oh!

1wizkid commented Apr 7, 2026 via email • edited by microsoft-github-policy-service bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OneBlue left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Apr 14, 2026

Choose a reason for hiding this comment

JohnMcPMS left a comment •

edited

Loading

1wizkid commented Apr 7, 2026 via email •

edited by microsoft-github-policy-service bot

Loading