fix netiputil

Signed-off-by: walnuts1018 <[email protected]>
cybozu-go · Aug 29, 2024 · a141c87 · a141c87
1 parent 80cbe71
commit a141c87
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/pkg/util/netiputil/netiputil.go b/pkg/util/netiputil/netiputil.go
@@ -10,7 +10,12 @@ func FromAddr(addr netip.Addr) net.IP {
 }
 
 func ToAddr(ip net.IP) (netip.Addr, bool) {
-	return netip.AddrFromSlice(ip)
+	if f := ip.To4(); f != nil {
+		return netip.AddrFromSlice(f)
+	} else if f := ip.To16(); f != nil {
+		return netip.AddrFromSlice(f)
+	}
+	return netip.Addr{}, false
 }
 
 func IsFamilyMatched(a, b netip.Addr) bool {

diff --git a/pkg/util/netiputil/netiputil_test.go b/pkg/util/netiputil/netiputil_test.go
@@ -107,7 +107,20 @@ func TestFromAddr(t *testing.T) {
 		args args
 		want net.IP
 	}{
-		// TODO: Add test cases.
+		{
+			name: "1",
+			args: args{
+				addr: netip.MustParseAddr("10.244.0.1"),
+			},
+			want: net.ParseIP("10.244.0.1").To4(),
+		},
+		{
+			name: "2",
+			args: args{
+				addr: netip.MustParseAddr("ffcc::1"),
+			},
+			want: net.ParseIP("ffcc::1").To16(),
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {