Add unit tests for controlsvc

pkg/controlsvc/connect.go

@@ -83,7 +83,7 @@ func (c *connectCommand) ControlFunc(_ context.Context, nc NetceptorForControlCo
 	if err != nil {
 		return nil, err
 	}
-	err = cfo.BridgeConn("Connecting\n", rc, "connected service", nc.GetLogger())
+	err = cfo.BridgeConn("Connecting\n", rc, "connected service", nc.GetLogger(), &Util{})
 	if err != nil {
 		return nil, err
 	}

pkg/controlsvc/controlsvc.go

@@ -81,16 +81,13 @@ func (t *Tls) NewListener(inner net.Listener, config *tls.Config) net.Listener {
 
 // SockControl implements the ControlFuncOperations interface that is passed back to control functions.
 type SockControl struct {
-	conn  net.Conn
-	utils Utiler
-	io    Copier
+	conn net.Conn
 }
 
-func NewSockControl(conn net.Conn, utils Utiler, copier Copier) *SockControl {
+// func NewSockControl(conn net.Conn, utils Utiler, copier Copier) *SockControl {
+func NewSockControl(conn net.Conn) *SockControl {
 	return &SockControl{
-		conn:  conn,
-		utils: utils,
-		io:    copier,
+		conn: conn,
 	}
 }
 
@@ -110,21 +107,21 @@ func (s *SockControl) WriteMessage(message string) error {
 }
 
 // BridgeConn bridges the socket to another socket.
-func (s *SockControl) BridgeConn(message string, bc io.ReadWriteCloser, bcName string, logger *logger.ReceptorLogger) error {
+func (s *SockControl) BridgeConn(message string, bc io.ReadWriteCloser, bcName string, logger *logger.ReceptorLogger, utils Utiler) error {
 	if err := s.WriteMessage(message); err != nil {
 		return err
 	}
-	s.utils.BridgeConns(s.conn, "control service", bc, bcName, logger)
+	utils.BridgeConns(s.conn, "control service", bc, bcName, logger)
 
 	return nil
 }
 
 // ReadFromConn copies from the socket to an io.Writer, until EOF.
-func (s *SockControl) ReadFromConn(message string, out io.Writer) error {
+func (s *SockControl) ReadFromConn(message string, out io.Writer, io Copier) error {
 	if err := s.WriteMessage(message); err != nil {
 		return err
 	}
-	if _, err := s.io.Copy(out, s.conn); err != nil {
+	if _, err := io.Copy(out, s.conn); err != nil {
 		return err
 	}
 
@@ -155,10 +152,9 @@ type Server struct {
 	nc              NetceptorForControlsvc
 	controlFuncLock sync.RWMutex
 	controlTypes    map[string]ControlCommandType
-	// new stuff
-	serverUtils Utiler
-	serverNet   Neter
-	serverTls   Tlser
+	serverUtils     Utiler
+	serverNet       Neter
+	serverTls       Tlser
 }
 
 // New returns a new instance of a control service.
@@ -318,7 +314,7 @@ func (s *Server) RunControlSession(conn net.Conn) {
 		}
 		s.controlFuncLock.RUnlock()
 		if ct != nil {
-			cfo := NewSockControl(conn, &Util{}, &SocketConnIO{})
+			cfo := NewSockControl(conn)
 
 			var cfr map[string]interface{}
 			var cc ControlCommand
@@ -469,12 +465,10 @@ func (s *Server) RunControlSvc(ctx context.Context, service string, tlscfg *tls.
 		}
 	}()
 	for _, listener := range []net.Listener{uli, tli, li} {
-		if reflect.ValueOf(listener).IsNil() {
+		if listener == nil || reflect.ValueOf(listener).IsNil() {
 			continue
 		}
-		if listener != nil {
-			go s.ConnectionListener(ctx, listener)
-		}
+		go s.ConnectionListener(ctx, listener)
 	}
 
 	return nil