You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/04/28 12:07:45 UTC
[plc4x] 01/02: fix(bacnet): fixed offset for service request
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit a2b633299abe38d42cff89cfe2f96ef238ae5620
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Apr 28 14:03:28 2022 +0200
fix(bacnet): fixed offset for service request
---
plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go | 2 +-
protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
index a8b319c126..87f96f10ad 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
@@ -324,7 +324,7 @@ func APDUConfirmedRequestParse(readBuffer utils.ReadBuffer, apduLength uint16) (
if pullErr := readBuffer.PullContext("serviceRequest"); pullErr != nil {
return nil, pullErr
}
- _serviceRequest, _serviceRequestErr := BACnetConfirmedServiceRequestParse(readBuffer, uint16(uint16(apduLength)-uint16(uint16(uint16(uint16(3))+uint16(uint16(utils.InlineIf(segmentedMessage, func() interface{} { return uint16(uint16(2)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)))))))
+ _serviceRequest, _serviceRequestErr := BACnetConfirmedServiceRequestParse(readBuffer, uint16(uint16(apduLength)-uint16(uint16(uint16(uint16(4))+uint16(uint16(utils.InlineIf(segmentedMessage, func() interface{} { return uint16(uint16(2)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)))))))
if _serviceRequestErr != nil {
return nil, errors.Wrap(_serviceRequestErr, "Error parsing 'serviceRequest' field")
}
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
index 4249dcc91f..d3b5db0849 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -210,7 +210,7 @@
[simple uint 8 invokeId ]
[optional uint 8 sequenceNumber 'segmentedMessage' ]
[optional uint 8 proposedWindowSize 'segmentedMessage' ]
- [simple BACnetConfirmedServiceRequest('apduLength - (3 + (segmentedMessage ? 2 : 0))')
+ [simple BACnetConfirmedServiceRequest('apduLength - (4 + (segmentedMessage ? 2 : 0))')
serviceRequest ]
]
['0x1' APDUUnconfirmedRequest