Skip to content
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.

Sign up for GitHub

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

Jump to bottom

net: improve GetIPAddresses() #6

Merged
merged 4 commits into from
Feb 2, 2023
Merged

net: improve GetIPAddresses() #6

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3312a42
Revert "net: change GetIPAddresses() to use netip.ParseAddr() instead…
amery Feb 2, 2023
bc6f2c3
net: Change GetIPAddress() to always return 4in6 as IPv4
amery Feb 2, 2023
7f03383
net: refactor GetIPAddress to reuse the []net.Addr to []netip.Addr co…
amery Feb 2, 2023
9df1368
net: improve GetIPAddresses() case where no interfaces are specified
amery Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
net: refactor GetIPAddress to reuse the []net.Addr to []netip.Addr co… 
…nversion

Signed-off-by: Alejandro Mery <[email protected]>
  • Loading branch information
@amery
amery committed Feb 2, 2023
commit 7f0338368c5e9ad7fdb032374eeb59c3d199747e
32 changes: 19 additions & 13 deletions net.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,29 @@ func GetIPAddresses(ifaces ...string) ([]netip.Addr, error) {
return out, err
}

for _, addr := range addrs {
var s []byte

switch v := addr.(type) {
case *net.IPAddr:
s = v.IP
case *net.IPNet:
s = v.IP
}
out = appendNetIPAsIP(out, addrs...)
}

if ip, ok := netip.AddrFromSlice(s); ok {
out = append(out, ip.Unmap())
}
return out, nil
}

func appendNetIPAsIP(out []netip.Addr, addrs ...net.Addr) []netip.Addr {
for _, addr := range addrs {
var s []byte

switch v := addr.(type) {
case *net.IPAddr:
s = v.IP
case *net.IPNet:
s = v.IP
}

if ip, ok := netip.AddrFromSlice(s); ok {
out = append(out, ip.Unmap())
}
}

return out, nil
return out
}

// GetStringIPAddresses returns IP addresses as string
Expand Down