Fix handling ship error state handling

The connection wasn’t closed and thus the device in a stalled process

Author: DerAndereAndi

ship/connection.go

@@ -114,7 +114,10 @@ func (c *ShipConnection) CloseConnection(safe bool, reason string) {
 			}
 
 			_ = c.sendShipModel(model.MsgTypeEnd, closeMessage)
-			return
+
+			if c.smeState != smeError {
+				return
+			}
 		}
 
 		c.DataHandler.CloseDataConnection()

ship/handshake.go

@@ -77,22 +77,26 @@ func (c *ShipConnection) getState() shipMessageExchangeState {
 // handle handshake state transitions
 func (c *ShipConnection) handleState(timeout bool, message []byte) {
 	switch c.getState() {
+	case smeError:
+		logging.Log.Debug(c.RemoteSKI, "connection is in error state")
+		return
+
 	// cmiStateInit
 	case cmiStateInitStart:
 		// triggered without a message received
 		c.handshakeInit_cmiStateInitStart()
 
 	case cmiStateClientWait:
 		if timeout {
-			c.endHandshakeWithError(errors.New("ship handshake timeout"))
+			c.endHandshakeWithError(errors.New("ship client handshake timeout"))
 			return
 		}
 
 		c.handshakeInit_cmiStateClientWait(message)
 
 	case cmiStateServerWait:
 		if timeout {
-			c.endHandshakeWithError(errors.New("ship handshake timeout"))
+			c.endHandshakeWithError(errors.New("ship server handshake timeout"))
 			return
 		}
 		c.handshakeInit_cmiStateServerWait(message)

ship/hs_helper_test.go

@@ -13,6 +13,8 @@ type dataHandlerTest struct {
 	sentMessage []byte
 
 	mux sync.Mutex
+
+	handleConnectionClosedInvoked bool
 }
 
 func (s *dataHandlerTest) lastMessage() []byte {
@@ -44,9 +46,11 @@ func (s *dataHandlerTest) HandleClosedConnection(connection *ShipConnection) {}
 
 var _ ShipServiceDataProvider = (*dataHandlerTest)(nil)
 
-func (s *dataHandlerTest) IsRemoteServiceForSKIPaired(string) bool      { return true }
-func (s *dataHandlerTest) HandleConnectionClosed(*ShipConnection, bool) {}
-func (s *dataHandlerTest) ReportServiceShipID(string, string)           {}
+func (s *dataHandlerTest) IsRemoteServiceForSKIPaired(string) bool { return true }
+func (s *dataHandlerTest) HandleConnectionClosed(*ShipConnection, bool) {
+	s.handleConnectionClosedInvoked = true
+}
+func (s *dataHandlerTest) ReportServiceShipID(string, string) {}
 
 func initTest(role shipRole) (*ShipConnection, *dataHandlerTest) {
 	localDevice := spine.NewDeviceLocalImpl("TestBrandName", "TestDeviceModel", "TestSerialNumber", "TestDeviceCode",

ship/hs_init_client_test.go

@@ -58,6 +58,20 @@ func (s *InitClientSuite) Test_ClientWait() {
 	shutdownTest(sut)
 }
 
+func (s *InitClientSuite) Test_ClientWait_Timeout() {
+	sut, data := initTest(s.role)
+
+	sut.setState(cmiStateClientWait)
+
+	sut.handleState(true, nil)
+
+	assert.Equal(s.T(), smeError, sut.getState())
+	assert.NotNil(s.T(), data.lastMessage())
+	assert.Equal(s.T(), data.handleConnectionClosedInvoked, true)
+
+	shutdownTest(sut)
+}
+
 func (s *InitClientSuite) Test_ClientWait_InvalidMsgType() {
 	sut, data := initTest(s.role)