Replace ConvertInterfaceAliasToLuid with WintunGetAdapterLUID#20
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR fixes a real-world race during Adapter::create / Adapter::open by avoiding ConvertInterfaceAliasToLuid(name) (which can fail while the interface alias is asynchronously published) and instead deriving the adapter LUID directly from the Wintun handle via WintunGetAdapterLUID. It also changes GUID and interface index resolution to be lazy and retried to reduce residual NSI timing issues while keeping the public API surface unchanged.
Changes:
- Replace alias→LUID lookup with
WintunGetAdapterLUIDinAdapter::createandAdapter::open. - Make adapter GUID and interface index lazy (
OnceLock) with bounded retry onERROR_NOT_FOUNDNSI races. - Remove the now-unused
alias_to_luidhelper and its Win32 import.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
src/ffi.rs |
Removes ConvertInterfaceAliasToLuid usage and deletes alias_to_luid helper. |
src/adapter.rs |
Uses WintunGetAdapterLUID, adds lazy GUID/index resolution with retry helper, and updates call sites to use get_guid(). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Member
|
Thanks |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
Adapter::create/Adapter::opencallConvertInterfaceAliasToLuid(name)right after
WintunCreateAdapterreturns. The alias is an NSI RW fieldpublished asynchronously by NetCfg.
WintunCreateAdapter's internalWaitForInterfaceonly waits on the PnP signal, so the alias lookup racesand returns
ERROR_NOT_FOUND (1168)on real user machines.Fix
Use
WintunGetAdapterLUID(synchronous struct read,VOIDreturn) for theLUID.
index/guidbecome lazyOnceLockwith bounded retry on theresidual NSI race. Public API unchanged.
Both wintun's own
example/example.candwireguard-windows(
driver/driver_windows.go) useWintunGetAdapterLUIDfor this reason.