Return ErrNotImplemented from unixgramListener on windows and linux

Author: vyasgun

cmd/crc/cmd/daemon.go

@@ -14,17 +14,17 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/crc-org/crc/v2/pkg/crc/api/client"
-	"github.com/crc-org/crc/v2/pkg/crc/daemonclient"
-
 	"github.com/containers/gvisor-tap-vsock/pkg/types"
 	"github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork"
 	"github.com/crc-org/crc/v2/pkg/crc/adminhelper"
 	"github.com/crc-org/crc/v2/pkg/crc/api"
+	"github.com/crc-org/crc/v2/pkg/crc/api/client"
 	"github.com/crc-org/crc/v2/pkg/crc/api/events"
 	crcConfig "github.com/crc-org/crc/v2/pkg/crc/config"
 	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/daemonclient"
 	"github.com/crc-org/crc/v2/pkg/crc/logging"
+	"github.com/crc-org/machine/libmachine/drivers"
 	"github.com/docker/go-units"
 	"github.com/gorilla/handlers"
 	"github.com/pkg/errors"
@@ -214,11 +214,16 @@ func run(configuration *types.Configuration) error {
 		for {
 			ctx, cancel := context.WithCancel(context.Background())
 			conn, err := unixgramListener(ctx, vn)
+			if err != nil && errors.Is(err, drivers.ErrNotImplemented) {
+				cancel()
+				break
+			}
 			if err != nil && !errors.Is(err, net.ErrClosed) {
 				logging.Errorf("unixgramListener error: %v", err)
 			}
+
 			if oldCancel != nil {
-				logging.Warnf("New connection from %s. Closing old connection", conn.LocalAddr().String())
+				logging.Warnf("New connection to %s. Closing old connection", conn.LocalAddr().String())
 				oldCancel()
 			}
 			oldCancel = cancel

cmd/crc/cmd/daemon_darwin.go

@@ -39,7 +39,7 @@ func unixgramListener(ctx context.Context, vn *virtualnetwork.VirtualNetwork) (*
 	if err != nil {
 		return conn, 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")

cmd/crc/cmd/daemon_linux.go

@@ -8,11 +8,11 @@ import (
 
 	"github.com/containers/gvisor-tap-vsock/pkg/transport"
 	"github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork"
-	"github.com/crc-org/crc/v2/pkg/crc/constants"
-	"github.com/crc-org/crc/v2/pkg/crc/logging"
-
 	"github.com/coreos/go-systemd/v22/activation"
 	"github.com/coreos/go-systemd/v22/daemon"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/logging"
+	"github.com/crc-org/machine/libmachine/drivers"
 	"github.com/mdlayher/vsock"
 )
 
@@ -127,7 +127,7 @@ func httpListener() (net.Listener, error) {
 }
 
 func unixgramListener(_ context.Context, _ *virtualnetwork.VirtualNetwork) (*net.UnixConn, error) {
-	return nil, nil
+	return nil, drivers.ErrNotImplemented
 }
 
 func startupDone() {

cmd/crc/cmd/daemon_windows.go

@@ -9,6 +9,7 @@ import (
 	"github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork"
 	"github.com/crc-org/crc/v2/pkg/crc/constants"
 	"github.com/crc-org/crc/v2/pkg/crc/logging"
+	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func vsockListener() (net.Listener, error) {
@@ -38,7 +39,7 @@ func checkIfDaemonIsRunning() (bool, error) {
 }
 
 func unixgramListener(_ context.Context, _ *virtualnetwork.VirtualNetwork) (*net.UnixConn, error) {
-	return nil, nil
+	return nil, drivers.ErrNotImplemented
 }
 
 func startupDone() {