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

GetEventInformations returns messages whose maximum length does not exceed max_resp.

Browse Source 
More_Events for GetEventInformations works fine.
This commit is contained in:
k001a
2011-07-18 20:00:53 +00:00
parent 2364561f19
commit e5496d3d11
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_getevent.c
+25 -4
View File
@@ -59,9 +59,11 @@ void handler_get_event_information(
BACNET_CONFIRMED_SERVICE_DATA * service_data) BACNET_CONFIRMED_SERVICE_DATA * service_data)
{ {
int len = 0; int len = 0;
int pdu_len = 0; int pdu_len = 0;
int apdu_len = 0;
BACNET_NPDU_DATA npdu_data; BACNET_NPDU_DATA npdu_data;
bool error = false; bool error = false;
bool more_events = false;
int bytes_sent = 0; int bytes_sent = 0;
BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT; BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT;
BACNET_ERROR_CODE error_code = ERROR_CODE_UNKNOWN_OBJECT; BACNET_ERROR_CODE error_code = ERROR_CODE_UNKNOWN_OBJECT;
@@ -111,7 +113,8 @@ void handler_get_event_information(
error = true; error = true;
goto GET_EVENT_ERROR; goto GET_EVENT_ERROR;
} }
pdu_len += len; pdu_len += len;
apdu_len = len;
for (i = 0; i < MAX_BACNET_OBJECT_TYPE; i++) { for (i = 0; i < MAX_BACNET_OBJECT_TYPE; i++) {
if (Get_Event_Info[i]) { if (Get_Event_Info[i]) {
for (j = 0; j < 0xffff; j++) { for (j = 0; j < 0xffff; j++) {
@@ -126,7 +129,21 @@ void handler_get_event_information(
error = true; error = true;
goto GET_EVENT_ERROR; goto GET_EVENT_ERROR;
} }
pdu_len += len; apdu_len += len;
if (apdu_len >= service_data->max_resp - 2) {
/* Device must be able to fit minimum one event information.
Length of one event informations needs more than 50 octets. */
if (service_data->max_resp < 128){
len = BACNET_STATUS_ABORT;
error = true;
goto GET_EVENT_ERROR;
}
else
more_events = true;
break;
}
else
pdu_len += len;
} else if (valid_event < 0) { } else if (valid_event < 0) {
break; break;
} }
@@ -135,7 +152,7 @@ void handler_get_event_information(
} }
len = len =
getevent_ack_encode_apdu_end(&Handler_Transmit_Buffer[pdu_len], getevent_ack_encode_apdu_end(&Handler_Transmit_Buffer[pdu_len],
sizeof(Handler_Transmit_Buffer) - pdu_len, false); sizeof(Handler_Transmit_Buffer) - pdu_len, more_events);
if (len <= 0) { if (len <= 0) {
error = true; error = true;
goto GET_EVENT_ERROR; goto GET_EVENT_ERROR;
@@ -145,6 +162,10 @@ void handler_get_event_information(
#endif #endif
GET_EVENT_ERROR: GET_EVENT_ERROR:
if (error) { if (error) {
pdu_len =
npdu_encode_pdu(&Handler_Transmit_Buffer[0], src, &my_address,
&npdu_data);
if (len == -2) { if (len == -2) {
/* BACnet APDU too small to fit data, so proper response is Abort */ /* BACnet APDU too small to fit data, so proper response is Abort */
len = len =