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

Added record access to the AtomicReadFile and AtomicWriteFile data, services, and demos. Thank you, Nikola Jelić!

Browse Source
This commit is contained in:
skarg
2013-08-19 16:05:08 +00:00
parent a1da5ecb8a
commit 8866f38dd9
10 changed files with 292 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_arf.c
+26 -4
View File
@@ -107,6 +107,7 @@ void handler_atomic_read_file(
int pdu_len = 0; int pdu_len = 0;
bool error = false; bool error = false;
int bytes_sent = 0; int bytes_sent = 0;
uint32_t offset = 0;
BACNET_NPDU_DATA npdu_data; BACNET_NPDU_DATA npdu_data;
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT; BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT;
@@ -147,8 +148,8 @@ void handler_atomic_read_file(
error = true; error = true;
} 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)) { octetstring_capacity(&data.fileData[0])) {
if (bacfile_read_data(&data)) { if (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,
@@ -170,9 +171,30 @@ void handler_atomic_read_file(
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "Too Big To Send (%d >= %d). Sending Abort!\n", fprintf(stderr, "Too Big To Send (%d >= %d). Sending Abort!\n",
data.type.stream.requestedOctetCount, data.type.stream.requestedOctetCount,
octetstring_capacity(&data.fileData)); octetstring_capacity(&data.fileData[0]));
#endif #endif
} }
} else if (data.access == FILE_RECORD_ACCESS) {
if (data.type.record.fileStartRecord >=
BACNET_READ_FILE_RECORD_COUNT) {
error_class = ERROR_CLASS_SERVICES;
error_code = ERROR_CODE_INVALID_FILE_START_POSITION;
error = true;
} else if (bacfile_read_stream_data(&data)) {
#if PRINT_ENABLED
fprintf(stderr,
"ARF: fileStartRecord %d, %u RecordCount.\n",
data.type.record.fileStartRecord,
data.type.record.RecordCount);
#endif
len =
arf_ack_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, &data);
} else {
error = true;
error_class = ERROR_CLASS_OBJECT;
error_code = ERROR_CODE_FILE_ACCESS_DENIED;
}
} else { } else {
error = true; error = true;
error_class = ERROR_CLASS_SERVICES; error_class = ERROR_CLASS_SERVICES;
@@ -184,7 +206,7 @@ void handler_atomic_read_file(
} else { } else {
error = true; error = true;
error_class = ERROR_CLASS_SERVICES; error_class = ERROR_CLASS_SERVICES;
error_code = ERROR_CODE_FILE_ACCESS_DENIED; error_code = ERROR_CODE_INCONSISTENT_OBJECT_TYPE;
} }
if (error) { if (error) {
len = len =
bacnet-stack/demo/handler/h_arf_a.c
+1 -1
View File
@@ -72,7 +72,7 @@ void handler_atomic_read_file_ack(
if (data.access == FILE_STREAM_ACCESS) { if (data.access == FILE_STREAM_ACCESS) {
bacfile_read_ack_stream_data(instance, &data); bacfile_read_ack_stream_data(instance, &data);
} else if (data.access == FILE_RECORD_ACCESS) { } else if (data.access == FILE_RECORD_ACCESS) {
/* FIXME: add handling for Record Access */ bacfile_read_ack_record_data(instance, &data);
} }
} }
} }
bacnet-stack/demo/handler/h_awf.c
+17 -2
View File
@@ -130,7 +130,22 @@ void handler_atomic_write_file(
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "AWF: Stream offset %d, %d bytes\n", fprintf(stderr, "AWF: Stream offset %d, %d bytes\n",
data.type.stream.fileStartPosition, data.type.stream.fileStartPosition,
octetstring_length(&data.fileData)); octetstring_length(&data.fileData[0]));
#endif
len =
awf_ack_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, &data);
} else {
error = true;
error_class = ERROR_CLASS_OBJECT;
error_code = ERROR_CODE_FILE_ACCESS_DENIED;
}
} else if (data.access == FILE_RECORD_ACCESS) {
if (bacfile_write_record_data(&data)) {
#if PRINT_ENABLED
fprintf(stderr, "AWF: StartRecord %d, RecordCount %u\n",
data.type.record.fileStartRecord,
data.type.record.returnedRecordCount);
#endif #endif
len = len =
awf_ack_encode_apdu(&Handler_Transmit_Buffer[pdu_len], awf_ack_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
@@ -151,7 +166,7 @@ void handler_atomic_write_file(
} else { } else {
error = true; error = true;
error_class = ERROR_CLASS_SERVICES; error_class = ERROR_CLASS_SERVICES;
error_code = ERROR_CODE_FILE_ACCESS_DENIED; error_code = ERROR_CODE_INCONSISTENT_OBJECT_TYPE;
} }
if (error) { if (error) {
len = len =
bacnet-stack/demo/handler/s_awfs.c
+72 -75
View File
@@ -45,89 +45,86 @@
/** @file s_awfs.c Send part of an Atomic Write File Stream request. */ /** @file s_awfs.c Send part of an Atomic Write File Stream request. */
uint8_t Send_Atomic_Write_File_Stream( uint8_t Send_Atomic_Write_File_Stream (uint32_t device_id,
uint32_t device_id, uint32_t file_instance,
uint32_t file_instance, int fileStartPosition,
int fileStartPosition, BACNET_OCTET_STRING * fileData) {
BACNET_OCTET_STRING * fileData) BACNET_ADDRESS dest;
{ BACNET_ADDRESS my_address;
BACNET_ADDRESS dest; BACNET_NPDU_DATA npdu_data;
BACNET_ADDRESS my_address; unsigned max_apdu = 0;
BACNET_NPDU_DATA npdu_data; uint8_t invoke_id = 0;
unsigned max_apdu = 0; bool status = false;
uint8_t invoke_id = 0; int len = 0;
bool status = false; int pdu_len = 0;
int len = 0; int bytes_sent = 0;
int pdu_len = 0; BACNET_ATOMIC_WRITE_FILE_DATA data;
int bytes_sent = 0;
BACNET_ATOMIC_WRITE_FILE_DATA data;
/* if we are forbidden to send, don't send! */ /* if we are forbidden to send, don't send! */
if (!dcc_communication_enabled()) if (!dcc_communication_enabled ())
return 0; return 0;
/* is the device bound? */ /* is the device bound? */
status = address_get_by_device(device_id, &max_apdu, &dest); status = address_get_by_device (device_id, &max_apdu, &dest);
/* is there a tsm available? */ /* is there a tsm available? */
if (status) if (status)
invoke_id = tsm_next_free_invokeID(); invoke_id = tsm_next_free_invokeID ();
if (invoke_id) { if (invoke_id) {
/* load the data for the encoding */ /* load the data for the encoding */
data.object_type = OBJECT_FILE; data.object_type = OBJECT_FILE;
data.object_instance = file_instance; data.object_instance = file_instance;
data.access = FILE_STREAM_ACCESS; data.access = FILE_STREAM_ACCESS;
data.type.stream.fileStartPosition = fileStartPosition; data.type.stream.fileStartPosition = fileStartPosition;
status = octetstring_copy(&data.fileData, fileData); status = octetstring_copy (&data.fileData[0], fileData);
if (status) { if (status) {
/* encode the NPDU portion of the packet */ /* encode the NPDU portion of the packet */
datalink_get_my_address(&my_address); datalink_get_my_address (&my_address);
npdu_encode_npdu_data(&npdu_data, true, MESSAGE_PRIORITY_NORMAL); npdu_encode_npdu_data (&npdu_data, true, MESSAGE_PRIORITY_NORMAL);
pdu_len = pdu_len =
npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, npdu_encode_pdu (&Handler_Transmit_Buffer[0], &dest, &my_address,
&my_address, &npdu_data); &npdu_data);
/* encode the APDU portion of the packet */ /* encode the APDU portion of the packet */
len = len =
awf_encode_apdu(&Handler_Transmit_Buffer[pdu_len], invoke_id, awf_encode_apdu (&Handler_Transmit_Buffer[pdu_len], invoke_id, &data);
&data); pdu_len += len;
pdu_len += len; /* will the APDU fit the target device?
/* will the APDU fit the target device? note: if there is a bottleneck router in between
note: if there is a bottleneck router in between us and the destination, we won't know unless
us and the destination, we won't know unless we have a way to check for that and update the
we have a way to check for that and update the max_apdu in the address binding table. */
max_apdu in the address binding table. */ if ((unsigned) pdu_len <= max_apdu) {
if ((unsigned) pdu_len <= max_apdu) { tsm_set_confirmed_unsegmented_transaction (invoke_id, &dest,
tsm_set_confirmed_unsegmented_transaction(invoke_id, &dest, &npdu_data,
&npdu_data, &Handler_Transmit_Buffer[0], &Handler_Transmit_Buffer
(uint16_t) pdu_len); [0], (uint16_t) pdu_len);
bytes_sent = bytes_sent =
datalink_send_pdu(&dest, &npdu_data, datalink_send_pdu (&dest, &npdu_data, &Handler_Transmit_Buffer[0],
&Handler_Transmit_Buffer[0], pdu_len); pdu_len);
#if PRINT_ENABLED #if PRINT_ENABLED
if (bytes_sent <= 0) if (bytes_sent <= 0)
fprintf(stderr, fprintf (stderr, "Failed to Send AtomicWriteFile Request (%s)!\n",
"Failed to Send AtomicWriteFile Request (%s)!\n", strerror (errno));
strerror(errno));
#endif #endif
} else { } else {
tsm_free_invoke_id(invoke_id); tsm_free_invoke_id (invoke_id);
invoke_id = 0; invoke_id = 0;
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf (stderr,
"Failed to Send AtomicWriteFile Request " "Failed to Send AtomicWriteFile Request "
"(payload [%d] exceeds destination maximum APDU [%u])!\n", "(payload [%d] exceeds destination maximum APDU [%u])!\n",
pdu_len, max_apdu); pdu_len, max_apdu);
#endif #endif
} }
} else { } else {
tsm_free_invoke_id(invoke_id); tsm_free_invoke_id (invoke_id);
invoke_id = 0; invoke_id = 0;
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf (stderr,
"Failed to Send AtomicWriteFile Request " "Failed to Send AtomicWriteFile Request "
"(payload [%d] exceeds octet string capacity)!\n", pdu_len); "(payload [%d] exceeds octet string capacity)!\n", pdu_len);
#endif #endif
}
} }
}
return invoke_id; return invoke_id;
} }
bacnet-stack/demo/object/bacfile.c
+101 -10
View File
@@ -49,6 +49,10 @@ typedef struct {
char *filename; char *filename;
} BACNET_FILE_LISTING; } BACNET_FILE_LISTING;
#ifndef FILE_RECORD_SIZE
#define FILE_RECORD_SIZE MAX_OCTET_STRING_BYTES
#endif
static BACNET_FILE_LISTING BACnet_File_Listing[] = { static BACNET_FILE_LISTING BACnet_File_Listing[] = {
{0, "temp_0.txt"}, {0, "temp_0.txt"},
{1, "temp_1.txt"}, {1, "temp_1.txt"},
@@ -277,7 +281,8 @@ int bacfile_read_property(
break; break;
case PROP_FILE_ACCESS_METHOD: case PROP_FILE_ACCESS_METHOD:
apdu_len = apdu_len =
encode_application_enumerated(&apdu[0], FILE_STREAM_ACCESS); encode_application_enumerated(&apdu[0],
FILE_RECORD_AND_STREAM_ACCESS);
break; break;
default: default:
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
@@ -436,7 +441,7 @@ uint32_t bacfile_instance_from_tsm(
} }
#endif #endif
bool bacfile_read_data( bool bacfile_read_stream_data(
BACNET_ATOMIC_READ_FILE_DATA * data) BACNET_ATOMIC_READ_FILE_DATA * data)
{ {
char *pFilename = NULL; char *pFilename = NULL;
@@ -451,20 +456,20 @@ bool bacfile_read_data(
if (pFile) { if (pFile) {
(void) fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET); (void) fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET);
len = len =
fread(octetstring_value(&data->fileData), 1, fread(octetstring_value(&data->fileData[0]), 1,
data->type.stream.requestedOctetCount, pFile); data->type.stream.requestedOctetCount, pFile);
if (len < data->type.stream.requestedOctetCount) if (len < data->type.stream.requestedOctetCount)
data->endOfFile = true; data->endOfFile = true;
else else
data->endOfFile = false; data->endOfFile = false;
octetstring_truncate(&data->fileData, len); octetstring_truncate(&data->fileData[0], len);
fclose(pFile); fclose(pFile);
} else { } else {
octetstring_truncate(&data->fileData, 0); octetstring_truncate(&data->fileData[0], 0);
data->endOfFile = true; data->endOfFile = true;
} }
} else { } else {
octetstring_truncate(&data->fileData, 0); octetstring_truncate(&data->fileData[0], 0);
data->endOfFile = true; data->endOfFile = true;
} }
@@ -498,8 +503,8 @@ bool bacfile_write_stream_data(
(void) fseek(pFile, data->type.stream.fileStartPosition, (void) fseek(pFile, data->type.stream.fileStartPosition,
SEEK_SET); SEEK_SET);
} }
if (fwrite(octetstring_value(&data->fileData), if (fwrite(octetstring_value(&data->fileData[0]),
octetstring_length(&data->fileData), 1, pFile) != 1) { octetstring_length(&data->fileData[0]), 1, pFile) != 1) {
/* do something if it fails? */ /* do something if it fails? */
} }
fclose(pFile); fclose(pFile);
@@ -509,6 +514,53 @@ bool bacfile_write_stream_data(
return found; return found;
} }
bool bacfile_write_record_data(
BACNET_ATOMIC_WRITE_FILE_DATA * data)
{
char *pFilename = NULL;
bool found = false;
FILE *pFile = NULL;
uint32_t i = 0;
char dummy_data[FILE_RECORD_SIZE];
pFilename = bacfile_name(data->object_instance);
if (pFilename) {
found = true;
if (data->type.record.fileStartRecord == 0) {
/* open the file as a clean slate when starting at 0 */
pFile = fopen(pFilename, "wb");
} else if (data->type.record.fileStartRecord == -1) {
/* If 'File Start Record' parameter has the special
value -1, then the write operation shall be treated
as an append to the current end of file. */
pFile = fopen(pFilename, "ab+");
} else {
/* open for update */
pFile = fopen(pFilename, "rb+");
}
if (pFile) {
if ((data->type.record.fileStartRecord != -1) &&
(data->type.record.fileStartRecord > 0)) {
for (i = 0; i < data->type.record.fileStartRecord; i++) {
fgets(&dummy_data[0], sizeof(dummy_data), pFile);
if (feof(pFile)) {
break;
}
}
}
for (i = 0; i < data->type.record.returnedRecordCount; i++) {
if (fwrite(octetstring_value(&data->fileData[i]),
octetstring_length(&data->fileData[i]), 1, pFile) != 1) {
/* do something if it fails? */
}
}
fclose(pFile);
}
}
return found;
}
bool bacfile_read_ack_stream_data( bool bacfile_read_ack_stream_data(
uint32_t instance, uint32_t instance,
BACNET_ATOMIC_READ_FILE_DATA * data) BACNET_ATOMIC_READ_FILE_DATA * data)
@@ -523,8 +575,8 @@ bool bacfile_read_ack_stream_data(
pFile = fopen(pFilename, "rb"); pFile = fopen(pFilename, "rb");
if (pFile) { if (pFile) {
(void) fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET); (void) fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET);
if (fwrite(octetstring_value(&data->fileData), if (fwrite(octetstring_value(&data->fileData[0]),
octetstring_length(&data->fileData), 1, pFile) != 1) { octetstring_length(&data->fileData[0]), 1, pFile) != 1) {
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "Failed to write to %s (%lu)!\n", pFilename, fprintf(stderr, "Failed to write to %s (%lu)!\n", pFilename,
(unsigned long) instance); (unsigned long) instance);
@@ -537,6 +589,45 @@ bool bacfile_read_ack_stream_data(
return found; return found;
} }
bool bacfile_read_ack_record_data(
uint32_t instance,
BACNET_ATOMIC_READ_FILE_DATA * data)
{
bool found = false;
FILE *pFile = NULL;
char *pFilename = NULL;
uint32_t i = 0;
char dummy_data[MAX_OCTET_STRING_BYTES] = {0};
pFilename = bacfile_name(instance);
if (pFilename) {
found = true;
pFile = fopen(pFilename, "rb");
if (pFile) {
if (data->type.record.fileStartRecord > 0) {
for (i = 0; i < data->type.record.fileStartRecord; i++) {
fgets(&dummy_data[0], sizeof(dummy_data), pFile);
if (feof(pFile)) {
break;
}
}
}
for (i = 0; i < data->type.record.RecordCount; i++) {
if (fwrite(octetstring_value(&data->fileData[i]),
octetstring_length(&data->fileData[i]), 1, pFile) != 1) {
#if PRINT_ENABLED
fprintf(stderr, "Failed to write to %s (%lu)!\n", pFilename,
(unsigned long) instance);
#endif
}
}
fclose(pFile);
}
}
return found;
}
void bacfile_init( void bacfile_init(
void) void)
{ {
bacnet-stack/demo/object/bacfile.h
+8 -1
View File
@@ -74,13 +74,20 @@ extern "C" {
uint8_t invokeID); uint8_t invokeID);
/* handler ACK helper */ /* handler ACK helper */
bool bacfile_read_data( bool bacfile_read_stream_data(
BACNET_ATOMIC_READ_FILE_DATA * data); BACNET_ATOMIC_READ_FILE_DATA * data);
bool bacfile_read_ack_stream_data( bool bacfile_read_ack_stream_data(
uint32_t instance, uint32_t instance,
BACNET_ATOMIC_READ_FILE_DATA * data); BACNET_ATOMIC_READ_FILE_DATA * data);
bool bacfile_write_stream_data( bool bacfile_write_stream_data(
BACNET_ATOMIC_WRITE_FILE_DATA * data); BACNET_ATOMIC_WRITE_FILE_DATA * data);
bool bacfile_read_record_data(
BACNET_ATOMIC_READ_FILE_DATA * data);
bool bacfile_read_ack_record_data(
uint32_t instance,
BACNET_ATOMIC_READ_FILE_DATA * data);
bool bacfile_write_record_data(
BACNET_ATOMIC_WRITE_FILE_DATA * data);
void bacfile_init( void bacfile_init(
void); void);
bacnet-stack/include/arf.h
+5 -1
View File
@@ -29,6 +29,10 @@
#include "bacdcode.h" #include "bacdcode.h"
#include "bacstr.h" #include "bacstr.h"
#ifndef BACNET_READ_FILE_RECORD_COUNT
#define BACNET_READ_FILE_RECORD_COUNT 1
#endif
typedef struct BACnet_Atomic_Read_File_Data { typedef struct BACnet_Atomic_Read_File_Data {
BACNET_OBJECT_TYPE object_type; BACNET_OBJECT_TYPE object_type;
uint32_t object_instance; uint32_t object_instance;
@@ -44,7 +48,7 @@ typedef struct BACnet_Atomic_Read_File_Data {
uint32_t RecordCount; uint32_t RecordCount;
} record; } record;
} type; } type;
BACNET_OCTET_STRING fileData; BACNET_OCTET_STRING fileData[BACNET_READ_FILE_RECORD_COUNT];
bool endOfFile; bool endOfFile;
} BACNET_ATOMIC_READ_FILE_DATA; } BACNET_ATOMIC_READ_FILE_DATA;
bacnet-stack/include/awf.h
+5 -1
View File
@@ -28,6 +28,10 @@
#include <stdbool.h> #include <stdbool.h>
#include "bacdcode.h" #include "bacdcode.h"
#ifndef BACNET_WRITE_FILE_RECORD_COUNT
#define BACNET_WRITE_FILE_RECORD_COUNT 1
#endif
typedef struct BACnet_Atomic_Write_File_Data { typedef struct BACnet_Atomic_Write_File_Data {
BACNET_OBJECT_TYPE object_type; BACNET_OBJECT_TYPE object_type;
uint32_t object_instance; uint32_t object_instance;
@@ -41,7 +45,7 @@ typedef struct BACnet_Atomic_Write_File_Data {
uint32_t returnedRecordCount; uint32_t returnedRecordCount;
} record; } record;
} type; } type;
BACNET_OCTET_STRING fileData; BACNET_OCTET_STRING fileData[BACNET_WRITE_FILE_RECORD_COUNT];
} BACNET_ATOMIC_WRITE_FILE_DATA; } BACNET_ATOMIC_WRITE_FILE_DATA;
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/src/arf.c
+28 -22
View File
@@ -204,6 +204,7 @@ int arf_ack_encode_apdu(
BACNET_ATOMIC_READ_FILE_DATA * data) BACNET_ATOMIC_READ_FILE_DATA * data)
{ {
int apdu_len = 0; /* total length of the apdu, return value */ int apdu_len = 0; /* total length of the apdu, return value */
uint32_t i = 0;
if (apdu) { if (apdu) {
apdu[0] = PDU_TYPE_COMPLEX_ACK; apdu[0] = PDU_TYPE_COMPLEX_ACK;
@@ -221,7 +222,7 @@ int arf_ack_encode_apdu(
data->type.stream.fileStartPosition); data->type.stream.fileStartPosition);
apdu_len += apdu_len +=
encode_application_octet_string(&apdu[apdu_len], encode_application_octet_string(&apdu[apdu_len],
&data->fileData); &data->fileData[0]);
apdu_len += encode_closing_tag(&apdu[apdu_len], 0); apdu_len += encode_closing_tag(&apdu[apdu_len], 0);
break; break;
case FILE_RECORD_ACCESS: case FILE_RECORD_ACCESS:
@@ -232,9 +233,11 @@ int arf_ack_encode_apdu(
apdu_len += apdu_len +=
encode_application_unsigned(&apdu[apdu_len], encode_application_unsigned(&apdu[apdu_len],
data->type.record.RecordCount); data->type.record.RecordCount);
apdu_len += for (i = 0; i < data->type.record.RecordCount; i++) {
encode_application_octet_string(&apdu[apdu_len], apdu_len +=
&data->fileData); encode_application_octet_string(&apdu[apdu_len],
&data->fileData[i]);
}
apdu_len += encode_closing_tag(&apdu[apdu_len], 1); apdu_len += encode_closing_tag(&apdu[apdu_len], 1);
break; break;
default: default:
@@ -255,6 +258,7 @@ int arf_ack_decode_service_request(
int tag_len = 0; int tag_len = 0;
uint8_t tag_number = 0; uint8_t tag_number = 0;
uint32_t len_value_type = 0; uint32_t len_value_type = 0;
uint32_t i = 0;
/* check for value pointers */ /* check for value pointers */
if (apdu_len && data) { if (apdu_len && data) {
@@ -287,7 +291,7 @@ int arf_ack_decode_service_request(
return -1; return -1;
len += len +=
decode_octet_string(&apdu[len], len_value_type, decode_octet_string(&apdu[len], len_value_type,
&data->fileData); &data->fileData[0]);
if (!decode_is_closing_tag_number(&apdu[len], 0)) if (!decode_is_closing_tag_number(&apdu[len], 0))
return -1; return -1;
/* a tag number is not extended so only one octet */ /* a tag number is not extended so only one octet */
@@ -316,16 +320,18 @@ int arf_ack_decode_service_request(
len += len +=
decode_unsigned(&apdu[len], len_value_type, decode_unsigned(&apdu[len], len_value_type,
&data->type.record.RecordCount); &data->type.record.RecordCount);
/* fileData */ for (i = 0; i < data->type.record.RecordCount; i++) {
tag_len = /* fileData */
decode_tag_number_and_value(&apdu[len], &tag_number, tag_len =
&len_value_type); decode_tag_number_and_value(&apdu[len], &tag_number,
len += tag_len; &len_value_type);
if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING) len += tag_len;
return -1; if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING)
len += return -1;
decode_octet_string(&apdu[len], len_value_type, len +=
&data->fileData); decode_octet_string(&apdu[len], len_value_type,
&data->fileData[i]);
}
if (!decode_is_closing_tag_number(&apdu[len], 1)) if (!decode_is_closing_tag_number(&apdu[len], 1))
return -1; return -1;
/* a tag number is not extended so only one octet */ /* a tag number is not extended so only one octet */
@@ -403,11 +409,11 @@ void testAtomicReadFileAckAccess(
data->type.record.RecordCount); data->type.record.RecordCount);
} }
ct_test(pTest, ct_test(pTest,
octetstring_length(&test_data.fileData) == octetstring_length(&test_data.fileData[0]) ==
octetstring_length(&data->fileData)); octetstring_length(&data->fileData[0]));
ct_test(pTest, memcmp(octetstring_value(&test_data.fileData), ct_test(pTest, memcmp(octetstring_value(&test_data.fileData[0]),
octetstring_value(&data->fileData), octetstring_value(&data->fileData[0]),
octetstring_length(&test_data.fileData)) == 0); octetstring_length(&test_data.fileData[0])) == 0);
} }
void testAtomicReadFileAck( void testAtomicReadFileAck(
@@ -420,7 +426,7 @@ void testAtomicReadFileAck(
data.endOfFile = true; data.endOfFile = true;
data.access = FILE_STREAM_ACCESS; data.access = FILE_STREAM_ACCESS;
data.type.stream.fileStartPosition = 0; data.type.stream.fileStartPosition = 0;
octetstring_init(&data.fileData, test_octet_string, octetstring_init(&data.fileData[0], test_octet_string,
sizeof(test_octet_string)); sizeof(test_octet_string));
testAtomicReadFileAckAccess(pTest, &data); testAtomicReadFileAckAccess(pTest, &data);
@@ -428,7 +434,7 @@ void testAtomicReadFileAck(
data.access = FILE_RECORD_ACCESS; data.access = FILE_RECORD_ACCESS;
data.type.record.fileStartRecord = 1; data.type.record.fileStartRecord = 1;
data.type.record.RecordCount = 2; data.type.record.RecordCount = 2;
octetstring_init(&data.fileData, test_octet_string, octetstring_init(&data.fileData[0], test_octet_string,
sizeof(test_octet_string)); sizeof(test_octet_string));
testAtomicReadFileAckAccess(pTest, &data); testAtomicReadFileAckAccess(pTest, &data);
bacnet-stack/src/awf.c
+29 -22
View File
@@ -46,6 +46,7 @@ int awf_encode_apdu(
BACNET_ATOMIC_WRITE_FILE_DATA * data) BACNET_ATOMIC_WRITE_FILE_DATA * data)
{ {
int apdu_len = 0; /* total length of the apdu, return value */ int apdu_len = 0; /* total length of the apdu, return value */
uint32_t i = 0;
if (apdu) { if (apdu) {
apdu[0] = PDU_TYPE_CONFIRMED_SERVICE_REQUEST; apdu[0] = PDU_TYPE_CONFIRMED_SERVICE_REQUEST;
@@ -64,7 +65,7 @@ int awf_encode_apdu(
data->type.stream.fileStartPosition); data->type.stream.fileStartPosition);
apdu_len += apdu_len +=
encode_application_octet_string(&apdu[apdu_len], encode_application_octet_string(&apdu[apdu_len],
&data->fileData); &data->fileData[0]);
apdu_len += encode_closing_tag(&apdu[apdu_len], 0); apdu_len += encode_closing_tag(&apdu[apdu_len], 0);
break; break;
case FILE_RECORD_ACCESS: case FILE_RECORD_ACCESS:
@@ -75,9 +76,11 @@ int awf_encode_apdu(
apdu_len += apdu_len +=
encode_application_unsigned(&apdu[apdu_len], encode_application_unsigned(&apdu[apdu_len],
data->type.record.returnedRecordCount); data->type.record.returnedRecordCount);
apdu_len += for (i = 0; i < data->type.record.returnedRecordCount; i++) {
encode_application_octet_string(&apdu[apdu_len], apdu_len +=
&data->fileData); encode_application_octet_string(&apdu[apdu_len],
&data->fileData[i]);
}
apdu_len += encode_closing_tag(&apdu[apdu_len], 1); apdu_len += encode_closing_tag(&apdu[apdu_len], 1);
break; break;
default: default:
@@ -101,6 +104,7 @@ int awf_decode_service_request(
int32_t signed_value = 0; int32_t signed_value = 0;
uint32_t unsigned_value = 0; uint32_t unsigned_value = 0;
uint16_t type = 0; /* for decoding */ uint16_t type = 0; /* for decoding */
uint32_t i = 0;
/* check for value pointers */ /* check for value pointers */
if (apdu_len && data) { if (apdu_len && data) {
@@ -133,7 +137,7 @@ int awf_decode_service_request(
return -1; return -1;
len += len +=
decode_octet_string(&apdu[len], len_value_type, decode_octet_string(&apdu[len], len_value_type,
&data->fileData); &data->fileData[0]);
if (!decode_is_closing_tag_number(&apdu[len], 0)) if (!decode_is_closing_tag_number(&apdu[len], 0))
return -1; return -1;
/* a tag number is not extended so only one octet */ /* a tag number is not extended so only one octet */
@@ -162,15 +166,17 @@ int awf_decode_service_request(
decode_unsigned(&apdu[len], len_value_type, &unsigned_value); decode_unsigned(&apdu[len], len_value_type, &unsigned_value);
data->type.record.returnedRecordCount = unsigned_value; data->type.record.returnedRecordCount = unsigned_value;
/* fileData */ /* fileData */
tag_len = for (i = 0; i < data->type.record.returnedRecordCount; i++) {
decode_tag_number_and_value(&apdu[len], &tag_number, tag_len =
&len_value_type); decode_tag_number_and_value(&apdu[len], &tag_number,
len += tag_len; &len_value_type);
if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING) len += tag_len;
return -1; if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING)
len += return -1;
decode_octet_string(&apdu[len], len_value_type, len +=
&data->fileData); decode_octet_string(&apdu[len], len_value_type,
&data->fileData[i]);
}
if (!decode_is_closing_tag_number(&apdu[len], 1)) if (!decode_is_closing_tag_number(&apdu[len], 1))
return -1; return -1;
/* a tag number is not extended so only one octet */ /* a tag number is not extended so only one octet */
@@ -294,7 +300,8 @@ int awf_ack_decode_apdu(
if (apdu_len > offset) { if (apdu_len > offset) {
len = len =
awf_decode_service_request(&apdu[offset], apdu_len - offset, data); awf_ack_decode_service_request(&apdu[offset], apdu_len - offset,
data);
} }
return len; return len;
@@ -338,11 +345,11 @@ void testAtomicWriteFileAccess(
data->type.record.returnedRecordCount); data->type.record.returnedRecordCount);
} }
ct_test(pTest, ct_test(pTest,
octetstring_length(&test_data.fileData) == octetstring_length(&test_data.fileData[0]) ==
octetstring_length(&data->fileData)); octetstring_length(&data->fileData[0]));
ct_test(pTest, memcmp(octetstring_value(&test_data.fileData), ct_test(pTest, memcmp(octetstring_value(&test_data.fileData[0]),
octetstring_value(&data->fileData), octetstring_value(&data->fileData[0]),
octetstring_length(&test_data.fileData)) == 0); octetstring_length(&test_data.fileData[0])) == 0);
} }
void testAtomicWriteFile( void testAtomicWriteFile(
@@ -355,7 +362,7 @@ void testAtomicWriteFile(
data.object_instance = 1; data.object_instance = 1;
data.access = FILE_STREAM_ACCESS; data.access = FILE_STREAM_ACCESS;
data.type.stream.fileStartPosition = 0; data.type.stream.fileStartPosition = 0;
octetstring_init(&data.fileData, test_octet_string, octetstring_init(&data.fileData[0], test_octet_string,
sizeof(test_octet_string)); sizeof(test_octet_string));
testAtomicWriteFileAccess(pTest, &data); testAtomicWriteFileAccess(pTest, &data);
@@ -364,7 +371,7 @@ void testAtomicWriteFile(
data.access = FILE_RECORD_ACCESS; data.access = FILE_RECORD_ACCESS;
data.type.record.fileStartRecord = 1; data.type.record.fileStartRecord = 1;
data.type.record.returnedRecordCount = 2; data.type.record.returnedRecordCount = 2;
octetstring_init(&data.fileData, test_octet_string, octetstring_init(&data.fileData[0], test_octet_string,
sizeof(test_octet_string)); sizeof(test_octet_string));
testAtomicWriteFileAccess(pTest, &data); testAtomicWriteFileAccess(pTest, &data);