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

Removed error in case of AtomicReadFile stream data since by then it will always be valid data. Thank you Süleyman Efendi!

Browse Source
This commit is contained in:
skarg
2016-04-05 20:40:30 +00:00
parent fcb8c0b86a
commit 4c4ff4de7b
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_arf.c
+7 -12
View File
@@ -148,20 +148,15 @@ void handler_atomic_read_file(
} else if (data.access == FILE_STREAM_ACCESS) { } else if (data.access == FILE_STREAM_ACCESS) {
if (data.type.stream.requestedOctetCount < if (data.type.stream.requestedOctetCount <
octetstring_capacity(&data.fileData[0])) { octetstring_capacity(&data.fileData[0])) {
if (bacfile_read_stream_data(&data)) { bacfile_read_stream_data(&data)
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "ARF: Stream offset %d, %d octets.\n", fprintf(stderr, "ARF: Stream offset %d, %d octets.\n",
data.type.stream.fileStartPosition, data.type.stream.fileStartPosition,
data.type.stream.requestedOctetCount); data.type.stream.requestedOctetCount);
#endif #endif
len = len =
arf_ack_encode_apdu(&Handler_Transmit_Buffer[pdu_len], arf_ack_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, &data); service_data->invoke_id, &data);
} else {
error = true;
error_class = ERROR_CLASS_OBJECT;
error_code = ERROR_CODE_FILE_ACCESS_DENIED;
}
} else { } else {
len = len =
abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len], abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],