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

[libbacnet]: bacapp_data_len() + bacnet_tag_number_and_value_decode() (#453)

Browse Source 
* Bugfix: bacapp_data_len() + bacnet_tag_number_and_value_decode()

* Fix bacnet_tag_number_and_value_decode function.
Add read buffer safe functions for opening, closing, context specific tags.
Fix bacapp_data_len function changes as indicated by unit testing.

* refactor bacapp_data_len
---------
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
anthony-crystalpeak
2023-07-31 14:50:14 -07:00
committed by GitHub
parent 28de333b6e
commit acb3b0f57d
4 changed files with 134 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacdcode.c
+71 -9
View File
@@ -457,6 +457,27 @@ bool decode_is_opening_tag(uint8_t *apdu)
return (bool)((apdu[0] & 0x07) == 6);
}
/**
* @brief Returns true if an opening tag has been found.
*
* @param apdu Pointer to the tag number.
* @param apdu_size Number of bytes available to decode
*
* @return true if an opening tag has been found.
*/
bool bacnet_is_opening_tag(uint8_t *apdu, uint32_t apdu_size)
{
bool tag = false;
if (apdu_size > 0) {
if (IS_OPENING_TAG(apdu[0])) {
tag = true;
}
}
return tag;
}
/**
* @brief Returns if at the given pointer a
* closing tag has been found.
@@ -470,6 +491,49 @@ bool decode_is_closing_tag(uint8_t *apdu)
return (bool)((apdu[0] & 0x07) == 7);
}
/**
* @brief Returns true if a closing tag has been found.
*
* @param apdu Pointer to the tag number.
* @param apdu_size Number of bytes available to decode
*
* @return true if a closing tag has been found.
*/
bool bacnet_is_closing_tag(uint8_t *apdu, uint32_t apdu_size)
{
bool tag = false;
if (apdu_size > 0) {
if (IS_CLOSING_TAG(apdu[0])) {
tag = true;
}
}
return tag;
}
/**
* @brief Returns true if a context specific tag has been found.
*
* @param apdu Pointer to the tag number.
* @param apdu_size Number of bytes available to decode
*
* @return true if a context specific tag has been found.
*/
bool bacnet_is_context_specific(uint8_t *apdu, uint32_t apdu_size)
{
bool tag = false;
if (apdu_size > 0) {
if (IS_CONTEXT_SPECIFIC(apdu[0])) {
tag = true;
}
}
return tag;
}
/**
* @brief Decodes the tag number and the value,
* that the APDU pointer is addressing.
@@ -549,28 +613,26 @@ int bacnet_tag_number_and_value_decode(
len = bacnet_tag_number_decode(&apdu[0], apdu_len_max, tag_number);
if (len > 0) {
apdu_len_max -= len;
if (IS_EXTENDED_VALUE(apdu[0])) {
/* tagged as uint32_t */
if (IS_EXTENDED_VALUE(apdu[0]) && (apdu_len_max > len)) {
apdu_len_max -= len;
if ((apdu[len] == 255) && (apdu_len_max >= 5)) {
/* tagged as uint32_t */
uint32_t value32;
len++;
len += decode_unsigned32(&apdu[len], &value32);
if (value) {
*value = value32;
}
}
/* tagged as uint16_t */
else if ((apdu[len] == 254) && (apdu_len_max >= 3)) {
} else if ((apdu[len] == 254) && (apdu_len_max >= 3)) {
/* tagged as uint16_t */
uint16_t value16;
len++;
len += decode_unsigned16(&apdu[len], &value16);
if (value) {
*value = value16;
}
}
/* no tag - must be uint8_t */
else if ((apdu[len] < 254) && (apdu_len_max >= 1)) {
} else if ((apdu[len] < 254) && (apdu_len_max >= 1)) {
/* no tag - must be uint8_t */
if (value) {
*value = apdu[len];
}