aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-12-14 00:30:20 -0800
committerChris Lu <chris.lu@gmail.com>2020-12-14 00:30:20 -0800
commit021358749bbce20a6d2563506e9f905ef041d8cc (patch)
tree7d188a26ac681a8d577df8a6c811d06621d64be0
parent38fc89d04133ccb686ef4ec226b917070f74a941 (diff)
downloadseaweedfs-021358749bbce20a6d2563506e9f905ef041d8cc.tar.xz
seaweedfs-021358749bbce20a6d2563506e9f905ef041d8cc.zip
better detect IP address
following advice from https://github.com/chrislusf/seaweedfs/issues/1671
-rw-r--r--weed/util/network.go22
1 files changed, 16 insertions, 6 deletions
diff --git a/weed/util/network.go b/weed/util/network.go
index 7108cfea6..55a123667 100644
--- a/weed/util/network.go
+++ b/weed/util/network.go
@@ -7,16 +7,26 @@ import (
)
func DetectedHostAddress() string {
- addrs, err := net.InterfaceAddrs()
+ netInterfaces, err := net.Interfaces()
if err != nil {
- glog.V(0).Infof("failed to detect ip address: %v", err)
+ glog.V(0).Infof("failed to detect net interfaces: %v", err)
return ""
}
- for _, a := range addrs {
- if ipnet, ok := a.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
- if ipnet.IP.To4() != nil {
- return ipnet.IP.String()
+ for _, netInterface := range netInterfaces {
+ if (netInterface.Flags & net.FlagUp) == 0 {
+ continue
+ }
+ addrs, err := netInterface.Addrs()
+ if err != nil {
+ glog.V(0).Infof("get interface addresses: %v", err)
+ }
+
+ for _, a := range addrs {
+ if ipNet, ok := a.(*net.IPNet); ok && !ipNet.IP.IsLoopback() {
+ if ipNet.IP.To4() != nil {
+ return ipNet.IP.String()
+ }
}
}
}