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

improved error handling to correctly process requestID and device address. Fixed

Browse Source 
a copy/paste bug where the ACK handler was for a READ_FILE instead of a
WRITE_FILE
This commit is contained in:
gri6507
2011-11-26 19:46:51 +00:00
parent 087584e85e
commit d875b3fb8e
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/writefile/main.c
+23 -22
View File
@@ -63,19 +63,19 @@ static bool End_Of_File_Detected = false;
static bool Error_Detected = false; static bool Error_Detected = false;
static uint8_t Current_Invoke_ID = 0; static uint8_t Current_Invoke_ID = 0;
static void Atomic_Read_File_Error_Handler( static void Atomic_Write_File_Error_Handler(
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code) BACNET_ERROR_CODE error_code)
{ {
/* FIXME: verify src and invoke id */ if (address_match(&Target_Address, src) &&
(void) src; (invoke_id == Current_Invoke_ID)) {
(void) invoke_id; printf("\r\nBACnet Error!\r\n");
printf("\r\nBACnet Error!\r\n"); printf("Error Class: %s\r\n", bactext_error_class_name(error_class));
printf("Error Class: %s\r\n", bactext_error_class_name(error_class)); printf("Error Code: %s\r\n", bactext_error_code_name(error_code));
printf("Error Code: %s\r\n", bactext_error_code_name(error_code)); Error_Detected = true;
Error_Detected = true; }
} }
void MyAbortHandler( void MyAbortHandler(
@@ -84,13 +84,13 @@ void MyAbortHandler(
uint8_t abort_reason, uint8_t abort_reason,
bool server) bool server)
{ {
/* FIXME: verify src and invoke id */
(void) src;
(void) invoke_id;
(void) server; (void) server;
printf("\r\nBACnet Abort!\r\n"); if (address_match(&Target_Address, src) &&
printf("Abort Reason: %s\r\n", bactext_abort_reason_name(abort_reason)); (invoke_id == Current_Invoke_ID)) {
Error_Detected = true; printf("BACnet Abort: %s\r\n",
bactext_abort_reason_name((int) abort_reason));
Error_Detected = true;
}
} }
void MyRejectHandler( void MyRejectHandler(
@@ -98,12 +98,12 @@ void MyRejectHandler(
uint8_t invoke_id, uint8_t invoke_id,
uint8_t reject_reason) uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ if (address_match(&Target_Address, src) &&
(void) src; (invoke_id == Current_Invoke_ID)) {
(void) invoke_id; printf("BACnet Reject: %s\r\n",
printf("\r\nBACnet Reject!\r\n"); bactext_reject_reason_name((int) reject_reason));
printf("Reject Reason: %s\r\n", bactext_reject_reason_name(reject_reason)); Error_Detected = true;
Error_Detected = true; }
} }
static void LocalIAmHandler( static void LocalIAmHandler(
@@ -147,8 +147,8 @@ static void Init_Service_Handlers(
apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY, apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY,
handler_read_property); handler_read_property);
/* handle any errors coming back */ /* handle any errors coming back */
apdu_set_error_handler(SERVICE_CONFIRMED_ATOMIC_READ_FILE, apdu_set_error_handler(SERVICE_CONFIRMED_ATOMIC_WRITE_FILE,
Atomic_Read_File_Error_Handler); Atomic_Write_File_Error_Handler);
apdu_set_abort_handler(MyAbortHandler); apdu_set_abort_handler(MyAbortHandler);
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
@@ -310,3 +310,4 @@ int main(
} }
return 0; return 0;
} }