dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/object/bacfile.c
+101 -10
View File
@@ -49,6 +49,10 @@ typedef struct {
char *filename;
} BACNET_FILE_LISTING;
#ifndef FILE_RECORD_SIZE
#define FILE_RECORD_SIZE MAX_OCTET_STRING_BYTES
#endif
static BACNET_FILE_LISTING BACnet_File_Listing[] = {
{0, "temp_0.txt"},
{1, "temp_1.txt"},
@@ -277,7 +281,8 @@ int bacfile_read_property(
break;
case PROP_FILE_ACCESS_METHOD:
apdu_len =
encode_application_enumerated(&apdu[0], FILE_STREAM_ACCESS);
encode_application_enumerated(&apdu[0],
FILE_RECORD_AND_STREAM_ACCESS);
break;
default:
rpdata->error_class = ERROR_CLASS_PROPERTY;
@@ -436,7 +441,7 @@ uint32_t bacfile_instance_from_tsm(
}
#endif
bool bacfile_read_data(
bool bacfile_read_stream_data(
BACNET_ATOMIC_READ_FILE_DATA * data)
{
char *pFilename = NULL;
@@ -451,20 +456,20 @@ bool bacfile_read_data(
if (pFile) {
(void) fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET);
len =
fread(octetstring_value(&data->fileData), 1,
fread(octetstring_value(&data->fileData[0]), 1,
data->type.stream.requestedOctetCount, pFile);
if (len < data->type.stream.requestedOctetCount)
data->endOfFile = true;
else
data->endOfFile = false;
octetstring_truncate(&data->fileData, len);
octetstring_truncate(&data->fileData[0], len);
fclose(pFile);
} else {
octetstring_truncate(&data->fileData, 0);
octetstring_truncate(&data->fileData[0], 0);
data->endOfFile = true;
}
} else {
octetstring_truncate(&data->fileData, 0);
octetstring_truncate(&data->fileData[0], 0);
data->endOfFile = true;
}
@@ -498,8 +503,8 @@ bool bacfile_write_stream_data(
(void) fseek(pFile, data->type.stream.fileStartPosition,
SEEK_SET);
}
if (fwrite(octetstring_value(&data->fileData),
octetstring_length(&data->fileData), 1, pFile) != 1) {
if (fwrite(octetstring_value(&data->fileData[0]),
octetstring_length(&data->fileData[0]), 1, pFile) != 1) {
/* do something if it fails? */
}
fclose(pFile);
@@ -509,6 +514,53 @@ bool bacfile_write_stream_data(
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(
uint32_t instance,
BACNET_ATOMIC_READ_FILE_DATA * data)
@@ -523,8 +575,8 @@ bool bacfile_read_ack_stream_data(
pFile = fopen(pFilename, "rb");
if (pFile) {
(void) fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET);
if (fwrite(octetstring_value(&data->fileData),
octetstring_length(&data->fileData), 1, pFile) != 1) {
if (fwrite(octetstring_value(&data->fileData[0]),
octetstring_length(&data->fileData[0]), 1, pFile) != 1) {
#if PRINT_ENABLED
fprintf(stderr, "Failed to write to %s (%lu)!\n", pFilename,
(unsigned long) instance);
@@ -537,6 +589,45 @@ bool bacfile_read_ack_stream_data(
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)
{
bacnet-stack/demo/object/bacfile.h
+8 -1
View File
@@ -74,13 +74,20 @@ extern "C" {
uint8_t invokeID);
/* handler ACK helper */
bool bacfile_read_data(
bool bacfile_read_stream_data(
BACNET_ATOMIC_READ_FILE_DATA * data);
bool bacfile_read_ack_stream_data(
uint32_t instance,
BACNET_ATOMIC_READ_FILE_DATA * data);
bool bacfile_write_stream_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);