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

2nd pass at changing the error/reject/abort status reporting to improve BTL test compliance. ReadProperty fully done for core and demo objects. Will tackle other services next.

Browse Source
This commit is contained in:
petermcs
2010-06-07 15:52:33 +00:00
parent b780c7bea6
commit 61bb34d726
21 changed files with 158 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/rp.c
+10 -10
View File
@@ -92,14 +92,14 @@ int rp_decode_service_request(
/* Must have at least 2 tags, an object id and a property identifier
* of at least 1 byte in length to have any chance of parsing */
if(apdu_len < 7) {
rpdata->error_code = REJECT_REASON_MISSING_REQUIRED_PARAMETER;
return -1;
rpdata->error_code = ERROR_CODE_REJECT_MISSING_REQUIRED_PARAMETER;
return BACNET_STATUS_REJECT;
}
/* Tag 0: Object ID */
if (!decode_is_context_tag(&apdu[len++], 0)) {
rpdata->error_code = REJECT_REASON_INVALID_TAG;
return -1;
rpdata->error_code = ERROR_CODE_REJECT_INVALID_TAG;
return BACNET_STATUS_REJECT;
}
len += decode_object_id(&apdu[len], &type, &rpdata->object_instance);
rpdata->object_type = (BACNET_OBJECT_TYPE) type;
@@ -108,8 +108,8 @@ int rp_decode_service_request(
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value_type);
if (tag_number != 1) {
rpdata->error_code = REJECT_REASON_INVALID_TAG;
return -1;
rpdata->error_code = ERROR_CODE_REJECT_INVALID_TAG;
return BACNET_STATUS_REJECT;
}
len += decode_enumerated(&apdu[len], len_value_type, &property);
rpdata->object_property = (BACNET_PROPERTY_ID) property;
@@ -123,8 +123,8 @@ int rp_decode_service_request(
decode_unsigned(&apdu[len], len_value_type, &array_value);
rpdata->array_index = array_value;
} else {
rpdata->error_code = REJECT_REASON_INVALID_TAG;
return -1;
rpdata->error_code = ERROR_CODE_REJECT_INVALID_TAG;
return BACNET_STATUS_REJECT;
}
} else
rpdata->array_index = BACNET_ARRAY_ALL;
@@ -132,8 +132,8 @@ int rp_decode_service_request(
if(len < apdu_len) {
/* If something left over now, we have an invalid request */
rpdata->error_code = REJECT_REASON_TOO_MANY_ARGUMENTS;
return -1;
rpdata->error_code = ERROR_CODE_REJECT_TOO_MANY_ARGUMENTS;
return BACNET_STATUS_REJECT;
}
return (int) len;