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

Fix UNKNOWN_PROPERTY on Mac_Address of Network Port demo object. (#24)

Browse Source
This commit is contained in:
Geert Linders
2020-01-15 21:49:16 +01:00
committed by Steve Karg
parent a24845ba51
commit 6e0ebb99f4
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/netport.c
+8 -17
View File
@@ -1852,28 +1852,19 @@ int Network_Port_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
BACNET_OCTET_STRING octet_string; BACNET_OCTET_STRING octet_string;
BACNET_CHARACTER_STRING char_string; BACNET_CHARACTER_STRING char_string;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
const int *pRequired = NULL;
const int *pOptional = NULL;
const int *pProprietary = NULL;
if ((rpdata == NULL) || (rpdata->application_data == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
if ((Network_Port_Type(rpdata->object_instance) != PORT_TYPE_MSTP) && Network_Port_Property_List(rpdata->object_instance,
property_list_member( &pRequired, &pOptional, &pProprietary);
MSTP_Port_Properties_Optional, rpdata->object_property)) { if ((!property_list_member(pRequired, rpdata->object_property)) &&
rpdata->error_class = ERROR_CLASS_PROPERTY; (!property_list_member(pOptional, rpdata->object_property)) &&
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; (!property_list_member(pProprietary, rpdata->object_property))) {
return BACNET_STATUS_ERROR;
}
if ((Network_Port_Type(rpdata->object_instance) != PORT_TYPE_BIP) &&
property_list_member(
BIP_Port_Properties_Optional, rpdata->object_property)) {
rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
return BACNET_STATUS_ERROR;
}
if ((Network_Port_Type(rpdata->object_instance) != PORT_TYPE_BIP6) &&
property_list_member(
BIP6_Port_Properties_Optional, rpdata->object_property)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY; rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
return BACNET_STATUS_ERROR; return BACNET_STATUS_ERROR;