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

Corrected GetEventInfo to return correctly formed chunks and not invoke assert.

Browse Source
This commit is contained in:
skarg
2009-11-02 20:12:26 +00:00
parent 55d96cdfad
commit 788b6905d7
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_getevent.c
+1 -4
View File
@@ -101,9 +101,6 @@ void handler_get_event_information(
#endif #endif
goto GET_EVENT_ABORT; goto GET_EVENT_ABORT;
} }
/* assume that there is an error */
error = true;
len = len =
getevent_ack_encode_apdu_init(&Handler_Transmit_Buffer[pdu_len], getevent_ack_encode_apdu_init(&Handler_Transmit_Buffer[pdu_len],
sizeof(Handler_Transmit_Buffer) - pdu_len, service_data->invoke_id); sizeof(Handler_Transmit_Buffer) - pdu_len, service_data->invoke_id);
@@ -117,6 +114,7 @@ void handler_get_event_information(
for (j = 0; j < 0xffff; j++) { for (j = 0; j < 0xffff; j++) {
valid_event = Get_Event_Info[i] (j, &getevent_data); valid_event = Get_Event_Info[i] (j, &getevent_data);
if (valid_event > 0) { if (valid_event > 0) {
getevent_data.next = NULL;
len = len =
getevent_ack_encode_apdu_data(&Handler_Transmit_Buffer getevent_ack_encode_apdu_data(&Handler_Transmit_Buffer
[pdu_len], sizeof(Handler_Transmit_Buffer) - pdu_len, [pdu_len], sizeof(Handler_Transmit_Buffer) - pdu_len,
@@ -139,7 +137,6 @@ void handler_get_event_information(
error = true; error = true;
goto GET_EVENT_ERROR; goto GET_EVENT_ERROR;
} }
pdu_len += len;
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "GetEventInformation: Sending Ack!\n"); fprintf(stderr, "GetEventInformation: Sending Ack!\n");
#endif #endif