dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the RP handler. Thank you Lance Tollenaar! (#323)

Browse Source 
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-08-14 10:19:36 -05:00
committed by GitHub
parent 319a1dfd23
commit 2349264d81
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/atmega168/h_rp.c
+14 -18
View File
@@ -45,7 +45,7 @@
/* Encodes the property APDU and returns the length, /* Encodes the property APDU and returns the length,
or sets the error, and returns -1 */ or sets the error, and returns -1 */
static int Encode_Property_APDU(uint8_t *apdu, BACNET_READ_PROPERTY_DATA *rpdata) static int Encode_Property_APDU(BACNET_READ_PROPERTY_DATA *rpdata)
{ {
int apdu_len = -1; int apdu_len = -1;
@@ -115,30 +115,26 @@ void handler_read_property(uint8_t *service_request,
/* most cases will be error */ /* most cases will be error */
ack_len = rp_ack_encode_apdu_init( ack_len = rp_ack_encode_apdu_init(
&Handler_Transmit_Buffer[pdu_len], service_data->invoke_id, &data); &Handler_Transmit_Buffer[pdu_len], service_data->invoke_id, &data);
/* FIXME: add buffer len as passed into function or use smart buffer */ data.application_data = &Handler_Transmit_Buffer[pdu_len + ack_len];
data.application_data_len = sizeof(Handler_Transmit_Buffer) -
(pdu_len + ack_len);
data.error_class = ERROR_CLASS_OBJECT; data.error_class = ERROR_CLASS_OBJECT;
data.error_code = ERROR_CODE_UNKNOWN_OBJECT; data.error_code = ERROR_CODE_UNKNOWN_OBJECT;
property_len = Encode_Property_APDU( property_len = Encode_Property_APDU(&data);
&Handler_Transmit_Buffer[pdu_len + ack_len], &data);
if (property_len >= 0) { if (property_len >= 0) {
len = rp_ack_encode_apdu_object_property_end( len = rp_ack_encode_apdu_object_property_end(
&Handler_Transmit_Buffer[pdu_len + property_len + ack_len]); &Handler_Transmit_Buffer[pdu_len + property_len + ack_len]);
len += ack_len + property_len; len += ack_len + property_len;
} else if (property_len == BACNET_STATUS_ABORT) {
/* BACnet APDU too small to fit data,
so proper response is Abort */
len = abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
} else { } else {
switch (property_len) { len = bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
/* BACnet APDU too small to fit data, so proper response is service_data->invoke_id, SERVICE_CONFIRMED_READ_PROPERTY,
* Abort */ data.error_class, data.error_code);
case BACNET_STATUS_ABORT:
len = abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id,
ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
break;
default:
len = bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, SERVICE_CONFIRMED_READ_PROPERTY,
data.error_class, data.error_code);
break;
}
} }
RP_ABORT: RP_ABORT:
pdu_len += len; pdu_len += len;