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

Changes to error checking to report invalid requests via proper reject codes and not the blanket abort which was in place (will need to look at other service request decoders as well...) Should address question raised by Jérémy Delhomme.

Browse Source
This commit is contained in:
petermcs
2010-06-03 11:20:37 +00:00
parent 5c21bc2192
commit f32e7bf1c0
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_rp.c
+3 -3
View File
@@ -36,6 +36,7 @@
#include "apdu.h"
#include "npdu.h"
#include "abort.h"
#include "reject.h"
#include "rp.h"
/* device object has custom handler for all objects */
#include "device.h"
@@ -103,9 +104,8 @@ void handler_read_property(
#endif
if (len < 0) {
/* bad decoding - send an abort */
apdu_len =
abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, ABORT_REASON_OTHER, true);
apdu_len = reject_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, rpdata.error_code);
#if PRINT_ENABLED
fprintf(stderr, "RP: Bad Encoding. Sending Abort!\n");
#endif
bacnet-stack/src/rp.c
+26 -7
View File
@@ -88,18 +88,29 @@ int rp_decode_service_request(
uint32_t array_value = 0; /* for decoding */
/* check for value pointers */
if (apdu_len && rpdata) {
/* Tag 0: Object ID */
if (!decode_is_context_tag(&apdu[len++], 0))
if (rpdata != NULL) {
/* 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;
}
/* Tag 0: Object ID */
if (!decode_is_context_tag(&apdu[len++], 0)) {
rpdata->error_code = REJECT_REASON_INVALID_TAG;
return -1;
}
len += decode_object_id(&apdu[len], &type, &rpdata->object_instance);
rpdata->object_type = (BACNET_OBJECT_TYPE) type;
/* Tag 1: Property ID */
len +=
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value_type);
if (tag_number != 1)
if (tag_number != 1) {
rpdata->error_code = REJECT_REASON_INVALID_TAG;
return -1;
}
len += decode_enumerated(&apdu[len], len_value_type, &property);
rpdata->object_property = (BACNET_PROPERTY_ID) property;
/* Tag 2: Optional Array Index */
@@ -107,15 +118,23 @@ int rp_decode_service_request(
len +=
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value_type);
if (tag_number == 2) {
if ((tag_number == 2) && (len < apdu_len)) {
len +=
decode_unsigned(&apdu[len], len_value_type, &array_value);
rpdata->array_index = array_value;
} else
rpdata->array_index = BACNET_ARRAY_ALL;
} else {
rpdata->error_code = REJECT_REASON_INVALID_TAG;
return -1;
}
} else
rpdata->array_index = BACNET_ARRAY_ALL;
}
if(len < apdu_len) {
/* If something left over now, we have an invalid request */
rpdata->error_code = REJECT_REASON_TOO_MANY_ARGUMENTS;
return -1;
}
return (int) len;
}