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

Improved AtomicReadFile and AtomicWriteFile error detection. Eliminated redundancy in the octetstring_init function.

Browse Source
This commit is contained in:
skarg
2015-09-01 22:24:34 +00:00
parent 80b628453d
commit 458d563aaf
4 changed files with 120 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/arf.c
+31 -13
View File
@@ -256,6 +256,7 @@ int arf_ack_decode_service_request(
{
int len = 0;
int tag_len = 0;
int decoded_len = 0;
uint8_t tag_number = 0;
uint32_t len_value_type = 0;
uint32_t i = 0;
@@ -265,8 +266,9 @@ int arf_ack_decode_service_request(
len =
decode_tag_number_and_value(&apdu[0], &tag_number,
&len_value_type);
if (tag_number != BACNET_APPLICATION_TAG_BOOLEAN)
if (tag_number != BACNET_APPLICATION_TAG_BOOLEAN) {
return -1;
}
data->endOfFile = decode_boolean(len_value_type);
if (decode_is_opening_tag_number(&apdu[len], 0)) {
data->access = FILE_STREAM_ACCESS;
@@ -277,8 +279,9 @@ int arf_ack_decode_service_request(
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value_type);
len += tag_len;
if (tag_number != BACNET_APPLICATION_TAG_SIGNED_INT)
if (tag_number != BACNET_APPLICATION_TAG_SIGNED_INT) {
return -1;
}
len +=
decode_signed(&apdu[len], len_value_type,
&data->type.stream.fileStartPosition);
@@ -287,13 +290,19 @@ int arf_ack_decode_service_request(
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value_type);
len += tag_len;
if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING)
if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING) {
return -1;
len +=
}
decoded_len =
decode_octet_string(&apdu[len], len_value_type,
&data->fileData[0]);
if (!decode_is_closing_tag_number(&apdu[len], 0))
if (decoded_len != len_value_type) {
return -1;
}
len += decoded_len;
if (!decode_is_closing_tag_number(&apdu[len], 0)) {
return -1;
}
/* a tag number is not extended so only one octet */
len++;
} else if (decode_is_opening_tag_number(&apdu[len], 1)) {
@@ -305,8 +314,9 @@ int arf_ack_decode_service_request(
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value_type);
len += tag_len;
if (tag_number != BACNET_APPLICATION_TAG_SIGNED_INT)
if (tag_number != BACNET_APPLICATION_TAG_SIGNED_INT) {
return -1;
}
len +=
decode_signed(&apdu[len], len_value_type,
&data->type.record.fileStartRecord);
@@ -315,8 +325,9 @@ int arf_ack_decode_service_request(
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value_type);
len += tag_len;
if (tag_number != BACNET_APPLICATION_TAG_UNSIGNED_INT)
if (tag_number != BACNET_APPLICATION_TAG_UNSIGNED_INT) {
return -1;
}
len +=
decode_unsigned(&apdu[len], len_value_type,
&data->type.record.RecordCount);
@@ -326,18 +337,25 @@ int arf_ack_decode_service_request(
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value_type);
len += tag_len;
if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING)
if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING) {
return -1;
len +=
decode_octet_string(&apdu[len], len_value_type,
&data->fileData[i]);
}
decoded_len =
decode_octet_string(&apdu[len], len_value_type,
&data->fileData[i]);
if (decoded_len != len_value_type) {
return -1;
}
len += decoded_len;
}
if (!decode_is_closing_tag_number(&apdu[len], 1))
if (!decode_is_closing_tag_number(&apdu[len], 1)) {
return -1;
}
/* a tag number is not extended so only one octet */
len++;
} else
} else {
return -1;
}
}
return len;
bacnet-stack/src/awf.c
+11 -2
View File
@@ -99,6 +99,7 @@ int awf_decode_service_request(
{
int len = 0;
int tag_len = 0;
int decoded_len = 0;
uint8_t tag_number = 0;
uint32_t len_value_type = 0;
int32_t signed_value = 0;
@@ -135,9 +136,13 @@ int awf_decode_service_request(
len += tag_len;
if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING)
return -1;
len +=
decoded_len =
decode_octet_string(&apdu[len], len_value_type,
&data->fileData[0]);
if (decoded_len != len_value_type) {
return -1;
}
len += decoded_len;
if (!decode_is_closing_tag_number(&apdu[len], 0))
return -1;
/* a tag number is not extended so only one octet */
@@ -173,9 +178,13 @@ int awf_decode_service_request(
len += tag_len;
if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING)
return -1;
len +=
decoded_len =
decode_octet_string(&apdu[len], len_value_type,
&data->fileData[i]);
if (decoded_len != len_value_type) {
return -1;
}
len += decoded_len;
}
if (!decode_is_closing_tag_number(&apdu[len], 1))
return -1;
bacnet-stack/src/bacstr.c
+12 -14
View File
@@ -696,25 +696,23 @@ bool octetstring_init(
bool status = false; /* return value */
size_t i; /* counter */
if (octet_string) {
if (octet_string && (length <= MAX_OCTET_STRING_BYTES)) {
octet_string->length = 0;
if (length <= MAX_OCTET_STRING_BYTES) {
if (value) {
for (i = 0; i < length; i++) {
if (i < length) {
octet_string->value[octet_string->length] = value[i];
octet_string->length++;
} else {
octet_string->value[i] = 0;
}
}
} else {
for (i = 0; i < MAX_OCTET_STRING_BYTES; i++) {
if (value) {
for (i = 0; i < MAX_OCTET_STRING_BYTES; i++) {
if (i < length) {
octet_string->value[i] = value[i];
} else {
octet_string->value[i] = 0;
}
}
status = true;
octet_string->length = length;
} else {
for (i = 0; i < MAX_OCTET_STRING_BYTES; i++) {
octet_string->value[i] = 0;
}
}
status = true;
}
return status;