[vchanmanager] Move lock inside vchan

We should lock only creating and closing vchan API. Currently we lock also
tls handshake as result open channel was blocked till secure channel is created.

Signed-off-by: Oleksandr Grytsov <[email protected]>

vchanmanager/vchan.go

@@ -26,6 +26,7 @@ import (
 	"crypto/tls"
 	"errors"
 	"net"
+	"sync"
 	"syscall"
 	"time"
 	"unsafe"
@@ -111,6 +112,8 @@ var (
 	errWriteVChan            = errors.New("write failed")
 )
 
+var lock sync.Mutex //nolint: gochecknoglobals
+
 /***********************************************************************************************************************
  * Public
  **********************************************************************************************************************/
@@ -265,6 +268,9 @@ func (vc *connection) Write(buffer []byte) (int, error) {
 }
 
 func (vc *connection) Close() error {
+	lock.Lock()
+	defer lock.Unlock()
+
 	if vc.vchanReader != nil {
 		log.WithFields(log.Fields{"name": vc.name}).Debug("Close read vchan")
 
@@ -311,6 +317,9 @@ func (v *VChan) newConnection(name string) (conn *connection, err error) {
 		}
 	}()
 
+	lock.Lock()
+	defer lock.Unlock()
+
 	log.WithFields(log.Fields{"rxPath": v.xsRxPath, "txPath": v.xsTxPath}).Debug("New connection")
 
 	conn = &connection{name: name}

vchanmanager/vchanmanager.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"os"
 	"reflect"
-	"sync"
 	"time"
 
 	"github.com/aoscloud/aos_common/aoserrors"
@@ -86,8 +85,6 @@ type Message struct {
 
 // Vchan vchan instance.
 type VChanManager struct {
-	sync.Mutex
-
 	vchanOpen        VChanItf
 	vchanSecure      VChanItf
 	recvSMChan       chan []byte
@@ -292,10 +289,7 @@ func (v *VChanManager) GetAllNodeIDs(context context.Context,
 
 func (v *VChanManager) run(ctx context.Context, name string, vchan VChanItf, sendChan chan Message) {
 	for {
-		v.Lock()
 		err := vchan.Connect(ctx, name)
-		v.Unlock()
-
 		if err == nil {
 			errCh := make(chan error, 2) //nolint:gomnd // 2 is enough
 			localCtx, cancel := context.WithCancel(ctx)
@@ -312,11 +306,9 @@ func (v *VChanManager) run(ctx context.Context, name string, vchan VChanItf, sen
 			case err := <-errCh:
 				log.Errorf("Failed to read/write from/to vchan: %v", err)
 
-				v.Lock()
 				if err = vchan.Disconnect(); err != nil {
 					log.Errorf("Failed to disconnect from vchan: %v", err)
 				}
-				v.Unlock()
 
 				cancel()
 			}