-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[client] fix ios network addresses mac filter #5906
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.
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3313c3e
fix(client): skip MAC address filter for network addresses on iOS
pappz 5472c10
fix(client): filter link-local addresses from iOS network addresses
pappz 8cbbd66
fix(client): filter all multicast addresses and handle parse errors s…
pappz e5811dd
fix(client): leave Mac empty in iOS network addresses
pappz 3118ad2
refactor(client): extract toNetworkAddress helper on iOS
pappz 7bcb3f3
refactor(client): extract toNetworkAddress helper on non-iOS
pappz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| //go:build !ios | ||
|
|
||
| package system | ||
|
|
||
| import ( | ||
| "net" | ||
| "net/netip" | ||
| ) | ||
|
|
||
| func networkAddresses() ([]NetworkAddress, error) { | ||
| interfaces, err := net.Interfaces() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| var netAddresses []NetworkAddress | ||
| for _, iface := range interfaces { | ||
| if iface.Flags&net.FlagUp == 0 { | ||
| continue | ||
| } | ||
| if iface.HardwareAddr.String() == "" { | ||
| continue | ||
| } | ||
| addrs, err := iface.Addrs() | ||
| if err != nil { | ||
| continue | ||
| } | ||
|
|
||
| mac := iface.HardwareAddr.String() | ||
| for _, address := range addrs { | ||
| netAddr, ok := toNetworkAddress(address, mac) | ||
| if !ok { | ||
| continue | ||
| } | ||
| if isDuplicated(netAddresses, netAddr) { | ||
| continue | ||
| } | ||
| netAddresses = append(netAddresses, netAddr) | ||
| } | ||
| } | ||
| return netAddresses, nil | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| } | ||
|
|
||
| func toNetworkAddress(address net.Addr, mac string) (NetworkAddress, bool) { | ||
| ipNet, ok := address.(*net.IPNet) | ||
| if !ok { | ||
| return NetworkAddress{}, false | ||
| } | ||
| if ipNet.IP.IsLoopback() { | ||
| return NetworkAddress{}, false | ||
| } | ||
| prefix, err := netip.ParsePrefix(ipNet.String()) | ||
| if err != nil { | ||
| return NetworkAddress{}, false | ||
| } | ||
| return NetworkAddress{NetIP: prefix, Mac: mac}, true | ||
| } | ||
|
|
||
| func isDuplicated(addresses []NetworkAddress, addr NetworkAddress) bool { | ||
| for _, duplicated := range addresses { | ||
| if duplicated.NetIP == addr.NetIP { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.