fix(bacnet): use BACnetConfirmedServiceChoice where appropriate

apache · Nov 9, 2022 · ba86633 · ba86633
1 parent e6de5d5
commit ba86633
Show file tree

Hide file tree

Showing 7 changed files with 259 additions and 38 deletions.
diff --git a/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
diff --git a/plc4go/protocols/bacnetip/readwrite/model/StaticHelper.go b/plc4go/protocols/bacnetip/readwrite/model/StaticHelper.go
@@ -798,8 +798,7 @@ func CreateBACnetContextTagUnsignedInteger(tagNumber uint8, value uint) BACnetCo
 	return NewBACnetContextTagUnsignedInteger(payload, header, tagNumber)
 }
 
-func CreateUnsignedPayload(value uint) (uint32, BACnetTagPayloadUnsignedInteger) {
-	var length uint32
+func CreateUnsignedPayload(value uint) (length uint32, payload BACnetTagPayloadUnsignedInteger) {
 	var valueUint8 *uint8
 	var valueUint16 *uint16
 	var valueUint24 *uint32
@@ -827,8 +826,8 @@ func CreateUnsignedPayload(value uint) (uint32, BACnetTagPayloadUnsignedInteger)
 		valueUint32_ := uint32(value)
 		valueUint32 = &valueUint32_
 	}
-	payload := NewBACnetTagPayloadUnsignedInteger(valueUint8, valueUint16, valueUint24, valueUint32, valueUint40, valueUint48, valueUint56, valueUint64, length)
-	return length, payload
+	payload = NewBACnetTagPayloadUnsignedInteger(valueUint8, valueUint16, valueUint24, valueUint32, valueUint40, valueUint48, valueUint56, valueUint64, length)
+	return
 }
 
 func CreateBACnetApplicationTagSignedInteger(value int) BACnetApplicationTagSignedInteger {

diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -297,7 +297,8 @@
             [validation '(!segmentedMessage && serviceRequest != null) || segmentedMessage'
                         "service request should be set"                     ]
             // When we read the first segment we want the service choice to be part of the bytes so we only read it > 0
-            [optional uint 8    segmentServiceChoice 'segmentedMessage && sequenceNumber != 0']
+            [optional BACnetConfirmedServiceChoice
+                                segmentServiceChoice 'segmentedMessage && sequenceNumber != 0']
             [virtual  uint 16   segmentReduction
                                     '(segmentServiceChoice != null)?(apduHeaderReduction+1):apduHeaderReduction'       ]
             [array    byte      segment
@@ -312,7 +313,8 @@
         ['SIMPLE_ACK_PDU' *SimpleAck
             [reserved uint 4    '0'                                     ]
             [simple   uint 8    originalInvokeId                        ]
-            [simple   uint 8    serviceChoice                           ]
+            [simple   BACnetConfirmedServiceChoice
+                                serviceChoice                           ]
         ]
         ['COMPLEX_ACK_PDU' *ComplexAck
             [simple   bit       segmentedMessage                        ]
@@ -329,7 +331,8 @@
             [validation '(!segmentedMessage && serviceAck != null) || segmentedMessage'
                         "service ack should be set"                     ]
             // When we read the first segment we want the service choice to be part of the bytes so we only read it > 0
-            [optional uint 8    segmentServiceChoice 'segmentedMessage && sequenceNumber != 0']
+            [optional BACnetConfirmedServiceChoice
+                                segmentServiceChoice 'segmentedMessage && sequenceNumber != 0']
             [virtual  uint 16   segmentReduction
                                     '(segmentServiceChoice != null)?(apduHeaderReduction+1):apduHeaderReduction'
                                                                         ]