A couple of bugfixes and Microsoft cleanups by Ed
This commit is contained in:
@@ -127,8 +127,19 @@ void handler_alarm_ack(
|
||||
data.ackSource.value, (unsigned long) data.ackProcessIdentifier);
|
||||
#endif
|
||||
|
||||
|
||||
if (Alarm_Ack[data.eventObjectIdentifier.type]) {
|
||||
/* BACnet Testing Observed Incident oi00105
|
||||
ACK of a non-existent object returned the incorrect error code
|
||||
Revealed by BACnet Test Client v1.8.16 ( www.bac-test.com/bacnet-test-client-download )
|
||||
BC 135.1: 9.1.3.3-A
|
||||
Any discussions can be directed to edward@bac-test.com */
|
||||
if (!Device_Valid_Object_Id(data.eventObjectIdentifier.type, data.eventObjectIdentifier.instance))
|
||||
{
|
||||
len =
|
||||
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
|
||||
service_data->invoke_id,
|
||||
SERVICE_CONFIRMED_ACKNOWLEDGE_ALARM, ERROR_CLASS_OBJECT, ERROR_CODE_UNKNOWN_OBJECT);
|
||||
}
|
||||
else if (Alarm_Ack[data.eventObjectIdentifier.type]) {
|
||||
|
||||
ack_result =
|
||||
Alarm_Ack[data.eventObjectIdentifier.type] (&data, &error_code);
|
||||
|
||||
Reference in New Issue
Block a user