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

Feature/property list extra handling (#245)

Browse Source 
* Add extra handling when property-list is included in required list.

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-03-28 11:29:22 -05:00
committed by GitHub
parent 5b07b484d4
commit d7d3fa2f60
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/proplist.c
+10 -2
View File
@@ -118,6 +118,12 @@ int property_list_encode(BACNET_READ_PROPERTY_DATA *rpdata,
if (required_count >= 3) { if (required_count >= 3) {
/* less the 3 always required properties */ /* less the 3 always required properties */
count -= 3; count -= 3;
if (property_list_member(pListRequired, PROP_PROPERTY_LIST)) {
/* property-list should not be in the required list
because this module handles it transparently.
Handle the case where it might be in the required list. */
count -= 1;
}
} }
if ((rpdata == NULL) || (rpdata->application_data == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
@@ -138,7 +144,8 @@ int property_list_encode(BACNET_READ_PROPERTY_DATA *rpdata,
for (i = 0; i < required_count; i++) { for (i = 0; i < required_count; i++) {
if ((pListRequired[i] == PROP_OBJECT_TYPE) || if ((pListRequired[i] == PROP_OBJECT_TYPE) ||
(pListRequired[i] == PROP_OBJECT_IDENTIFIER) || (pListRequired[i] == PROP_OBJECT_IDENTIFIER) ||
(pListRequired[i] == PROP_OBJECT_NAME)) { (pListRequired[i] == PROP_OBJECT_NAME) ||
(pListRequired[i] == PROP_PROPERTY_LIST)) {
continue; continue;
} else { } else {
len = encode_application_enumerated( len = encode_application_enumerated(
@@ -192,7 +199,8 @@ int property_list_encode(BACNET_READ_PROPERTY_DATA *rpdata,
for (i = 0; i < required_count; i++) { for (i = 0; i < required_count; i++) {
if ((pListRequired[i] == PROP_OBJECT_TYPE) || if ((pListRequired[i] == PROP_OBJECT_TYPE) ||
(pListRequired[i] == PROP_OBJECT_IDENTIFIER) || (pListRequired[i] == PROP_OBJECT_IDENTIFIER) ||
(pListRequired[i] == PROP_OBJECT_NAME)) { (pListRequired[i] == PROP_OBJECT_NAME) ||
(pListRequired[i] == PROP_PROPERTY_LIST)) {
continue; continue;
} else { } else {
count++; count++;