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

Corrected cancellation request for SubscribeCOV decoding.

Browse Source
This commit is contained in:
skarg
2007-06-06 00:16:12 +00:00
parent 8207c3931b
commit 6a2f43712f
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/cov.c
+25 -19
View File
@@ -366,26 +366,32 @@ int cov_subscribe_decode_service_request(uint8_t * apdu,
data->monitoredObjectIdentifier.type = decoded_type; data->monitoredObjectIdentifier.type = decoded_type;
} else } else
return -1; return -1;
/* tag 2 - issueConfirmedNotifications - optional */ /* optional parameters - if missing, means cancellation */
if (decode_is_context_tag(&apdu[len], 2)) { if (len > apdu_len) {
data->cancellationRequest = false; /* tag 2 - issueConfirmedNotifications - optional */
len += if (decode_is_context_tag(&apdu[len], 2)) {
decode_tag_number_and_value(&apdu[len], &tag_number, data->cancellationRequest = false;
&len_value); len +=
data->issueConfirmedNotifications = decode_tag_number_and_value(&apdu[len], &tag_number,
decode_context_boolean(&apdu[len]); &len_value);
len += len_value; data->issueConfirmedNotifications =
} else decode_context_boolean(&apdu[len]);
len += len_value;
} else {
data->cancellationRequest = true;
}
/* tag 3 - lifetime - optional */
if (decode_is_context_tag(&apdu[len], 3)) {
len +=
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value);
len += decode_unsigned(&apdu[len], len_value, &decoded_value);
data->lifetime = decoded_value;
} else
data->lifetime = 0;
} else {
data->cancellationRequest = true; data->cancellationRequest = true;
/* tag 3 - lifetime - optional */ }
if (decode_is_context_tag(&apdu[len], 3)) {
len +=
decode_tag_number_and_value(&apdu[len], &tag_number,
&len_value);
len += decode_unsigned(&apdu[len], len_value, &decoded_value);
data->lifetime = decoded_value;
} else
data->lifetime = 0;
} }
return len; return len;