fix ipvs proxier getLocalIPs() error

This commit is contained in:
m1093782566
2017-11-13 17:28:41 +08:00
parent 338ee7f5d5
commit 42832e7666
6 changed files with 35 additions and 9 deletions

View File

@@ -32,12 +32,17 @@ func IPPart(s string) string {
return s
}
// Must be IP:port
ip, _, err := net.SplitHostPort(s)
host, _, err := net.SplitHostPort(s)
if err != nil {
glog.Errorf("Error parsing '%s': %v", s, err)
return ""
}
return ip
// Check if host string is a valid IP address
if ip := net.ParseIP(host); ip != nil {
glog.Errorf("invalid IP part '%s'", host)
return host
}
return ""
}
// ToCIDR returns a host address of the form <ip-address>/32 for

View File

@@ -35,6 +35,7 @@ func TestIPPart(t *testing.T) {
{"[2001:db8::2:2]:9999", "2001:db8::2:2", noError},
{"1.2.3.4::9999", "", "too many colons"},
{"1.2.3.4:[0]", "", "unexpected '[' in address"},
{"1.2.3:8080", "", "invalid ip part"},
}
for _, tc := range testCases {