fix: fix ip is IsUnspecified

hertz-contrib · Jun 29, 2024 · 9267754 · 9267754
1 parent 11c3cac
commit 9267754
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/consul/utils.go b/consul/utils.go
@@ -35,7 +35,8 @@ func parseAddr(addr net.Addr) (host string, port int, err error) {
 		return "", 0, fmt.Errorf("calling net.SplitHostPort failed, addr: %s, err: %w", addr.String(), err)
 	}
 
-	if host == "" || host == "::" {
+	ip := net.ParseIP(host)
+	if ip == nil || ip.IsUnspecified() {
 		detectHost := utils.LocalIP()
 		if detectHost == utils.UNKNOWN_IP_ADDR {
 			return "", 0, fmt.Errorf("get local ip error")

diff --git a/etcd/registry.go b/etcd/registry.go
@@ -265,7 +265,8 @@ func (e *etcdRegistry) getAddressOfRegistration(info *registry.Info) (string, er
 	}
 
 	// if host is empty or "::", use local ipv4 address as host
-	if host == "" || host == "::" {
+	ip := net.ParseIP(host)
+	if ip == nil || ip.IsUnspecified() {
 		host, err = getLocalIPv4Host()
 		if err != nil {
 			return "", fmt.Errorf("parse registry info addr error: %w", err)

diff --git a/eureka/registry.go b/eureka/registry.go
@@ -175,7 +175,8 @@ func (e *eurekaRegistry) eurekaInstance(info *registry.Info) (*fargo.Instance, e
 	if portStr == "" {
 		return nil, fmt.Errorf("registry info addr missing port")
 	}
-	if host == "" || host == "::" {
+	ip := net.ParseIP(host)
+	if ip == nil || ip.IsUnspecified() {
 		host = utils.LocalIP()
 		if host == utils.UNKNOWN_IP_ADDR {
 			return nil, fmt.Errorf("get local ip error")

diff --git a/nacos/registry.go b/nacos/registry.go
@@ -71,7 +71,8 @@ func (n *nacosRegistry) Register(info *registry.Info) error {
 	if err != nil {
 		return fmt.Errorf("parse registry info port error: %w", err)
 	}
-	if host == "" || host == "::" {
+	ip := net.ParseIP(host)
+	if ip == nil || ip.IsUnspecified() {
 		host = utils.LocalIP()
 	}
 	success, err := n.client.RegisterInstance(vo.RegisterInstanceParam{
@@ -121,7 +122,8 @@ func (n *nacosRegistry) Deregister(info *registry.Info) error {
 	if err != nil {
 		return fmt.Errorf("parse registry info port error: %w", err)
 	}
-	if host == "" || host == "::" {
+	ip := net.ParseIP(host)
+	if ip == nil || ip.IsUnspecified() {
 		host = utils.LocalIP()
 	}
 	success, err := n.client.DeregisterInstance(vo.DeregisterInstanceParam{

diff --git a/nacos/v2/registry.go b/nacos/v2/registry.go
@@ -69,7 +69,8 @@ func (n *nacosRegistry) Register(info *registry.Info) error {
 	if err != nil {
 		return fmt.Errorf("parse registry info port error: %w", err)
 	}
-	if host == "" || host == "::" {
+	ip := net.ParseIP(host)
+	if ip == nil || ip.IsUnspecified() {
 		host = utils.LocalIP()
 	}
 	success, err := n.client.RegisterInstance(vo.RegisterInstanceParam{
@@ -106,7 +107,8 @@ func (n *nacosRegistry) Deregister(info *registry.Info) error {
 	if err != nil {
 		return fmt.Errorf("parse registry info port error: %w", err)
 	}
-	if host == "" || host == "::" {
+	ip := net.ParseIP(host)
+	if ip == nil || ip.IsUnspecified() {
 		host = utils.LocalIP()
 	}
 	success, err := n.client.DeregisterInstance(vo.DeregisterInstanceParam{

diff --git a/polaris/common.go b/polaris/common.go
@@ -88,7 +88,8 @@ func GetInfoHostAndPort(Addr string) (string, int, error) {
 	if port == "" {
 		return infoHost, 0, fmt.Errorf("registry info addr missing port")
 	}
-	if infoHost == "" || infoHost == "::" {
+	ip := net.ParseIP(infoHost)
+	if ip == nil || ip.IsUnspecified() {
 		infoHost = utils.LocalIP()
 		if infoHost == utils.UNKNOWN_IP_ADDR {
 			return "", 0, fmt.Errorf("get local ip error")

diff --git a/servicecomb/registry.go b/servicecomb/registry.go
@@ -264,7 +264,8 @@ func (scr *serviceCombRegistry) parseAddr(s string) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("parse addr error: %w", err)
 	}
-	if host == "" || host == "::" {
+	ip := net.ParseIP(host)
+	if ip == nil || ip.IsUnspecified() {
 		host = utils.LocalIP()
 		if host == utils.UNKNOWN_IP_ADDR {
 			return "", errors.New("get local ip error")

diff --git a/zookeeper/registry.go b/zookeeper/registry.go
@@ -120,7 +120,8 @@ func buildPath(info *registry.Info) (string, error) {
 	if port == "" {
 		return "", fmt.Errorf("registry info addr missing port")
 	}
-	if host == "" || host == "::" {
+	ip := net.ParseIP(host)
+	if ip == nil || ip.IsUnspecified() {
 		host = utils.LocalIP()
 	}
 	path = path + Separator + net.JoinHostPort(host, port)