Don't use To16() != nil to detect IPv6 addresses

CFSworks · CFSworks · commit 88a849626f56 · 2023-09-08T21:44:49.000-06:00
The ip.To16() function returns non-nil if `ip` is any kind
of IP address, including IPv4. To look for IPv6 specifically,
use ip.To4() == nil.

Signed-off-by: Sam Edwards &lt;CFSworks@gmail.com&gt;
diff --git a/pkg/cri/sbserver/sandbox_run.go b/pkg/cri/sbserver/sandbox_run.go
@@ -612,7 +612,7 @@ func selectPodIPs(ctx context.Context, configs []*cni.IPConfig, preference strin
 		}
 	case "ipv6":
 		for i, ip := range configs {
-			if ip.IP.To16() != nil {
+			if ip.IP.To4() == nil {
 				return ipString(ip), append(extra, toStrings(configs[i+1:])...)
 			}
 			extra = append(extra, ipString(ip))
diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go
@@ -692,7 +692,7 @@ func selectPodIPs(ctx context.Context, configs []*cni.IPConfig, preference strin
 		}
 	case "ipv6":
 		for i, ip := range configs {
-			if ip.IP.To16() != nil {
+			if ip.IP.To4() == nil {
 				return ipString(ip), append(extra, toStrings(configs[i+1:])...)
 			}
 			extra = append(extra, ipString(ip))

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ func selectPodIPs(ctx context.Context, configs []*cni.IPConfig, preference strin`
`612`	`612`	`}`
`613`	`613`	`case "ipv6":`
`614`	`614`	`for i, ip := range configs {`
`615`		`- if ip.IP.To16() != nil {`
	`615`	`+ if ip.IP.To4() == nil {`
`616`	`616`	`return ipString(ip), append(extra, toStrings(configs[i+1:])...)`
`617`	`617`	`}`
`618`	`618`	`extra = append(extra, ipString(ip))`
Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ func selectPodIPs(ctx context.Context, configs []*cni.IPConfig, preference strin`
`692`	`692`	`}`
`693`	`693`	`case "ipv6":`
`694`	`694`	`for i, ip := range configs {`
`695`		`- if ip.IP.To16() != nil {`
	`695`	`+ if ip.IP.To4() == nil {`
`696`	`696`	`return ipString(ip), append(extra, toStrings(configs[i+1:])...)`
`697`	`697`	`}`
`698`	`698`	`extra = append(extra, ipString(ip))`