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

Extended COV so that it is possible to encode and decode CovNotifications that consist of more than one BACNET_APPLICATION_DATA_VALUE. Thank you, Wolfgang!

Browse Source
This commit is contained in:
skarg
2014-07-30 16:37:15 +00:00
parent 8cdd480cc5
commit 3264623953
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/cov.c
+24 -10
View File
@@ -53,6 +53,7 @@ static int notify_encode_apdu(
int len = 0; /* length of each encoding */ int len = 0; /* length of each encoding */
int apdu_len = 0; /* total length of the apdu, return value */ int apdu_len = 0; /* total length of the apdu, return value */
BACNET_PROPERTY_VALUE *value = NULL; /* value in list */ BACNET_PROPERTY_VALUE *value = NULL; /* value in list */
BACNET_APPLICATION_DATA_VALUE *app_data = NULL;
if (apdu) { if (apdu) {
/* tag 0 - subscriberProcessIdentifier */ /* tag 0 - subscriberProcessIdentifier */
@@ -99,9 +100,15 @@ static int notify_encode_apdu(
/* abstract syntax gets enclosed in a context tag */ /* abstract syntax gets enclosed in a context tag */
len = encode_opening_tag(&apdu[apdu_len], 2); len = encode_opening_tag(&apdu[apdu_len], 2);
apdu_len += len; apdu_len += len;
len = app_data = &value->value;
bacapp_encode_application_data(&apdu[apdu_len], &value->value); while (app_data != NULL)
apdu_len += len; {
len =
bacapp_encode_application_data(&apdu[apdu_len], app_data);
apdu_len += len;
app_data = app_data->next;
}
len = encode_closing_tag(&apdu[apdu_len], 2); len = encode_closing_tag(&apdu[apdu_len], 2);
apdu_len += len; apdu_len += len;
/* tag 3 - priority OPTIONAL */ /* tag 3 - priority OPTIONAL */
@@ -169,12 +176,14 @@ int cov_notify_decode_service_request(
BACNET_COV_DATA * data) BACNET_COV_DATA * data)
{ {
int len = 0; /* return value */ int len = 0; /* return value */
int app_len = 0;
uint8_t tag_number = 0; uint8_t tag_number = 0;
uint32_t len_value = 0; uint32_t len_value = 0;
uint32_t decoded_value = 0; /* for decoding */ uint32_t decoded_value = 0; /* for decoding */
uint16_t decoded_type = 0; /* for decoding */ uint16_t decoded_type = 0; /* for decoding */
uint32_t property = 0; /* for decoding */ uint32_t property = 0; /* for decoding */
BACNET_PROPERTY_VALUE *value = NULL; /* value in list */ BACNET_PROPERTY_VALUE *value = NULL; /* value in list */
BACNET_APPLICATION_DATA_VALUE *app_data = NULL;
if (apdu_len && data) { if (apdu_len && data) {
/* tag 0 - subscriberProcessIdentifier */ /* tag 0 - subscriberProcessIdentifier */
@@ -258,13 +267,18 @@ int cov_notify_decode_service_request(
} }
/* a tag number of 2 is not extended so only one octet */ /* a tag number of 2 is not extended so only one octet */
len++; len++;
len += app_data = &value->value;
bacapp_decode_application_data(&apdu[len], apdu_len - len, while (!decode_is_closing_tag_number(&apdu[len], 2))
&value->value); {
/* FIXME: check the return value; abort if no valid data? */ app_len =
/* FIXME: there might be more than one data element in here! */ bacapp_decode_application_data(&apdu[len], apdu_len - len, app_data);
if (!decode_is_closing_tag_number(&apdu[len], 2)) { if (app_len <= 0)
return -1; {
return -1;
}
len += app_len;
app_data = app_data->next;
} }
/* a tag number of 2 is not extended so only one octet */ /* a tag number of 2 is not extended so only one octet */
len++; len++;