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

Corrected bug #1359436 which had the incorrect len for APDU service parameters. Also corrected the service type for segmented complex ACK responses.

Browse Source
This commit is contained in:
skarg
2005-12-01 17:32:18 +00:00
parent 6e84cf38e2
commit 2be2887b69
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/apdu.c
+3 -5
View File
@@ -172,7 +172,7 @@ uint16_t apdu_decode_confirmed_service_request(
service_data->proposed_window_number = apdu[len++]; service_data->proposed_window_number = apdu[len++];
} }
*service_choice = apdu[len++]; *service_choice = apdu[len++];
*service_request = &apdu[len++]; *service_request = &apdu[len];
*service_request_len = apdu_len - len; *service_request_len = apdu_len - len;
return len; return len;
@@ -280,7 +280,7 @@ void apdu_handler(
case PDU_TYPE_COMPLEX_ACK: case PDU_TYPE_COMPLEX_ACK:
service_ack_data.segmented_message = (apdu[0] & BIT3) ? true : false; service_ack_data.segmented_message = (apdu[0] & BIT3) ? true : false;
service_ack_data.more_follows = (apdu[0] & BIT2) ? true : false; service_ack_data.more_follows = (apdu[0] & BIT2) ? true : false;
service_ack_data.invoke_id = apdu[1]; invoke_id = service_ack_data.invoke_id = apdu[1];
len = 2; len = 2;
if (service_ack_data.segmented_message) if (service_ack_data.segmented_message)
{ {
@@ -288,10 +288,8 @@ void apdu_handler(
service_ack_data.proposed_window_number = apdu[len++]; service_ack_data.proposed_window_number = apdu[len++];
} }
service_choice = apdu[len++]; service_choice = apdu[len++];
service_request = &apdu[len++]; service_request = &apdu[len];
service_request_len = apdu_len - len; service_request_len = apdu_len - len;
invoke_id = apdu[1];
service_choice = apdu[2];
switch (service_choice) switch (service_choice)
{ {
case SERVICE_CONFIRMED_GET_ALARM_SUMMARY: case SERVICE_CONFIRMED_GET_ALARM_SUMMARY: