gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Update network.go since To16 converts the IP address ip up to a 16-byte representation. If ip is not an IP address (it is the wrong length), To16 returns nil. (#5134)"

Browse source 
This reverts commit 838578b55f.
This commit is contained in:
Chris Lu 2023-12-24 12:32:37 -08:00 committed by GitHub
parent c6b1dc7058
commit 9af2049dfe
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
weed/util/network.go
View file

@ -15,13 +15,18 @@ func DetectedHostAddress() string {
return "" return ""
} }
if v4Address := selectIpV4(netInterfaces); v4Address != "" { if v4Address := selectIpV4(netInterfaces, true); v4Address != "" {
return v4Address return v4Address
} }
if v6Address := selectIpV4(netInterfaces, false); v6Address != "" {
return v6Address
}
return "localhost" return "localhost"
} }
func selectIpV4(netInterfaces []net.Interface) string {
func selectIpV4(netInterfaces []net.Interface, isIpV4 bool) string {
for _, netInterface := range netInterfaces { for _, netInterface := range netInterfaces {
if (netInterface.Flags & net.FlagUp) == 0 { if (netInterface.Flags & net.FlagUp) == 0 {
continue continue
@ -33,9 +38,15 @@ func selectIpV4(netInterfaces []net.Interface) string {
for _, a := range addrs { for _, a := range addrs {
if ipNet, ok := a.(*net.IPNet); ok && !ipNet.IP.IsLoopback() { if ipNet, ok := a.(*net.IPNet); ok && !ipNet.IP.IsLoopback() {
if isIpV4 {
if ipNet.IP.To4() != nil {
return ipNet.IP.String()
}
} else {
if ipNet.IP.To16() != nil { if ipNet.IP.To16() != nil {
return ipNet.IP.String() return ipNet.IP.String()
} }
}
} }
} }
} }