Change intf_socks to a map of (Interface, Socket) #242
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.
This is triggered by a test failure in the
integration_success
test case on macOS locally. It turns out that macOS could have two network interfaces on the same IPv6 address.(According to chatGPT,
awdl
stands for Apple Wireless Direct Link, andllw
stands for Low-Latency Wi-Fi)But their interface index (i.e. scope_id in IPv6) are different.
As
Zeroconf.intf_socks
uses IP address as its key, these two interfaces are merged into a single entry in theintf_socks
map, and later failed the test when checkingmetrics["unregister-resend"]
.This patch is to use
Interface
as the key instead to identify each interface even when they share the same IPv6 address. Also simplify the value type to beSocket
instead ofstruct IntfSock
.