Fix vm freeze for invalid leases in user-v2

Signed-off-by: Balaji Vijayakumar <[email protected]>

Author: balajiv113

pkg/cidata/cidata.go

@@ -146,7 +146,7 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 		args.SlirpGateway = usernet.GatewayIP(subnet)
 		args.SlirpDNS = usernet.GatewayIP(subnet)
 	} else {
-		subnet, err = usernet.ParseSubnet(networks.SlirpNetwork)
+		subnet, _, err = net.ParseCIDR(networks.SlirpNetwork)
 		if err != nil {
 			return err
 		}

pkg/networks/usernet/config.go

@@ -84,15 +84,6 @@ func Subnet(name string) (net.IP, error) {
 	return ipNet.IP, err
 }
 
-// ParseSubnet converts subnet string to net.IP
-func ParseSubnet(subnet string) (net.IP, error) {
-	subnetIP, _, err := net.ParseCIDR(subnet)
-	if err != nil {
-		return nil, err
-	}
-	return subnetIP, nil
-}
-
 // GatewayIP returns the 2nd IP for the given subnet
 func GatewayIP(subnet net.IP) string {
 	return cidr.Inc(cidr.Inc(subnet)).String()

pkg/networks/usernet/config_test.go

@@ -10,14 +10,6 @@ import (
 
 func TestUsernetConfig(t *testing.T) {
 
-	t.Run("parse subnet", func(t *testing.T) {
-		subnet, err := ParseSubnet(networks.SlirpNetwork)
-		if err != nil {
-			t.Fatal(err)
-		}
-		assert.Equal(t, subnet.String(), "192.168.5.0")
-	})
-
 	t.Run("verify dns ip", func(t *testing.T) {
 		subnet, _, err := net.ParseCIDR(networks.SlirpNetwork)
 		if err != nil {

pkg/networks/usernet/gvproxy.go

@@ -40,7 +40,7 @@ var (
 func StartGVisorNetstack(ctx context.Context, gVisorOpts *GVisorNetstackOpts) error {
 	opts = gVisorOpts
 
-	ip, err := ParseSubnet(opts.Subnet)
+	ip, ipNet, err := net.ParseCIDR(opts.Subnet)
 	if err != nil {
 		return err
 	}
@@ -49,7 +49,9 @@ func StartGVisorNetstack(ctx context.Context, gVisorOpts *GVisorNetstackOpts) er
 	leases := map[string]string{}
 	if opts.DefaultLeases != nil {
 		for k, v := range opts.DefaultLeases {
-			leases[k] = v
+			if ipNet.Contains(net.ParseIP(k)) {
+				leases[k] = v
+			}
 		}
 	}
 	leases[gatewayIP] = "5a:94:ef:e4:0c:df"

pkg/vz/vm_darwin.go

@@ -144,7 +144,7 @@ func startUsernet(ctx context.Context, driver *driver.BaseDriver) (*usernet.Clie
 		if err != nil {
 			return nil, err
 		}
-		subnetIP, err := usernet.ParseSubnet(networks.SlirpNetwork)
+		subnetIP, _, err := net.ParseCIDR(networks.SlirpNetwork)
 		return usernet.NewClient(endpointSock, subnetIP), err
 	}
 	nwName := driver.Yaml.Networks[firstUsernetIndex].Lima