From 096cb0ddf85ab07bacab34149c610f654d1adf15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20R=C3=BChl?= Date: Mon, 5 Jun 2023 10:58:16 +0200 Subject: [PATCH] fix(plc4go/eip): fix possible double match in switch --- plc4go/internal/eip/Reader.go | 4 ++-- plc4go/internal/eip/Writer.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plc4go/internal/eip/Reader.go b/plc4go/internal/eip/Reader.go index a38a0d2ce0d..c2013b86c87 100644 --- a/plc4go/internal/eip/Reader.go +++ b/plc4go/internal/eip/Reader.go @@ -198,7 +198,7 @@ func (m *Reader) ToPlc4xReadResponse(response readWriteModel.CipService, readReq plcValues := map[string]values.PlcValue{} responseCodes := map[string]apiModel.PlcResponseCode{} switch response := response.(type) { - case readWriteModel.CipReadResponse: // only 1 tag + case readWriteModel.CipReadResponseExactly: // only 1 tag cipReadResponse := response tagName := readRequest.GetTagNames()[0] tag := readRequest.GetTag(tagName).(EIPPlcTag) @@ -215,7 +215,7 @@ func (m *Reader) ToPlc4xReadResponse(response readWriteModel.CipService, readReq } plcValues[tagName] = plcValue responseCodes[tagName] = code - case readWriteModel.MultipleServiceResponse: //Multiple response + case readWriteModel.MultipleServiceResponseExactly: //Multiple response multipleServiceResponse := response nb := multipleServiceResponse.GetServiceNb() arr := make([]readWriteModel.CipService, nb) diff --git a/plc4go/internal/eip/Writer.go b/plc4go/internal/eip/Writer.go index b04eb3c61da..bd8c19235ef 100644 --- a/plc4go/internal/eip/Writer.go +++ b/plc4go/internal/eip/Writer.go @@ -308,12 +308,12 @@ func encodeValue(value apiValues.PlcValue, _type readWriteModel.CIPDataTypeCode, func (m Writer) ToPlc4xWriteResponse(response readWriteModel.CipService, writeRequest apiModel.PlcWriteRequest) (apiModel.PlcWriteResponse, error) { responseCodes := map[string]apiModel.PlcResponseCode{} switch response := response.(type) { - case readWriteModel.CipWriteResponse: // only 1 tag + case readWriteModel.CipWriteResponseExactly: // only 1 tag cipReadResponse := response tagName := writeRequest.GetTagNames()[0] code := decodeResponseCode(cipReadResponse.GetStatus()) responseCodes[tagName] = code - case readWriteModel.MultipleServiceResponse: //Multiple response + case readWriteModel.MultipleServiceResponseExactly: //Multiple response /* multipleServiceResponse := response nb := multipleServiceResponse.GetServiceNb() arr := make([]readWriteModel.CipService, nb)