unixgram: close previous vfkit connection using cancel context

Author: vyasgun

cmd/crc/cmd/daemon.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -209,11 +210,20 @@ func run(configuration *types.Configuration) error {
 	}()
 
 	go func() {
+		var ctx context.Context
+		var cancel context.CancelFunc
 		for {
-			_, err := unixgramListener(vn)
+			conn, err := setupUnixgramListener()
 			if err != nil && !errors.Is(err, net.ErrClosed) {
 				logging.Errorf("unixgramListener error: %v", err)
 			}
+			if cancel != nil {
+				logging.Warnf("New connection to %s. Closing old connection", constants.UnixgramSocketPath)
+				cancel()
+			}
+
+			ctx, cancel = context.WithCancel(context.Background())
+			go handleUnixgramConnection(ctx, vn, conn)
 			time.Sleep(1 * time.Second)
 		}
 	}()

cmd/crc/cmd/daemon_darwin.go

@@ -33,25 +33,26 @@ func httpListener() (net.Listener, error) {
 	return ln, nil
 }
 
-func unixgramListener(vn *virtualnetwork.VirtualNetwork) (*net.UnixConn, error) {
+func setupUnixgramListener() (net.Conn, error) {
 	_ = os.Remove(constants.UnixgramSocketPath)
 	conn, err := transport.ListenUnixgram(fmt.Sprintf("unixgram://%v", constants.UnixgramSocketPath))
 	if err != nil {
-		return conn, errors.Wrap(err, "failed to listen unixgram")
+		return nil, errors.Wrap(err, "failed to listen unixgram")
 	}
-	logging.Infof("listening on %s:", constants.UnixgramSocketPath)
+	logging.Infof("listening on %s", constants.UnixgramSocketPath)
 	vfkitConn, err := transport.AcceptVfkit(conn)
 	if err != nil {
-		return conn, errors.Wrap(err, "failed to accept vfkit connection")
+		return nil, errors.Wrap(err, "failed to accept vfkit connection")
 	}
-	go func() {
-		err := vn.AcceptVfkit(context.Background(), vfkitConn)
-		if err != nil {
-			logging.Errorf("failed to accept vfkit connection: %v", err)
-			return
-		}
-	}()
-	return conn, err
+	return vfkitConn, nil
+}
+
+func handleUnixgramConnection(ctx context.Context, vn *virtualnetwork.VirtualNetwork, vfkitConn net.Conn) {
+	defer vfkitConn.Close()
+	if err := vn.AcceptVfkit(ctx, vfkitConn); err != nil {
+		logging.Errorf("failed to accept vfkit connection: %v", err)
+	}
+	logging.Debugf("Closed connection from %s", vfkitConn.LocalAddr().String())
 }
 
 func checkIfDaemonIsRunning() (bool, error) {