From f82a844952eaa326b0cda7c085a024ef63b7ddb9 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Mon, 12 Oct 2009 05:27:08 +0000
Subject: [PATCH] Changed the GetEventInfo handler somewhat to make it easier
 on data storage.

---
 bacnet-stack/demo/handler/h_getevent.c | 30 +++++++++++++++-----------
 bacnet-stack/include/getevent.h        |  6 +++++-
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/bacnet-stack/demo/handler/h_getevent.c b/bacnet-stack/demo/handler/h_getevent.c
index 846e3860..bc134adf 100644
--- a/bacnet-stack/demo/handler/h_getevent.c
+++ b/bacnet-stack/demo/handler/h_getevent.c
@@ -36,8 +36,7 @@
 #include "npdu.h"
 #include "abort.h"
 #include "event.h"
-
-static uint8_t Temp_Buf[MAX_APDU] = { 0 };
+#include "getevent.h"
 
 static get_event_info_function
     Get_Event_Info[MAX_BACNET_OBJECT_TYPE];
@@ -66,8 +65,9 @@ void handler_get_event_information(
     BACNET_ERROR_CODE error_code = ERROR_CODE_UNKNOWN_OBJECT;
     BACNET_ADDRESS my_address;
     BACNET_OBJECT_ID object_id;
-    unsigned i = 0; /* counter */
+    unsigned i = 0, j = 0; /* counter */
     BACNET_GET_EVENT_INFORMATION_DATA getevent_data;
+    int valid_event = 0;
 
     /* encode the NPDU portion of the packet */
     datalink_get_my_address(&my_address);
@@ -116,16 +116,22 @@ void handler_get_event_information(
     pdu_len += len;
     for (i = 0; i < MAX_BACNET_OBJECT_TYPE; i++) {
         if (Get_Event_Info[i]) {
-            Get_Event_Info[i](&getevent_data);
-            len = getevent_ack_encode_apdu_data(
-                &Handler_Transmit_Buffer[pdu_len], 
-                sizeof(Handler_Transmit_Buffer)-pdu_len,
-                &getevent_data);
-            if (len <= 0) {
-                error = true;
-                goto GET_EVENT_ERROR;
+            for (j = 0; j < 0xffff; j++) {
+                valid_event = Get_Event_Info[i](j, &getevent_data);
+                if (valid_event > 0) {
+                    len = getevent_ack_encode_apdu_data(
+                        &Handler_Transmit_Buffer[pdu_len], 
+                        sizeof(Handler_Transmit_Buffer)-pdu_len,
+                        &getevent_data);
+                    if (len <= 0) {
+                        error = true;
+                        goto GET_EVENT_ERROR;
+                    }
+                    pdu_len += len;
+                } else if (valid_event < 0) {
+                    break;
+                }
             }
-            pdu_len += len;
         }
     }
     len = getevent_ack_encode_apdu_end(
diff --git a/bacnet-stack/include/getevent.h b/bacnet-stack/include/getevent.h
index f3a4677d..921a137c 100644
--- a/bacnet-stack/include/getevent.h
+++ b/bacnet-stack/include/getevent.h
@@ -52,8 +52,12 @@ typedef struct BACnet_Get_Event_Information_Data {
     uint32_t eventPriorities[3];
     struct BACnet_Get_Event_Information_Data *next;
 } BACNET_GET_EVENT_INFORMATION_DATA;
-    
+
+/* return 0 if no active event at this index
+   return -1 if end of list 
+   return +1 if active event */
 typedef int (*get_event_info_function) (
+    unsigned index,
     BACNET_GET_EVENT_INFORMATION_DATA *getevent_data);
 
 #ifdef __cplusplus