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

Fix WPM decoding. Add unit test for WPM. (#438)

Browse Source 
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2023-06-14 17:25:38 -05:00
committed by GitHub
parent 2c771414bd
commit c8a6ea74b8
5 changed files with 250 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/wpm.c
+22 -3
View File
@@ -473,7 +473,7 @@ int wpm_error_ack_decode_apdu(
}
if (decode_is_opening_tag_number(apdu_offset, 0)) {
len = 1;
apdu_len -= len;
apdu_len += len;
if (apdu) {
apdu_offset = &apdu[apdu_len];
if (apdu_size > len) {
@@ -509,7 +509,7 @@ int wpm_error_ack_decode_apdu(
}
if (decode_is_closing_tag_number(apdu_offset, 0)) {
len = 1;
apdu_len -= len;
apdu_len += len;
if (apdu) {
apdu_offset = &apdu[apdu_len];
if (apdu_size > len) {
@@ -527,7 +527,7 @@ int wpm_error_ack_decode_apdu(
}
if (decode_is_opening_tag_number(apdu_offset, 1)) {
len = 1;
apdu_len -= len;
apdu_len += len;
if (apdu) {
apdu_offset = &apdu[apdu_len];
if (apdu_size > len) {
@@ -571,3 +571,22 @@ int wpm_error_ack_decode_apdu(
return apdu_len;
}
/**
* @brief Convert an array of BACnetWriteAccessData to linked list
* @param array pointer to element zero of the array
* @param size number of elements in the array
*/
void wpm_write_access_data_link_array(
BACNET_WRITE_ACCESS_DATA *array,
size_t size)
{
size_t i = 0;
for (i = 0; i < size; i++) {
if (i > 0) {
array[i - 1].next = &array[i];
}
array[i].next = NULL;
}
}
src/bacnet/wpm.h
+12 -6
View File
@@ -46,16 +46,17 @@ extern "C" {
} BACNET_WRITE_ACCESS_DATA;
/* decode the service request only */
BACNET_STACK_EXPORT
int wpm_decode_object_id(
uint8_t * apdu,
uint16_t apdu_len,
BACNET_WRITE_PROPERTY_DATA * data);
BACNET_WRITE_PROPERTY_DATA * wpdata);
BACNET_STACK_EXPORT
int wpm_decode_object_property(
uint8_t * apdu,
uint16_t apdu_len,
BACNET_WRITE_PROPERTY_DATA * wpm_data);
BACNET_WRITE_PROPERTY_DATA * wpdata);
/* encode objects */
BACNET_STACK_EXPORT
@@ -68,13 +69,13 @@ extern "C" {
BACNET_OBJECT_TYPE object_type,
uint32_t object_instance);
BACNET_STACK_EXPORT
int wpm_encode_apdu_object_end(
uint8_t * apdu);
BACNET_STACK_EXPORT
int wpm_encode_apdu_object_property(
uint8_t * apdu,
BACNET_WRITE_PROPERTY_DATA * wpdata);
BACNET_STACK_EXPORT
int wpm_encode_apdu_object_end(
uint8_t * apdu);
BACNET_STACK_EXPORT
int wpm_encode_apdu(
uint8_t * apdu,
size_t max_apdu,
@@ -99,6 +100,11 @@ extern "C" {
uint16_t apdu_size,
BACNET_WRITE_PROPERTY_DATA * wp_data);
BACNET_STACK_EXPORT
void wpm_write_access_data_link_array(
BACNET_WRITE_ACCESS_DATA *base,
size_t size);
#ifdef __cplusplus
}
#endif /* __cplusplus */